diff --git a/universal/ubi10/Dockerfile b/universal/ubi10/Dockerfile
index d001c4cf..531b4697 100644
--- a/universal/ubi10/Dockerfile
+++ b/universal/ubi10/Dockerfile
@@ -152,16 +152,14 @@ RUN mkdir -p $GOBIN \
         ppc64le) GO_ARCH="ppc64le" ;; \
         *) echo "Unsupported architecture: $TARGETARCH" && exit 1 ;; \
     esac \
-    && GO_VERSION="1.25.5" \
+    && GO_VERSION="1.26.8" \
     && curl -fsSL "https://go.dev/dl/go${GO_VERSION}.linux-${GO_ARCH}.tar.gz" -o /tmp/go.tar.gz \
     && tar -C /usr/local -xzf /tmp/go.tar.gz \
     && rm -rf /tmp/go.tar.gz \
     && go version \
-    && if [ "$TARGETARCH" = "ppc64le" ]; then \
-         CGO_ENABLED=0 GO111MODULE=on go install golang.org/x/tools/gopls@v0.21.0; \
-       else \
-         GO111MODULE=on go install golang.org/x/tools/gopls@v0.21.0; \
-       fi \
+    && CGO_ENABLED=0 GO111MODULE=on go install golang.org/x/tools/gopls@v0.23.0 \
+    && CGO_ENABLED=0 GO111MODULE=on go install golang.org/x/tools/cmd/goimports@v0.50.0 \
+    && CGO_ENABLED=0 GO111MODULE=on go install github.com/go-delve/delve/cmd/dlv@v1.27.2 \
     && chgrp -R 0 /home/tooling \
     && chmod -R g=u /home/tooling
 
diff --git a/universal/ubi9/Dockerfile b/universal/ubi9/Dockerfile
index 9e1456e7..9899cf1c 100644
--- a/universal/ubi9/Dockerfile
+++ b/universal/ubi9/Dockerfile
@@ -146,12 +146,14 @@ RUN mkdir -p $GOBIN \
         ppc64le) GO_ARCH="ppc64le" ;; \
         *) echo "Unsupported architecture: $TARGETARCH" && exit 1 ;; \
     esac \
-    && GO_VERSION="1.22.5" \
+    && GO_VERSION="1.26.8" \
     && curl -fsSL "https://go.dev/dl/go${GO_VERSION}.linux-${GO_ARCH}.tar.gz" -o /tmp/go.tar.gz \
     && tar -C /usr/local -xzf /tmp/go.tar.gz \
     && rm -rf /tmp/go.tar.gz \
     && go version \
-    && GO111MODULE=on go install golang.org/x/tools/gopls@v0.16.2 \
+    && CGO_ENABLED=0 GO111MODULE=on go install golang.org/x/tools/gopls@v0.23.0 \
+    && CGO_ENABLED=0 GO111MODULE=on go install golang.org/x/tools/cmd/goimports@v0.50.0 \
+    && CGO_ENABLED=0 GO111MODULE=on go install github.com/go-delve/delve/cmd/dlv@v1.27.2 \
     && chgrp -R 0 /home/tooling \
     && chmod -R g=u /home/tooling