diff --git a/Dockerfile b/Dockerfile
index fdfd08227..b7b71c928 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -39,8 +39,9 @@ RUN yum install -y  \
 ENV HOME /home
 
 # Lock Go Lang version to stable
-RUN /bin/gimme stable; \
-      export GO_STABLE_VERSION=`cat /home/.gimme/versions/stable`; \
+RUN export GO_STABLE_VERSION=`curl --silent https://go.dev/VERSION?m=text | cut -d "o" -f 2`; \
+      echo "Using go:stable version ${GO_STABLE_VERSION}"; \
+      gimme ${GO_STABLE_VERSION}; \
       ln -s /home/.gimme/versions/go${GO_STABLE_VERSION}.linux.arm64 /home/.gimme/versions/gostable.linux.arm64; \
       ln -s /home/.gimme/versions/go${GO_STABLE_VERSION}.linux.amd64 /home/.gimme/versions/gostable.linux.amd64
 ENV PATH ${PATH}:/home/.gimme/versions/gostable.linux.arm64/bin:/home/.gimme/versions/gostable.linux.amd64/bin
diff --git a/Dockerfile.debug b/Dockerfile.debug
index c3cdba0aa..96363d612 100644
--- a/Dockerfile.debug
+++ b/Dockerfile.debug
@@ -40,8 +40,9 @@ RUN yum install -y  \
 ENV HOME /home
 
 # Lock Go Lang version to stable
-RUN /bin/gimme stable; \
-      export GO_STABLE_VERSION=`cat /home/.gimme/versions/stable`; \
+RUN export GO_STABLE_VERSION=`curl --silent https://go.dev/VERSION?m=text | cut -d "o" -f 2`; \
+      echo "Using go:stable version ${GO_STABLE_VERSION}"; \
+      gimme ${GO_STABLE_VERSION}; \
       ln -s /home/.gimme/versions/go${GO_STABLE_VERSION}.linux.arm64 /home/.gimme/versions/gostable.linux.arm64; \
       ln -s /home/.gimme/versions/go${GO_STABLE_VERSION}.linux.amd64 /home/.gimme/versions/gostable.linux.amd64
 ENV PATH ${PATH}:/home/.gimme/versions/gostable.linux.arm64/bin:/home/.gimme/versions/gostable.linux.amd64/bin
diff --git a/Dockerfile.init b/Dockerfile.init
index 328c6bc49..5a8a1e2ee 100644
--- a/Dockerfile.init
+++ b/Dockerfile.init
@@ -6,8 +6,9 @@ RUN yum upgrade -y && yum install -y tar gzip git
 ENV HOME /home
 
 # Lock Go Lang version to stable
-RUN /bin/gimme stable; \
-      export GO_STABLE_VERSION=`cat /home/.gimme/versions/stable`; \
+RUN export GO_STABLE_VERSION=`curl --silent https://go.dev/VERSION?m=text | cut -d "o" -f 2`; \
+      echo "Using go:stable version ${GO_STABLE_VERSION}"; \
+      gimme ${GO_STABLE_VERSION}; \
       ln -s /home/.gimme/versions/go${GO_STABLE_VERSION}.linux.arm64 /home/.gimme/versions/gostable.linux.arm64; \
       ln -s /home/.gimme/versions/go${GO_STABLE_VERSION}.linux.amd64 /home/.gimme/versions/gostable.linux.amd64
 ENV PATH ${PATH}:/home/.gimme/versions/gostable.linux.arm64/bin:/home/.gimme/versions/gostable.linux.amd64/bin
diff --git a/Dockerfile.plugins b/Dockerfile.plugins
index e38417181..b54f5e800 100644
--- a/Dockerfile.plugins
+++ b/Dockerfile.plugins
@@ -5,8 +5,9 @@ RUN yum upgrade -y && yum install -y tar gzip git make gcc
 ENV HOME /home
 
 # Lock Go Lang version to stable
-RUN /bin/gimme stable; \
-      export GO_STABLE_VERSION=`cat /home/.gimme/versions/stable`; \
+RUN export GO_STABLE_VERSION=`curl --silent https://go.dev/VERSION?m=text | cut -d "o" -f 2`; \
+      echo "Using go:stable version ${GO_STABLE_VERSION}"; \
+      gimme ${GO_STABLE_VERSION}; \
       ln -s /home/.gimme/versions/go${GO_STABLE_VERSION}.linux.arm64 /home/.gimme/versions/gostable.linux.arm64; \
       ln -s /home/.gimme/versions/go${GO_STABLE_VERSION}.linux.amd64 /home/.gimme/versions/gostable.linux.amd64
 ENV PATH ${PATH}:/home/.gimme/versions/gostable.linux.arm64/bin:/home/.gimme/versions/gostable.linux.amd64/bin