diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index b9b8d6e2..bede28f5 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -48,7 +48,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        argocd_version: ["v2.9.22", "v2.10.17", "v2.11.9"]
+        argocd_version: ["v2.10.18", "v2.11.12", "v2.12.7"]
     steps:
       - name: Check out code
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -64,7 +64,7 @@ jobs:
           curl -sL "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" | bash
           chmod +x ./kustomize
 
-      - name: Install Kind 0.20.0
+      - name: Install Kind 0.24.0
         run: |
           curl -sLo ./kind https://kind.sigs.k8s.io/dl/v0.20.0/kind-$(uname)-amd64
           chmod +x ./kind
diff --git a/GNUmakefile b/GNUmakefile
index 6f6e4f12..fa94e39e 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.7
 
 export
 
diff --git a/argocd/resource_argocd_repository_test.go b/argocd/resource_argocd_repository_test.go
index e468c7c3..39c5d771 100644
--- a/argocd/resource_argocd_repository_test.go
+++ b/argocd/resource_argocd_repository_test.go
@@ -193,7 +193,7 @@ resource "argocd_project" "simple" {
 }
 
 resource "argocd_repository" "helm" {
-  repo = "https://helm.nginx.com/stable"
+  repo = "https://helm.nginx.com/stable/"
   name = "nginx-stable-scoped"
   type = "helm"
   project = "%[1]s"
diff --git a/go.mod b/go.mod
index 32f725be..90cd1c13 100644
--- a/go.mod
+++ b/go.mod
@@ -2,12 +2,10 @@ module github.com/argoproj-labs/terraform-provider-argocd
 
 go 1.22.0
 
-toolchain go1.22.8
-
 require (
 	github.com/Masterminds/semver/v3 v3.3.0
 	github.com/ProtonMail/gopenpgp/v2 v2.7.5
-	github.com/argoproj/argo-cd/v2 v2.12.4
+	github.com/argoproj/argo-cd/v2 v2.12.7
 	// make sure this matches with version used in Argo CD's go.mod
 	github.com/argoproj/gitops-engine v0.7.1-0.20240714153147-adb68bcaab73
 	github.com/argoproj/pkg v0.13.7-0.20230626144333-d56162821bd1
diff --git a/go.sum b/go.sum
index f2d0a350..c10c6917 100644
--- a/go.sum
+++ b/go.sum
@@ -678,8 +678,8 @@ github.com/apparentlymart/go-textseg/v12 v12.0.0/go.mod h1:S/4uRK2UtaQttw1GenVJE
 github.com/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew1u1fNQOlOtuGxQY=
 github.com/apparentlymart/go-textseg/v15 v15.0.0/go.mod h1:K8XmNZdhEBkdlyDdvbmmsvpAG721bKi0joRfFdHIWJ4=
 github.com/appscode/go v0.0.0-20191119085241-0887d8ec2ecc/go.mod h1:OawnOmAL4ZX3YaPdN+8HTNwBveT1jMsqP74moa9XUbE=
-github.com/argoproj/argo-cd/v2 v2.12.4 h1:mlKcLvCX6F8Gz5/q2v6ImsYbSLMTTCeKYYTwGZV5vx4=
-github.com/argoproj/argo-cd/v2 v2.12.4/go.mod h1:2fh6q4NX/cylbH6Ktx/KjJsX7sOBwF3jbGnO0IZyNOc=
+github.com/argoproj/argo-cd/v2 v2.12.7 h1:ug9spvZhpxyvgpj3r3IA3woLExVkAjOdA7NAqFlm4P8=
+github.com/argoproj/argo-cd/v2 v2.12.7/go.mod h1:BS64uTH/mG3dEpulAI4oIyJiluuYdAbGlisR/s9FrEM=
 github.com/argoproj/gitops-engine v0.7.1-0.20240714153147-adb68bcaab73 h1:7kyTgFsPjvb6noafslp2pr7fBCS9s8OJ759LdLzrOro=
 github.com/argoproj/gitops-engine v0.7.1-0.20240714153147-adb68bcaab73/go.mod h1:xMIbuLg9Qj2e0egTy+8NcukbhRaVmWwK9vm3aAQZoi4=
 github.com/argoproj/notifications-engine v0.4.1-0.20240606074338-0802cd427621 h1:Yg1nt+D2uDK1SL2jSlfukA4yc7db184TTN7iWy3voRE=
diff --git a/scripts/testacc_prepare_env.sh b/scripts/testacc_prepare_env.sh
index 1d152266..c33b6164 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.11.9}
+argocd_version=${ARGOCD_VERSION:-v2.12.7}
 k8s_version=${ARGOCD_KUBERNETES_VERSION:-v1.27.11}
 
 echo "\n--- Clearing current kube context\n"