diff --git a/Dockerfiles/build-base/ol/Dockerfile b/Dockerfiles/build-base/ol/Dockerfile
index fd348c175..7e0742701 100644
--- a/Dockerfiles/build-base/ol/Dockerfile
+++ b/Dockerfiles/build-base/ol/Dockerfile
@@ -22,6 +22,7 @@ RUN set -eux && \
             automake \
             bash \
             gcc \
+            go-toolset \
             pcre-devel \
             libcurl-devel \
             libevent-devel \
@@ -38,8 +39,6 @@ RUN set -eux && \
             postgresql-devel \
             java-1.8.0-openjdk-devel \
             git \
-            wget \
-            tar \
             gettext \
             unixODBC-devel" && \
     microdnf -y module enable mysql && \
@@ -51,28 +50,6 @@ RUN set -eux && \
         --setopt=install_weak_deps=0 \
         --best \
         --nodocs ${INSTALL_PKGS} && \
-    ARCH_SUFFIX="$(arch)"; \
-    case "$ARCH_SUFFIX" in \
-        x86_64) \
-            url='https://dl.google.com/go/go1.17.8.linux-amd64.tar.gz'; \
-            sha256='980e65a863377e69fd9b67df9d8395fd8e93858e7a24c9f55803421e453f4f99'; \
-            ;; \
-        aarch64) \
-            url='https://dl.google.com/go/go1.17.8.linux-arm64.tar.gz'; \
-            sha256='57a9171682e297df1a5bd287be056ed0280195ad079af90af16dcad4f64710cb'; \
-            ;; \
-        *) echo "Unknown ARCH_SUFFIX=${ARCH_SUFFIX-}"; exit 1 ;; \
-    esac; \
-    wget -O go.tgz.asc "$url.asc" && \
-    wget -O go.tgz "$url" --progress=dot:giga && \
-    echo "$sha256 *go.tgz" | sha256sum -c - && \
-    GNUPGHOME="$(mktemp -d)"; export GNUPGHOME; \
-    gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 'EB4C 1BFD 4F04 2F6D DDCC EC91 7721 F63B D38B 4796' && \
-    gpg --batch --verify go.tgz.asc go.tgz && \
-    gpgconf --kill all && \
-    rm -rf "$GNUPGHOME" go.tgz.asc && \
-    tar -C /usr/local -xzf go.tgz && \
-    rm go.tgz && \
     microdnf -y clean all && \
     rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \
     rm -rf /var/cache/dnf /etc/udev/hwdb.bin /root/.pki
diff --git a/Dockerfiles/build-base/rhel/Dockerfile b/Dockerfiles/build-base/rhel/Dockerfile
index 9f6c112ef..1caf24613 100644
--- a/Dockerfiles/build-base/rhel/Dockerfile
+++ b/Dockerfiles/build-base/rhel/Dockerfile
@@ -34,6 +34,7 @@ RUN set -eux && \
             automake \
             bash \
             gcc \
+            go-toolset \
             pcre-devel \
             libcurl-devel \
             libevent-devel \
@@ -50,8 +51,6 @@ RUN set -eux && \
             postgresql-devel \
             java-1.8.0-openjdk-devel \
             git \
-            wget \
-            tar \
             gettext \
             unixODBC-devel" && \
     microdnf -y module enable mysql && \
@@ -66,32 +65,6 @@ RUN set -eux && \
             --best \
             --setopt=tsflags=nodocs \
         ${INSTALL_PKGS} && \
-    ARCH_SUFFIX="$(arch)"; \
-    case "$ARCH_SUFFIX" in \
-        x86_64) \
-            url='https://dl.google.com/go/go1.17.8.linux-amd64.tar.gz'; \
-            sha256='980e65a863377e69fd9b67df9d8395fd8e93858e7a24c9f55803421e453f4f99'; \
-            ;; \
-        aarch64) \
-            url='https://dl.google.com/go/go1.17.8.linux-arm64.tar.gz'; \
-            sha256='57a9171682e297df1a5bd287be056ed0280195ad079af90af16dcad4f64710cb'; \
-            ;; \
-        ppc64le) \
-            url='https://dl.google.com/go/go1.17.8.linux-ppc64le.tar.gz'; \
-            sha256='2077dd2fc57a74b0630b0c239ae4e3114607311778effd43fcfe5174133ee188'; \
-            ;; \
-        *) echo "Unknown ARCH_SUFFIX=${ARCH_SUFFIX-}"; exit 1 ;; \
-    esac; \
-    wget -O go.tgz.asc "$url.asc" && \
-    wget -O go.tgz "$url" --progress=dot:giga && \
-    echo "$sha256 *go.tgz" | sha256sum -c - && \
-    GNUPGHOME="$(mktemp -d)"; export GNUPGHOME; \
-    gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 'EB4C 1BFD 4F04 2F6D DDCC EC91 7721 F63B D38B 4796' && \
-    gpg --batch --verify go.tgz.asc go.tgz && \
-    gpgconf --kill all && \
-    rm -rf "$GNUPGHOME" go.tgz.asc && \
-    tar -C /usr/local -xzf go.tgz && \
-    rm go.tgz && \
     microdnf -y clean all && \
     rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \
     rm -rf /var/cache/dnf /etc/udev/hwdb.bin /root/.pki