diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 78e0b4026..62c7a74d9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -27,7 +27,7 @@ jobs:
 
       - uses: actions/setup-go@v4
         with:
-          go-version: "1.20"
+          go-version: "1.21"
 
       - name: Set up Helm
         uses: azure/setup-helm@v3
@@ -77,7 +77,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go-version: ["1.20"]
+        go-version: ["1.21","1.20"]
     steps:
       - name: checkout
         uses: actions/checkout@v3
diff --git a/.github/workflows/canary-integration-test.yml b/.github/workflows/canary-integration-test.yml
index 56fb3ebb3..5702ca67a 100644
--- a/.github/workflows/canary-integration-test.yml
+++ b/.github/workflows/canary-integration-test.yml
@@ -1497,7 +1497,7 @@ jobs:
       - name: setup golang
         uses: actions/setup-go@v4
         with:
-          go-version: "1.20"
+          go-version: "1.21"
 
       - name: setup cluster resources
         uses: ./.github/workflows/canary-test-config
diff --git a/.github/workflows/canary-test-config/action.yaml b/.github/workflows/canary-test-config/action.yaml
index f2369e8a4..d9b90bf47 100644
--- a/.github/workflows/canary-test-config/action.yaml
+++ b/.github/workflows/canary-test-config/action.yaml
@@ -11,7 +11,7 @@ runs:
     - name: setup golang
       uses: actions/setup-go@v2
       with:
-        go-version: "1.20"
+        go-version: "1.21"
 
     - name: Setup Minikube
       shell: bash --noprofile --norc -eo pipefail -x {0}
diff --git a/.github/workflows/codegen.yml b/.github/workflows/codegen.yml
index cdf432782..0f497ee17 100644
--- a/.github/workflows/codegen.yml
+++ b/.github/workflows/codegen.yml
@@ -31,7 +31,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v4
         with:
-          go-version: "1.20"
+          go-version: "1.21"
 
       - name: checkout
         uses: actions/checkout@v3
diff --git a/.github/workflows/crds-gen.yml b/.github/workflows/crds-gen.yml
index fbe7cd28b..d9dd4c42e 100644
--- a/.github/workflows/crds-gen.yml
+++ b/.github/workflows/crds-gen.yml
@@ -30,7 +30,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v4
         with:
-          go-version: "1.20"
+          go-version: "1.21"
 
       - name: checkout
         uses: actions/checkout@v3
diff --git a/.github/workflows/daily-nightly-jobs.yml b/.github/workflows/daily-nightly-jobs.yml
index 5bdce9b1e..febc280c9 100644
--- a/.github/workflows/daily-nightly-jobs.yml
+++ b/.github/workflows/daily-nightly-jobs.yml
@@ -24,7 +24,7 @@ jobs:
       - name: setup golang
         uses: actions/setup-go@v4
         with:
-          go-version: "1.20"
+          go-version: "1.21"
 
       - name: Install Docker
         run: |
@@ -204,7 +204,7 @@ jobs:
           export LOG_DIR="/home/runner/work/rook/rook/tests/integration/_output/tests/"
           export CLUSTER_NAMESPACE="smoke-ns"
           export OPERATOR_NAMESPACE="smoke-ns-system"
-          tests/scripts/collect-logs.sh          
+          tests/scripts/collect-logs.sh
 
       - name: Artifact
         uses: actions/upload-artifact@v3
diff --git a/.github/workflows/docs-check.yml b/.github/workflows/docs-check.yml
index d5830c1be..3e500136e 100644
--- a/.github/workflows/docs-check.yml
+++ b/.github/workflows/docs-check.yml
@@ -27,7 +27,7 @@ jobs:
 
       - uses: actions/setup-go@v4
         with:
-          go-version: "1.20"
+          go-version: "1.21"
 
       - uses: actions/setup-python@v4
         with:
diff --git a/.github/workflows/golangci-lint.yaml b/.github/workflows/golangci-lint.yaml
index 93fbfdc4e..4010bc17a 100644
--- a/.github/workflows/golangci-lint.yaml
+++ b/.github/workflows/golangci-lint.yaml
@@ -26,7 +26,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v4
         with:
-          go-version: "1.20"
+          go-version: "1.21"
           cache: false
       - uses: actions/checkout@v3
         with:
