diff --git a/.github/workflows/test-build-deploy.yml b/.github/workflows/test-build-deploy.yml
index de979c63e3..c8ae550e23 100644
--- a/.github/workflows/test-build-deploy.yml
+++ b/.github/workflows/test-build-deploy.yml
@@ -11,7 +11,7 @@ jobs:
   lint:
     runs-on: ubuntu-20.04
     container:
-      image: quay.io/cortexproject/build-image:PR5765-0ff811969
+      image: quay.io/cortexproject/build-image:upgrade-go-to-1.21.9-c118602ed
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2
@@ -40,7 +40,7 @@ jobs:
   test:
     runs-on: ubuntu-20.04
     container:
-      image: quay.io/cortexproject/build-image:PR5765-0ff811969
+      image: quay.io/cortexproject/build-image:upgrade-go-to-1.21.9-c118602ed
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2
@@ -83,7 +83,7 @@ jobs:
   build:
     runs-on: ubuntu-20.04
     container:
-      image: quay.io/cortexproject/build-image:PR5765-0ff811969
+      image: quay.io/cortexproject/build-image:upgrade-go-to-1.21.9-c118602ed
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2
@@ -214,14 +214,14 @@ jobs:
         run: |
           touch build-image/.uptodate
           MIGRATIONS_DIR=$(pwd)/cmd/cortex/migrations
-          make BUILD_IMAGE=quay.io/cortexproject/build-image:PR5765-0ff811969 TTY='' configs-integration-test
+          make BUILD_IMAGE=quay.io/cortexproject/build-image:upgrade-go-to-1.21.9-c118602ed TTY='' configs-integration-test
 
   deploy_website:
     needs: [build, test]
     if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')) && github.repository == 'cortexproject/cortex'
     runs-on: ubuntu-20.04
     container:
-      image: quay.io/cortexproject/build-image:PR5765-0ff811969
+      image: quay.io/cortexproject/build-image:upgrade-go-to-1.21.9-c118602ed
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2
@@ -263,7 +263,7 @@ jobs:
     if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')) && github.repository == 'cortexproject/cortex'
     runs-on: ubuntu-20.04
     container:
-      image: quay.io/cortexproject/build-image:PR5765-0ff811969
+      image: quay.io/cortexproject/build-image:upgrade-go-to-1.21.9-c118602ed
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8921383fea..cd4be6f937 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,7 +27,7 @@
 * [ENHANCEMENT] Logging: Added new options for logging HTTP request headers: `-server.log-request-headers` enables logging HTTP request headers, `-server.log-request-headers-exclude-list` allows users to specify headers which should not be logged. #5744
 * [ENHANCEMENT] Query Frontend/Scheduler: Time check in query priority now considers overall data select time window (including range selectors, modifiers and lookback delta). #5758
 * [ENHANCEMENT] Querier: Added `querier.store-gateway-query-stats-enabled` to enable or disable store gateway query stats log. #5749
-* [ENHANCEMENT] Upgrade to go 1.21.9 #5765
+* [ENHANCEMENT] Upgrade to go 1.21.9 #5765 #5879
 * [ENHANCEMENT] AlertManager: Retrying AlertManager Delete Silence on error #5794
 * [ENHANCEMENT] Ingester: Add new ingester metric `cortex_ingester_max_inflight_query_requests`. #5798
 * [ENHANCEMENT] Query: Added `query_storage_wall_time` to Query Frontend and Ruler query stats log for wall time spent on fetching data from storage. Query evaluation is not included. #5799
diff --git a/Makefile b/Makefile
index 4804f6734d..9b6982a5ee 100644
--- a/Makefile
+++ b/Makefile
@@ -122,7 +122,7 @@ build-image/$(UPTODATE): build-image/*
 SUDO := $(shell docker info >/dev/null 2>&1 || echo "sudo -E")
 BUILD_IN_CONTAINER := true
 BUILD_IMAGE ?= $(IMAGE_PREFIX)build-image
-LATEST_BUILD_IMAGE_TAG ?= update-go-1.21.3-e38685e50
+LATEST_BUILD_IMAGE_TAG ?= upgrade-go-to-1.21.9-c118602ed
 
 # TTY is parameterized to allow Google Cloud Builder to run builds,
 # as it currently disallows TTY devices. This value needs to be overridden