diff --git a/.github/workflows/test-build-deploy.yml b/.github/workflows/test-build-deploy.yml
index d6225c1153..fc3e95b3bc 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:feature-master-update-to-go-1.21-050c36e7b
+      image: quay.io/cortexproject/build-image:update-go-1.21.3-e38685e50
     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:feature-master-update-to-go-1.21-050c36e7b
+      image: quay.io/cortexproject/build-image:update-go-1.21.3-e38685e50
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2
@@ -59,7 +59,7 @@ jobs:
   build:
     runs-on: ubuntu-20.04
     container:
-      image: quay.io/cortexproject/build-image:feature-master-update-to-go-1.21-050c36e7b
+      image: quay.io/cortexproject/build-image:update-go-1.21.3-e38685e50
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2
@@ -118,7 +118,7 @@ jobs:
       - name: Upgrade golang
         uses: actions/setup-go@v2
         with:
-          go-version: 1.21.0
+          go-version: 1.21.3
       - name: Checkout Repo
         uses: actions/checkout@v2
       - name: Install Docker Client
@@ -193,14 +193,14 @@ jobs:
         run: |
           touch build-image/.uptodate
           MIGRATIONS_DIR=$(pwd)/cmd/cortex/migrations
-          make BUILD_IMAGE=quay.io/cortexproject/build-image:feature-master-update-to-go-1.21-050c36e7b TTY='' configs-integration-test
+          make BUILD_IMAGE=quay.io/cortexproject/build-image:update-go-1.21.3-e38685e50 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:feature-master-update-to-go-1.21-050c36e7b
+      image: quay.io/cortexproject/build-image:update-go-1.21.3-e38685e50
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2
@@ -242,7 +242,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:feature-master-update-to-go-1.21-050c36e7b
+      image: quay.io/cortexproject/build-image:update-go-1.21.3-e38685e50
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2
diff --git a/Makefile b/Makefile
index 1a9527785e..4804f6734d 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 ?= feature-master-update-to-go-1.21-050c36e7b
+LATEST_BUILD_IMAGE_TAG ?= update-go-1.21.3-e38685e50
 
 # TTY is parameterized to allow Google Cloud Builder to run builds,
 # as it currently disallows TTY devices. This value needs to be overridden
diff --git a/build-image/Dockerfile b/build-image/Dockerfile
index f085b94ddc..1cee501bfc 100644
--- a/build-image/Dockerfile
+++ b/build-image/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21.0-bullseye
+FROM golang:1.21.3-bullseye
 ARG goproxyValue
 ENV GOPROXY=${goproxyValue}
 RUN apt-get update && apt-get install -y curl file jq unzip protobuf-compiler libprotobuf-dev && \