diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml
index d156feac6..f0d8d1521 100644
--- a/.github/workflows/ci-build.yaml
+++ b/.github/workflows/ci-build.yaml
@@ -30,7 +30,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.22'
 
       - name: Restore go build cache
         uses: actions/cache@v4
@@ -75,7 +75,7 @@ jobs:
       - name: Setup Golang
         uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.22'
       - name: GH actions workaround - Kill XSP4 process
         run: |
           sudo pkill mono || true
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index ffaefbb12..1404b2997 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -22,7 +22,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v5
       with:
-        go-version: '1.21'
+        go-version: '1.22'
 
     - name: Build
       run: make build
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index d005b48f4..32dfd9252 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -16,7 +16,7 @@ jobs:
       - name: Run golangci-lint
         uses: golangci/golangci-lint-action@v6
         with:
-          version: v1.56.2
+          version: v1.61.0
           args: --timeout 5m --exclude SA5011
           only-new-issues: true
 
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index 2bfe81c0b..54235169b 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -22,7 +22,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.22'
 
       - name: Restore go build cache
         uses: actions/cache@v4
diff --git a/Dockerfile b/Dockerfile
index 97a4b9829..56da327e6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.21 as builder
+FROM golang:1.22 as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests
diff --git a/go.mod b/go.mod
index d184f198d..aac7721cb 100644
--- a/go.mod
+++ b/go.mod
@@ -1,8 +1,6 @@
 module github.com/argoproj-labs/argocd-operator
 
-go 1.21.0
-
-toolchain go1.21.9
+go 1.22.0
 
 require (
 	github.com/argoproj/argo-cd/v2 v2.12.3