diff --git a/bitnami/golang/1.17/debian-10/Dockerfile b/bitnami/golang/1.17/debian-10/Dockerfile
index 090bc3960300..3c9d8cb9c6fb 100644
--- a/bitnami/golang/1.17/debian-10/Dockerfile
+++ b/bitnami/golang/1.17/debian-10/Dockerfile
@@ -15,7 +15,7 @@ RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stac
 RUN mkdir -p "/go/src" "/go/bin" && chmod -R 777 "/go"
 
 ENV BITNAMI_APP_NAME="golang" \
-    BITNAMI_IMAGE_VERSION="1.17.2-debian-10-r17" \
+    BITNAMI_IMAGE_VERSION="1.17.2-debian-10-r18" \
     GOPATH="/go" \
     PATH="/go/bin:/opt/bitnami/go/bin:$PATH"
 
diff --git a/bitnami/golang/README.md b/bitnami/golang/README.md
index 010580c3ecdc..b2e38c1062de 100644
--- a/bitnami/golang/README.md
+++ b/bitnami/golang/README.md
@@ -33,7 +33,7 @@ $ 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.17`, `1.17-debian-10`, `1.17.2`, `1.17.2-debian-10-r17` (1.17/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-golang/blob/1.17.2-debian-10-r17/1.17/debian-10/Dockerfile)
+* [`1.17`, `1.17-debian-10`, `1.17.2`, `1.17.2-debian-10-r18` (1.17/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-golang/blob/1.17.2-debian-10-r18/1.17/debian-10/Dockerfile)
 * [`1.16`, `1.16-debian-10`, `1.16.9`, `1.16.9-debian-10-r17`, `latest` (1.16/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-golang/blob/1.16.9-debian-10-r17/1.16/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/golang GitHub repo](https://github.com/bitnami/bitnami-docker-golang).