diff --git a/bitnami/golang/1.18/debian-11/Dockerfile b/bitnami/golang/1.18/debian-11/Dockerfile
index fd5289f81228..9666b70e2a41 100644
--- a/bitnami/golang/1.18/debian-11/Dockerfile
+++ b/bitnami/golang/1.18/debian-11/Dockerfile
@@ -4,7 +4,7 @@ ARG TARGETARCH
 
 LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \
       org.opencontainers.image.description="Application packaged by Bitnami" \
-      org.opencontainers.image.ref.name="1.18.6-debian-11-r4" \
+      org.opencontainers.image.ref.name="1.18.6-debian-11-r5" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/golang" \
       org.opencontainers.image.title="golang" \
       org.opencontainers.image.vendor="VMware, Inc." \
@@ -27,7 +27,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     tar -zxf golang-1.18.6-0-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
     rm -rf golang-1.18.6-0-linux-${OS_ARCH}-debian-11.tar.gz golang-1.18.6-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256
 RUN apt-get update && apt-get upgrade -y && \
-    rm -r /var/lib/apt/lists /var/cache/apt/archives
+    apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives
 RUN mkdir -p "/go/src" "/go/bin" && chmod -R 777 "/go"
 
 ENV APP_VERSION="1.18.6" \
diff --git a/bitnami/golang/1.18/debian-11/prebuildfs/usr/sbin/install_packages b/bitnami/golang/1.18/debian-11/prebuildfs/usr/sbin/install_packages
index c9577647443b..2c915f265c9d 100755
--- a/bitnami/golang/1.18/debian-11/prebuildfs/usr/sbin/install_packages
+++ b/bitnami/golang/1.18/debian-11/prebuildfs/usr/sbin/install_packages
@@ -21,4 +21,4 @@ until [ $n -gt $max ]; do
     echo "apt failed, retrying"
     n=$(($n + 1))
 done
-rm -r /var/lib/apt/lists /var/cache/apt/archives
+apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives
diff --git a/bitnami/golang/README.md b/bitnami/golang/README.md
index 301ebe9d6b03..a19f7ce3c8ee 100644
--- a/bitnami/golang/README.md
+++ b/bitnami/golang/README.md
@@ -36,7 +36,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 
 
 * [`1.19`, `1.19-debian-11`, `1.19.1`, `1.19.1-debian-11-r5`, `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.6`, `1.18.6-debian-11-r4` (1.18/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/golang/1.18/debian-11/Dockerfile)
+* [`1.18`, `1.18-debian-11`, `1.18.6`, `1.18.6-debian-11-r5` (1.18/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/golang/1.18/debian-11/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).