diff --git a/.devcontainer.json b/.devcontainer.json
new file mode 100644
index 00000000..55c93167
--- /dev/null
+++ b/.devcontainer.json
@@ -0,0 +1 @@
+{"image":"mcr.microsoft.com/devcontainers/go"}
\ No newline at end of file
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 83d463b1..0291dee8 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -48,7 +48,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        argocd_version: ["v2.8.13", "v2.9.9", "v2.10.4"]
+        argocd_version: ["v2.10.17", "v2.11.9", "v2.12.4"]
     steps:
       - name: Check out code
         uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
diff --git a/GNUmakefile b/GNUmakefile
index 6f6e4f12..4d990a7e 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -4,7 +4,7 @@ ARGOCD_INSECURE?=true
 ARGOCD_SERVER?=127.0.0.1:8080
 ARGOCD_AUTH_USERNAME?=admin
 ARGOCD_AUTH_PASSWORD?=acceptancetesting
-ARGOCD_VERSION?=v2.9.3
+ARGOCD_VERSION?=v2.12.4
 
 export
 
diff --git a/scripts/testacc_prepare_env.sh b/scripts/testacc_prepare_env.sh
index 1ae2c756..03c9b94f 100755
--- a/scripts/testacc_prepare_env.sh
+++ b/scripts/testacc_prepare_env.sh
@@ -4,7 +4,7 @@ set -e
 
 export PATH=$PATH:.
 
-argocd_version=${ARGOCD_VERSION:-v2.8.13}
+argocd_version=${ARGOCD_VERSION:-v2.12.4}
 k8s_version=${ARGOCD_KUBERNETES_VERSION:-v1.27.11}
 
 echo "\n--- Clearing current kube context\n"