diff --git a/bitnami/golang/1.18/debian-11/Dockerfile b/bitnami/golang/1.18/debian-11/Dockerfile
index 2921838ee941..f011d9a9c2df 100644
--- a/bitnami/golang/1.18/debian-11/Dockerfile
+++ b/bitnami/golang/1.18/debian-11/Dockerfile
@@ -1,11 +1,10 @@
 FROM docker.io/bitnami/minideb:bullseye
-LABEL maintainer "Bitnami <containers@bitnami.com>"
-
 ENV OS_ARCH="amd64" \
     OS_FLAVOUR="debian-11" \
     OS_NAME="linux"
 
 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.18.3-150-linux-amd64-debian-11.tar.gz && \
diff --git a/bitnami/golang/README.md b/bitnami/golang/README.md
index 83bd7e0c07c0..c402435868f0 100644
--- a/bitnami/golang/README.md
+++ b/bitnami/golang/README.md
@@ -35,7 +35,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.18`, `1.18-debian-11`, `1.18.3`, `1.18.3-debian-11-r7`, `latest` (1.18/debian-11/Dockerfile)](https://github.com/bitnami/bitnami-docker-golang/blob/1.18.3-debian-11-r7/1.18/debian-11/Dockerfile)
+* [`1.18`, `1.18-debian-11`, `1.18.3`, `1.18.3-debian-11-r8`, `latest` (1.18/debian-11/Dockerfile)](https://github.com/bitnami/bitnami-docker-golang/blob/1.18.3-debian-11-r8/1.18/debian-11/Dockerfile)
 * [`1.17`, `1.17-debian-11`, `1.17.11`, `1.17.11-debian-11-r7` (1.17/debian-11/Dockerfile)](https://github.com/bitnami/bitnami-docker-golang/blob/1.17.11-debian-11-r7/1.17/debian-11/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/golang GitHub repo](https://github.com/bitnami/bitnami-docker-golang).