diff --git a/README.md b/README.md
index f9e9dc7a..a409671d 100644
--- a/README.md
+++ b/README.md
@@ -142,7 +142,7 @@ docker run -ti --rm \
 | `yarn`              |`<via npm>`                          |
 |--------GO-----------|-------------------------------------|
 | `go`                |`go-toolset`                         |
-| `gopls`             |`golang.org/x/tools/gopls v0.16.2`   |
+| `gopls`             |`golang.org/x/tools/gopls v0.21.0`   |
 |--------.NET---------|-------------------------------------|
 | `dotnet`            |`dotnet-sdk-8.0`                     |
 |------PYTHON---------|-------------------------------------|
diff --git a/base/ubi9/Dockerfile b/base/ubi9/Dockerfile
index a9540977..c251484f 100644
--- a/base/ubi9/Dockerfile
+++ b/base/ubi9/Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1.3-labs
 
 # https://catalog.redhat.com/en/software/containers/ubi9/ubi/
-FROM registry.access.redhat.com/ubi9/ubi:9.6-1756915113
+FROM registry.access.redhat.com/ubi9/ubi:9.7-1764794285
 
 ARG TARGETARCH
 LABEL maintainer="Red Hat, Inc."
diff --git a/universal/ubi9/Dockerfile b/universal/ubi9/Dockerfile
index 78cb4b37..04d3db15 100644
--- a/universal/ubi9/Dockerfile
+++ b/universal/ubi9/Dockerfile
@@ -125,9 +125,9 @@ RUN curl -fLo mill https://raw.githubusercontent.com/lefou/millw/main/millw && \
 RUN dnf -y install llvm-toolset gcc gcc-c++ clang clang-libs clang-tools-extra gdb
 
 # Go 1.22+    - installed to /usr/bin/go
-# gopls 0.16.2+ - installed to /home/tooling/go/bin/gopls and /home/tooling/go/pkg/mod/
+# gopls 0.21.0+ - installed to /home/tooling/go/bin/gopls and /home/tooling/go/pkg/mod/
 RUN dnf install -y go-toolset && \
-    GO111MODULE=on go install -v golang.org/x/tools/gopls@v0.16.2 && \
+    GO111MODULE=on go install -v golang.org/x/tools/gopls@v0.21.0 && \
     chgrp -R 0 /home/tooling && chmod -R g=u /home/tooling
 ENV GOBIN="/home/tooling/go/bin/"
 ENV PATH="$GOBIN:$PATH"