diff --git a/.github/workflows/test-build-deploy.yml b/.github/workflows/test-build-deploy.yml
index f14b760b8e1..c532a9c1b7f 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:upgrade-to-go1.20.1-pr-5159
+      image: quay.io/cortexproject/build-image:upgrade-to-go-1.20.4-6025f83e5
     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:upgrade-to-go1.20.1-pr-5159
+      image: quay.io/cortexproject/build-image:upgrade-to-go-1.20.4-6025f83e5
     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:upgrade-to-go1.20.1-pr-5159
+      image: quay.io/cortexproject/build-image:upgrade-to-go-1.20.4-6025f83e5
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2
@@ -192,14 +192,14 @@ jobs:
         run: |
           touch build-image/.uptodate
           MIGRATIONS_DIR=$(pwd)/cmd/cortex/migrations
-          make BUILD_IMAGE=quay.io/cortexproject/build-image:upgrade-to-go1.20.1-pr-5159 TTY='' configs-integration-test
+          make BUILD_IMAGE=quay.io/cortexproject/build-image:upgrade-to-go-1.20.4-6025f83e5 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:upgrade-to-go1.20.1-pr-5159
+      image: quay.io/cortexproject/build-image:upgrade-to-go-1.20.4-6025f83e5
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2
@@ -241,7 +241,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:upgrade-to-go1.20.1-pr-5159
+      image: quay.io/cortexproject/build-image:upgrade-to-go-1.20.4-6025f83e5
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2
diff --git a/Makefile b/Makefile
index ecedaa67755..d33b618ebcd 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 ?= upgrade-to-go1.20.1-e6945e022
+LATEST_BUILD_IMAGE_TAG ?= upgrade-to-go-1.20.4-6025f83e5
 
 # 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 1a6644bc0ab..c412263f555 100644
--- a/build-image/Dockerfile
+++ b/build-image/Dockerfile
@@ -1,7 +1,7 @@
-FROM golang:1.20.1-buster
+FROM golang:1.20.4-bullseye
 ARG goproxyValue
 ENV GOPROXY=${goproxyValue}
-RUN apt-get update && apt-get install -y curl python-requests python-yaml file jq unzip protobuf-compiler libprotobuf-dev && \
+RUN apt-get update && apt-get install -y curl file jq unzip protobuf-compiler libprotobuf-dev && \
 	rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 RUN curl -sL https://deb.nodesource.com/setup_14.x | bash -
 RUN apt-get install -y nodejs && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*