diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index ade86458..ad84d650 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -7,10 +7,10 @@ steps:
   - name: "Upgrade Test"
     command:
     - apk add g++ make bash gcompat curl mysql mysql-client libc6-compat
-    - wget https://golang.org/dl/go1.20.2.linux-amd64.tar.gz
-    - tar -C /usr/local -xzf go1.20.2.linux-amd64.tar.gz
+    - wget https://golang.org/dl/go1.21.0.linux-amd64.tar.gz
+    - tar -C /usr/local -xzf go1.21.0.linux-amd64.tar.gz
     - export PATH=$PATH:/usr/local/go/bin
-    - rm go1.20.2.linux-amd64.tar.gz
+    - rm go1.21.0.linux-amd64.tar.gz
     - ln -s /lib/libc.so.6 /usr/lib/libresolv.so.2
     - make upgrade-test
     concurrency: 1
@@ -26,10 +26,10 @@ steps:
   - name: "Backup Restore Test"
     command:
     - apk add g++ make bash gcompat curl mysql mysql-client libc6-compat
-    - wget https://golang.org/dl/go1.20.2.linux-amd64.tar.gz
-    - tar -C /usr/local -xzf go1.20.2.linux-amd64.tar.gz
+    - wget https://golang.org/dl/go1.21.0.linux-amd64.tar.gz
+    - tar -C /usr/local -xzf go1.21.0.linux-amd64.tar.gz
     - export PATH=$PATH:/usr/local/go/bin
-    - rm go1.20.2.linux-amd64.tar.gz
+    - rm go1.21.0.linux-amd64.tar.gz
     - ln -s /lib/libc.so.6 /usr/lib/libresolv.so.2
     - make backup-restore-test
     concurrency: 1
@@ -45,10 +45,10 @@ steps:
   - name: "VTOrc and VTAdmin Test"
     command:
     - apk add g++ make bash gcompat curl mysql mysql-client libc6-compat chromium
-    - wget https://golang.org/dl/go1.20.2.linux-amd64.tar.gz
-    - tar -C /usr/local -xzf go1.20.2.linux-amd64.tar.gz
+    - wget https://golang.org/dl/go1.21.0.linux-amd64.tar.gz
+    - tar -C /usr/local -xzf go1.21.0.linux-amd64.tar.gz
     - export PATH=$PATH:/usr/local/go/bin
-    - rm go1.20.2.linux-amd64.tar.gz
+    - rm go1.21.0.linux-amd64.tar.gz
     - ln -s /lib/libc.so.6 /usr/lib/libresolv.so.2
     - make vtorc-vtadmin-test
     concurrency: 1
diff --git a/.github/workflows/integration-test.yaml b/.github/workflows/integration-test.yaml
index a559e06a..fdab5463 100644
--- a/.github/workflows/integration-test.yaml
+++ b/.github/workflows/integration-test.yaml
@@ -17,7 +17,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.20.2
+        go-version: 1.21.0
       id: go
 
     - name: Check out code into the Go module directory
diff --git a/.github/workflows/make-generate-and-diff.yaml b/.github/workflows/make-generate-and-diff.yaml
index 6fcadf5c..7988f9f5 100644
--- a/.github/workflows/make-generate-and-diff.yaml
+++ b/.github/workflows/make-generate-and-diff.yaml
@@ -17,7 +17,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.20.2
+        go-version: 1.21.0
       id: go
 
     - name: Check out code into the Go module directory
diff --git a/.github/workflows/unit-test.yaml b/.github/workflows/unit-test.yaml
index 2b3ffe0a..5b910330 100644
--- a/.github/workflows/unit-test.yaml
+++ b/.github/workflows/unit-test.yaml
@@ -17,7 +17,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.20.2
+        go-version: 1.21.0
       id: go
 
     - name: Check out code into the Go module directory
diff --git a/.github/workflows/upgrade-vitess-dependency.yaml b/.github/workflows/upgrade-vitess-dependency.yaml
index 96f93d21..9e2600d3 100644
--- a/.github/workflows/upgrade-vitess-dependency.yaml
+++ b/.github/workflows/upgrade-vitess-dependency.yaml
@@ -20,7 +20,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.20.2
+          go-version: 1.21.0
 
       - name: Check out code into the Go module directory
         uses: actions/checkout@v2