diff --git a/.github/workflows/integration-test-config-latest-k8s/action.yaml b/.github/workflows/integration-test-config-latest-k8s/action.yaml
index ab1dc2a23..81be8e2fc 100644
--- a/.github/workflows/integration-test-config-latest-k8s/action.yaml
+++ b/.github/workflows/integration-test-config-latest-k8s/action.yaml
@@ -14,7 +14,7 @@ runs:
     - name: setup golang
       uses: actions/setup-go@v2
       with:
-        go-version: "1.20"
+        go-version: "1.21"
 
     - name: Setup Minikube
       shell: bash --noprofile --norc -eo pipefail -x {0}
diff --git a/.github/workflows/mod-check.yml b/.github/workflows/mod-check.yml
index 780884038..258352533 100644
--- a/.github/workflows/mod-check.yml
+++ b/.github/workflows/mod-check.yml
@@ -35,7 +35,7 @@ jobs:
 
       - uses: actions/setup-go@v4
         with:
-          go-version: "1.20"
+          go-version: "1.21"
 
       - name: run mod check
         run: GOPATH=$(go env GOPATH) make -j $(nproc) mod.check
diff --git a/.github/workflows/multus.yaml b/.github/workflows/multus.yaml
index 41af91989..90ff2bccf 100644
--- a/.github/workflows/multus.yaml
+++ b/.github/workflows/multus.yaml
@@ -34,7 +34,7 @@ jobs:
       - name: Set up Go version
         uses: actions/setup-go@v4
         with:
-          go-version: "1.20"
+          go-version: "1.21"
 
       - name: checkout
         uses: actions/checkout@v3
diff --git a/.github/workflows/push-build.yaml b/.github/workflows/push-build.yaml
index a08987380..c95e2b4b7 100644
--- a/.github/workflows/push-build.yaml
+++ b/.github/workflows/push-build.yaml
@@ -27,7 +27,7 @@ jobs:
 
       - uses: actions/setup-go@v4
         with:
-          go-version: "1.20"
+          go-version: "1.21"
 
         # docker/setup-qemu action installs QEMU static binaries, which are used to run builders for architectures other than the host.
       - name: set up QEMU
diff --git a/.github/workflows/rbac-gen.yaml b/.github/workflows/rbac-gen.yaml
index 928d40bc1..9d6c931cc 100644
--- a/.github/workflows/rbac-gen.yaml
+++ b/.github/workflows/rbac-gen.yaml
@@ -30,7 +30,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v4
         with:
-          go-version: "1.20"
+          go-version: "1.21"
 
       - name: checkout
         uses: actions/checkout@v3
diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
index 0d1874232..1a2361073 100644
--- a/.github/workflows/unit-test.yml
+++ b/.github/workflows/unit-test.yml
@@ -36,7 +36,7 @@ jobs:
 
       - uses: actions/setup-go@v4
         with:
-          go-version: "1.20"
+          go-version: "1.21"
 
       - name: run unit tests
         run: GOPATH=$(go env GOPATH) make -j $(nproc) test
diff --git a/build/makelib/golang.mk b/build/makelib/golang.mk
index 474f3b7f7..fddadee82 100644
--- a/build/makelib/golang.mk
+++ b/build/makelib/golang.mk
@@ -48,7 +48,7 @@ GO_TEST_FLAGS ?=
 # ====================================================================================
 # Setup go environment
 
-GO_SUPPORTED_VERSIONS ?= 1.20
+GO_SUPPORTED_VERSIONS ?= 1.21|1.20
 
 GO_PACKAGES := $(foreach t,$(GO_SUBDIRS),$(GO_PROJECT)/$(t)/...)
 GO_INTEGRATION_TEST_PACKAGES := $(foreach t,$(GO_INTEGRATION_TESTS_SUBDIRS),$(GO_PROJECT)/$(t)/integration)
@@ -171,7 +171,7 @@ go.mod.update:
 .PHONY: go.mod.check
 go.mod.check:
 	@echo === ensuring root modules are tidied
-	@$(GOHOST) mod tidy -compat=1.20
+	@$(GOHOST) mod tidy -compat=$(GO_VERSION)
 
 .PHONY: go.mod.clean
 go.mod.clean: