diff --git a/.drone/drone.jsonnet b/.drone/drone.jsonnet
index 57a7841dd17..31c11b4fbbc 100644
--- a/.drone/drone.jsonnet
+++ b/.drone/drone.jsonnet
@@ -104,7 +104,7 @@ local image_tag_for_cd() = {
 
 local build_binaries(arch) = {
   name: 'build-tempo-binaries',
-  image: 'golang:1.20-alpine',
+  image: 'golang:1.20.4-alpine',
   commands: [
     'apk --update --no-cache add make git bash',
   ] + [
@@ -226,7 +226,7 @@ local deploy_to_dev() = {
     steps+: [
               {
                 name: 'build-tempo-serverless',
-                image: 'golang:1.20-alpine',
+                image: 'golang:1.20.4-alpine',
                 commands: [
                   'apk add make git zip bash',
                   './tools/image-tag | cut -d, -f 1 | tr A-Z a-z > .tags',  // values in .tags are used by the next step when pushing the image
@@ -323,7 +323,7 @@ local deploy_to_dev() = {
       },
       {
         name: 'write-key',
-        image: 'golang:1.20',
+        image: 'golang:1.20.4',
         commands: ['printf "%s" "$NFPM_SIGNING_KEY" > $NFPM_SIGNING_KEY_FILE'],
         environment: {
           NFPM_SIGNING_KEY: { from_secret: gpg_private_key.name },
@@ -332,7 +332,7 @@ local deploy_to_dev() = {
       },
       {
         name: 'test release',
-        image: 'golang:1.20',
+        image: 'golang:1.20.4',
         commands: ['make release-snapshot'],
         environment: {
           NFPM_DEFAULT_PASSPHRASE: { from_secret: gpg_passphrase.name },
@@ -365,7 +365,7 @@ local deploy_to_dev() = {
       },
       {
         name: 'release',
-        image: 'golang:1.20',
+        image: 'golang:1.20.4',
         commands: ['make release'],
         environment: {
           GITHUB_TOKEN: { from_secret: gh_token_secret.name },
diff --git a/.drone/drone.yml b/.drone/drone.yml
index 942453c8438..087f8a6fa2b 100644
--- a/.drone/drone.yml
+++ b/.drone/drone.yml
@@ -17,7 +17,7 @@ steps:
   - COMPONENT=tempo GOARCH=amd64 make exe
   - COMPONENT=tempo-vulture GOARCH=amd64 make exe
   - COMPONENT=tempo-query GOARCH=amd64 make exe
-  image: golang:1.20-alpine
+  image: golang:1.20.4-alpine
   name: build-tempo-binaries
 - image: plugins/docker
   name: build-tempo-image
@@ -77,7 +77,7 @@ steps:
   - COMPONENT=tempo GOARCH=arm64 make exe
   - COMPONENT=tempo-vulture GOARCH=arm64 make exe
   - COMPONENT=tempo-query GOARCH=arm64 make exe
-  image: golang:1.20-alpine
+  image: golang:1.20.4-alpine
   name: build-tempo-binaries
 - image: plugins/docker
   name: build-tempo-image
@@ -235,7 +235,7 @@ steps:
   - cd ./cmd/tempo-serverless
   - make build-docker-gcr-binary
   - make build-lambda-zip
-  image: golang:1.20-alpine
+  image: golang:1.20.4-alpine
   name: build-tempo-serverless
 - image: plugins/gcr
   name: deploy-tempo-serverless-gcr
@@ -304,7 +304,7 @@ steps:
     NFPM_SIGNING_KEY:
       from_secret: gpg_private_key
     NFPM_SIGNING_KEY_FILE: /drone/src/private-key.key
-  image: golang:1.20
+  image: golang:1.20.4
   name: write-key
 - commands:
   - make release-snapshot
@@ -312,7 +312,7 @@ steps:
     NFPM_DEFAULT_PASSPHRASE:
       from_secret: gpg_passphrase
     NFPM_SIGNING_KEY_FILE: /drone/src/private-key.key
-  image: golang:1.20
+  image: golang:1.20.4
   name: test release
 - commands:
   - ./tools/packaging/verify-deb-install.sh
@@ -338,7 +338,7 @@ steps:
     NFPM_DEFAULT_PASSPHRASE:
       from_secret: gpg_passphrase
     NFPM_SIGNING_KEY_FILE: /drone/src/private-key.key
-  image: golang:1.20
+  image: golang:1.20.4
   name: release
   when:
     event:
@@ -422,6 +422,6 @@ kind: secret
 name: gpg_passphrase
 ---
 kind: signature
-hmac: 74e4a96646f3ac2ec0e6083b07f789920e5bfba90043ac1ed62cd1e7c60026e6
+hmac: a21cc231bbdc856bdf15cc27e5d4e9006d1cb2f1f295dfb20156fe0726934861
 
 ...
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b5531e98917..c5aeff00168 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -46,6 +46,7 @@ storage:
 ```
 * [CHANGE] Ignore context canceled errors in the queriers [#2440](https://github.com/grafana/tempo/pull/2440) (@joe-elliott)
 * [CHANGE] Start flush queue worker after wal replay and block rediscovery [#2456](https://github.com/grafana/tempo/pull/2456) (@ie-pham)
+* [CHANGE] Update Go to 1.20.4 to match GET [#2486](https://github.com/grafana/tempo/pull/2486) (@ie-pham)
 
 ## v2.1.1 / 2023-04-28
 * [BUGFIX] Fix issue where Tempo sometimes flips booleans from false->true at storage time. [#2400](https://github.com/grafana/tempo/issues/2400) (@joe-elliott)
diff --git a/cmd/tempo-serverless/lambda/Dockerfile b/cmd/tempo-serverless/lambda/Dockerfile
index 435ba93482c..8d268c103d2 100644
--- a/cmd/tempo-serverless/lambda/Dockerfile
+++ b/cmd/tempo-serverless/lambda/Dockerfile
@@ -13,7 +13,7 @@
 #
 # build the lambda and retrive the lambda-local-proxy
 #
-FROM golang:1.20-buster AS build
+FROM golang:1.20.4-buster AS build
 
 # copy in the lambda. todo: build in container
 COPY lambda /