diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fb2bace8..74e28c13 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -55,7 +55,7 @@ jobs:
     name: All SDKs image
     strategy:
       matrix:
-        go-version: [1.20.x]
+        go-version: [1.21.x]
     runs-on: ubuntu-latest
     steps:
       # If no version of Pulumi is supplied by the incoming event (e.g. in the
@@ -86,7 +86,7 @@ jobs:
       - name: Install go
         uses: actions/setup-go@v2
         with:
-          go-version: "1.20.3"
+          go-version: "1.21.1"
       - name: Compile tests
         working-directory: tests
         run: |
@@ -106,7 +106,7 @@ jobs:
     name: Provider Build Environment image
     strategy:
       matrix:
-        go-version: [1.20.x]
+        go-version: [1.21.x]
     runs-on: ubuntu-latest
     steps:
       # If no version of Pulumi is supplied by the incoming event (e.g. in the
@@ -137,7 +137,7 @@ jobs:
       - name: Install go
         uses: actions/setup-go@v2
         with:
-          go-version: "1.20.3"
+          go-version: "1.21.1"
       - name: Compile tests
         working-directory: tests
         run: |
@@ -218,7 +218,7 @@ jobs:
       - name: Install go
         uses: actions/setup-go@v2
         with:
-          go-version: "1.20.3"
+          go-version: "1.21.1"
       - name: Compile tests
         working-directory: tests
         run: |
@@ -285,7 +285,7 @@ jobs:
       - name: Install go
         uses: actions/setup-go@v2
         with:
-          go-version: "1.20.3"
+          go-version: "1.21.1"
       - name: Compile tests
         working-directory: tests
         run: |
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e8edd156..e06d129b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -46,7 +46,7 @@ jobs:
     name: All SDKs image
     strategy:
       matrix:
-        go-version: [1.20.x]
+        go-version: [1.21.x]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@master
@@ -77,7 +77,7 @@ jobs:
       - name: Install go
         uses: actions/setup-go@v2
         with:
-          go-version: "1.20.3"
+          go-version: "1.21.1"
       - name: Compile tests
         working-directory: tests
         run: |
@@ -102,7 +102,7 @@ jobs:
     name: Provider Build Environment image
     strategy:
       matrix:
-        go-version: [1.20.x]
+        go-version: [1.21.1]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@master
@@ -133,7 +133,7 @@ jobs:
       - name: Install go
         uses: actions/setup-go@v2
         with:
-          go-version: "1.20.3"
+          go-version: "1.21.1"
       - name: Compile tests
         working-directory: tests
         run: |
@@ -263,7 +263,7 @@ jobs:
       - name: Install go
         uses: actions/setup-go@v2
         with:
-          go-version: "1.20.3"
+          go-version: "1.21.1"
       - name: Compile tests
         working-directory: tests
         run: |
@@ -370,7 +370,7 @@ jobs:
       - name: Install go
         uses: actions/setup-go@v2
         with:
-          go-version: "1.20.3"
+          go-version: "1.21.1"
       - name: Compile tests
         working-directory: tests
         run: |
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bb1680aa..e1eecd8a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 3.87.0
+
+- Upgrade Go to 1.21.1. ([#159](https://github.com/pulumi/pulumi-docker-containers/pull/159))
+
 ## 3.82.0
 
 - Upgrade Node.js in the `pulumi/pulumi` image and `pulumi/nodejs` UBI image to the Active LTS version 18
diff --git a/README.md b/README.md
index 48c719a5..bb9a2ce8 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@ Images are pushed to:
 ## Included Versions
 
 - .NET 6.0
-- Go 1.20
+- Go 1.21
 - JDK 11
 - Node.js 18
 - Python 3.9
diff --git a/docker/go/Dockerfile b/docker/go/Dockerfile
index 1be9651e..f06fd64d 100644
--- a/docker/go/Dockerfile
+++ b/docker/go/Dockerfile
@@ -6,11 +6,11 @@
 FROM ubuntu:bionic AS builder
 
 ARG PULUMI_VERSION
-ARG GO_RUNTIME_VERSION=1.20.3
-ENV GO_RUNTIME_386_SHA256 e12384311403f1389d14cc1c1295bfb4e0dd5ab919403b80da429f671a223507
-ENV GO_RUNTIME_AMD64_SHA256 979694c2c25c735755bf26f4f45e19e64e4811d661dd07b8c010f7a8e18adfca
-ENV GO_RUNTIME_ARM64_SHA256 eb186529f13f901e7a2c4438a05c2cd90d74706aaa0a888469b2a4a617b6ee54
-ENV GO_RUNTIME_ARMV6L_SHA256 b421e90469a83671641f81b6e20df6500f033e9523e89cbe7b7223704dd1035c
+ARG GO_RUNTIME_VERSION=1.21.1
+ENV GO_RUNTIME_386_SHA256 b93850666cdadbd696a986cf7b03111fe99db8c34a9aaa113d7c96d0081e1901
+ENV GO_RUNTIME_AMD64_SHA256 b3075ae1ce5dab85f89bc7905d1632de23ca196bd8336afd93fa97434cfa55ae
+ENV GO_RUNTIME_ARM64_SHA256 7da1a3936a928fd0b2602ed4f3ef535b8cd1990f1503b8d3e1acc0fa0759c967
+ENV GO_RUNTIME_ARMV6L_SHA256 f3716a43f59ae69999841d6007b42c9e286e8d8ce470656fb3e70d7be2d7ca85
 
 WORKDIR /golang
 RUN apt-get update -y && \
diff --git a/docker/go/Dockerfile.ubi b/docker/go/Dockerfile.ubi
index d8b7066c..3897d27e 100644
--- a/docker/go/Dockerfile.ubi
+++ b/docker/go/Dockerfile.ubi
@@ -15,8 +15,8 @@ RUN microdnf install -y \
 RUN curl -fsSL https://get.pulumi.com/ | bash -s -- --version $PULUMI_VERSION
 
 # Set go versions
-ARG RUNTIME_VERSION=1.20.3
-ENV RUNTIME_SHA256 979694c2c25c735755bf26f4f45e19e64e4811d661dd07b8c010f7a8e18adfca
+ARG RUNTIME_VERSION=1.21.1
+ENV RUNTIME_SHA256 b3075ae1ce5dab85f89bc7905d1632de23ca196bd8336afd93fa97434cfa55ae
 
 WORKDIR /golang
 RUN microdnf install -y \
diff --git a/docker/pulumi/Dockerfile b/docker/pulumi/Dockerfile
index 0611b097..c969bb37 100644
--- a/docker/pulumi/Dockerfile
+++ b/docker/pulumi/Dockerfile
@@ -8,8 +8,8 @@ LABEL "homepage"="https://pulumi.com"
 LABEL "maintainer"="Pulumi Team <team@pulumi.com>"
 LABEL org.opencontainers.image.description="The Pulumi CLI, in a Docker container."
 
-ENV GOLANG_VERSION 1.20.3
-ENV GOLANG_SHA256 979694c2c25c735755bf26f4f45e19e64e4811d661dd07b8c010f7a8e18adfca
+ENV GOLANG_VERSION 1.21.1
+ENV GOLANG_SHA256 b3075ae1ce5dab85f89bc7905d1632de23ca196bd8336afd93fa97434cfa55ae
 
 # Install deps all in one step
 RUN apt-get update -y && \