diff --git a/bitnami/golang/1.17/debian-11/Dockerfile b/bitnami/golang/1.17/debian-11/Dockerfile
index 255cc4a59eef..745f6e9fcb22 100644
--- a/bitnami/golang/1.17/debian-11/Dockerfile
+++ b/bitnami/golang/1.17/debian-11/Dockerfile
@@ -5,7 +5,7 @@ ENV OS_ARCH="amd64" \
 
 LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \
       org.opencontainers.image.description="Application packaged by Bitnami" \
-      org.opencontainers.image.ref.name="1.17.13-debian-11-r8" \
+      org.opencontainers.image.ref.name="1.17.13-debian-11-r9" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/golang" \
       org.opencontainers.image.title="golang" \
       org.opencontainers.image.vendor="VMware, Inc." \
@@ -14,11 +14,14 @@ LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \
 COPY prebuildfs /
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 # Install required system packages and dependencies
-RUN install_packages build-essential ca-certificates curl git gzip libc6 pkg-config procps tar unzip wget
-RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stacksmith/golang-1.17.13-1-linux-amd64-debian-11.tar.gz && \
-    echo "3469666631068d18a829e5bf0e3ffcda3b28a1aebe2151391768d45869867409  /tmp/bitnami/pkg/cache/golang-1.17.13-1-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \
-    tar -zxf /tmp/bitnami/pkg/cache/golang-1.17.13-1-linux-amd64-debian-11.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \
-    rm -rf /tmp/bitnami/pkg/cache/golang-1.17.13-1-linux-amd64-debian-11.tar.gz
+RUN install_packages build-essential ca-certificates curl git gzip libc6 pkg-config procps tar unzip
+RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
+    if [ ! -f golang-1.17.13-2-linux-amd64-debian-11.tar.gz ]; then \
+      curl -SsLf https://downloads.bitnami.com/files/stacksmith/golang-1.17.13-2-linux-amd64-debian-11.tar.gz -O ; \
+    fi && \
+    echo "4ce1f7c401d1fdd08a8540ca7b25d1e54da44dd88c0fd63e163bb0c43e2c2820  golang-1.17.13-2-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \
+    tar -zxf golang-1.17.13-2-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --wildcards '*/files' && \
+    rm -rf golang-1.17.13-2-linux-amd64-debian-11.tar.gz
 RUN apt-get update && apt-get upgrade -y && \
     rm -r /var/lib/apt/lists /var/cache/apt/archives
 RUN mkdir -p "/go/src" "/go/bin" && chmod -R 777 "/go"
diff --git a/bitnami/golang/1.17/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/golang/1.17/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index c5081f93e01d..9111f7a77182 100644
--- a/bitnami/golang/1.17/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/golang/1.17/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -1,9 +1,9 @@
 {
     "golang": {
         "arch": "amd64",
-        "digest": "3469666631068d18a829e5bf0e3ffcda3b28a1aebe2151391768d45869867409",
+        "digest": "4ce1f7c401d1fdd08a8540ca7b25d1e54da44dd88c0fd63e163bb0c43e2c2820",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "1.17.13-1"
+        "version": "1.17.13-2"
     }
 }
\ No newline at end of file
diff --git a/bitnami/golang/README.md b/bitnami/golang/README.md
index a6ccc6c2aa0c..ed22d19d52fa 100644
--- a/bitnami/golang/README.md
+++ b/bitnami/golang/README.md
@@ -35,9 +35,9 @@ $ docker-compose up -d
 Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/).
 
 
-* [`1.19`, `1.19-debian-11`, `1.19.0`, `1.19.0-debian-11-r7`, `latest` (1.19/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/golang/1.19/debian-11/Dockerfile)
-* [`1.18`, `1.18-debian-11`, `1.18.5`, `1.18.5-debian-11-r8` (1.18/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/golang/1.18/debian-11/Dockerfile)
-* [`1.17`, `1.17-debian-11`, `1.17.13`, `1.17.13-debian-11-r8` (1.17/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/golang/1.17/debian-11/Dockerfile)
+* [`1.19`, `1.19-debian-11`, `1.19.0`, `1.19.0-debian-11-r8`, `latest` (1.19/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/golang/1.19/debian-11/Dockerfile)
+* [`1.18`, `1.18-debian-11`, `1.18.5`, `1.18.5-debian-11-r9` (1.18/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/golang/1.18/debian-11/Dockerfile)
+* [`1.17`, `1.17-debian-11`, `1.17.13`, `1.17.13-debian-11-r9` (1.17/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/golang/1.17/debian-11/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).