diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 692afdae..368092e1 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -14,31 +14,30 @@ jobs:
     timeout-minutes: 10
 
     steps:
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+
+      - name: Set up Go
+        uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
+        with:
+          go-version-file: "go.mod"
+        id: go
 
-    - name: Check out code into the Go module directory
-      uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+      - name: Run linters
+        uses: golangci/golangci-lint-action@aaa42aa0628b4ae2578232a66b541047968fac86 # v6.1.0
+        with:
+          version: v1.51.2
 
-    - name: Set up Go
-      uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
-      with:
-        go-version-file: 'go.mod'
-      id: go
-      
-    - name: Run linters
-      uses: golangci/golangci-lint-action@aaa42aa0628b4ae2578232a66b541047968fac86 # v6.1.0
-      with:
-        version: v1.51.2
+      - name: Generate
+        run: make generate
 
-    - name: Generate
-      run: make generate
+      - name: Confirm no diff
+        run: |
+          git diff --compact-summary --exit-code || \
+            (echo "*** Unexpected differences after code generation. Run 'make generate' and commit."; exit 1)
 
-    - name: Confirm no diff
-      run: |
-        git diff --compact-summary --exit-code || \
-          (echo "*** Unexpected differences after code generation. Run 'make generate' and commit."; exit 1)
-          
-    - name: Build
-      run: make build
+      - name: Build
+        run: make build
 
   acceptance_tests:
     name: Acceptance Tests
@@ -48,7 +47,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@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
@@ -56,7 +55,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
         with:
-          go-version-file: 'go.mod'
+          go-version-file: "go.mod"
           check-latest: true
 
       - name: Install Kustomize
diff --git a/scripts/testacc_prepare_env.sh b/scripts/testacc_prepare_env.sh
index 1ae2c756..88979308 100755
--- a/scripts/testacc_prepare_env.sh
+++ b/scripts/testacc_prepare_env.sh
@@ -4,7 +4,8 @@ set -e
 
 export PATH=$PATH:.
 
-argocd_version=${ARGOCD_VERSION:-v2.8.13}
+argocd_version=${ARGOCD_VERSION:-v2.12.4}
+# k8s version must be in line with https://argo-cd.readthedocs.io/en/stable/operator-manual/installation/#tested-versions
 k8s_version=${ARGOCD_KUBERNETES_VERSION:-v1.27.11}
 
 echo "\n--- Clearing current kube context\n"