diff --git a/bitnami/golang/1.21/debian-11/Dockerfile b/bitnami/golang/1.21/debian-11/Dockerfile
index 761e7563eea9..68abfe51a209 100644
--- a/bitnami/golang/1.21/debian-11/Dockerfile
+++ b/bitnami/golang/1.21/debian-11/Dockerfile
@@ -7,10 +7,10 @@ ARG TARGETARCH
 
 LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \
       org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
-      org.opencontainers.image.created="2024-01-10T10:56:06Z" \
+      org.opencontainers.image.created="2024-01-19T19:45:24Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="1.21.6-debian-11-r0" \
+      org.opencontainers.image.ref.name="1.21.6-debian-11-r1" \
       org.opencontainers.image.title="golang" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="1.21.6"
@@ -38,6 +38,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \
     done
 RUN apt-get update && apt-get upgrade -y && \
     apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives
+RUN find / -perm /6000 -type f -exec chmod a-s {} \; || true
 RUN mkdir -p "/go/src" "/go/bin" && chmod -R 777 "/go"
 
 ENV APP_VERSION="1.21.6" \
diff --git a/bitnami/golang/README.md b/bitnami/golang/README.md
index 13a6a50c2cfd..9f569042f4a9 100644
--- a/bitnami/golang/README.md
+++ b/bitnami/golang/README.md
@@ -13,13 +13,6 @@ Trademarks: This software listing is packaged by Bitnami. The respective tradema
 docker run --name golang bitnami/golang:latest
 ```
 
-### Docker Compose
-
-```console
-curl -sSL https://raw.githubusercontent.com/bitnami/containers/main/bitnami/golang/docker-compose.yml > docker-compose.yml
-docker-compose up -d
-```
-
 ## Why use Bitnami Images?
 
 * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems.
@@ -164,6 +157,12 @@ Re-create your container from the new image.
 docker run --name golang bitnami/golang:latest
 ```
 
+## Using `docker-compose.yaml`
+
+Please be aware this file has not undergone internal testing. Consequently, we advise its use exclusively for development or testing purposes.
+
+If you detect any issue in the `docker-compose.yaml` file, feel free to report it or contribute with a fix by following our [Contributing Guidelines](https://github.com/bitnami/containers/blob/main/CONTRIBUTING.md).
+
 ## Contributing
 
 We'd love for you to contribute to this container. You can request new features by creating an [issue](https://github.com/bitnami/containers/issues) or submitting a [pull request](https://github.com/bitnami/containers/pulls) with your contribution.