diff --git a/bitnami/gitlab-runner/18/debian-12/Dockerfile b/bitnami/gitlab-runner/18/debian-12/Dockerfile
index 916a83d79839..926885a2d3fd 100644
--- a/bitnami/gitlab-runner/18/debian-12/Dockerfile
+++ b/bitnami/gitlab-runner/18/debian-12/Dockerfile
@@ -8,10 +8,10 @@ ARG TARGETARCH
 
 LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \
       org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
-      org.opencontainers.image.created="2025-06-02T13:58:22Z" \
+      org.opencontainers.image.created="2025-06-05T22:55:48Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/gitlab-runner/README.md" \
-      org.opencontainers.image.ref.name="18.0.2-debian-12-r0" \
+      org.opencontainers.image.ref.name="18.0.2-debian-12-r1" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/gitlab-runner" \
       org.opencontainers.image.title="gitlab-runner" \
       org.opencontainers.image.vendor="Broadcom, Inc." \
@@ -28,7 +28,7 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"]
 RUN install_packages ca-certificates curl git git-lfs openssh-client procps
 RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \
     COMPONENTS=( \
-      "gitlab-runner-18.0.2-0-linux-${OS_ARCH}-debian-12" \
+      "gitlab-runner-18.0.2-1-linux-${OS_ARCH}-debian-12" \
     ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
diff --git a/bitnami/gitlab-runner/18/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/gitlab-runner/18/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
index 5f574a8f1c33..21a27b695405 100644
--- a/bitnami/gitlab-runner/18/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/gitlab-runner/18/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -3,6 +3,6 @@
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "18.0.2-0"
+        "version": "18.0.2-1"
     }
 }
\ No newline at end of file
diff --git a/bitnami/gitlab-runner/18/debian-12/prebuildfs/usr/sbin/uninstall_packages b/bitnami/gitlab-runner/18/debian-12/prebuildfs/usr/sbin/uninstall_packages
new file mode 100755
index 000000000000..615c430e4e68
--- /dev/null
+++ b/bitnami/gitlab-runner/18/debian-12/prebuildfs/usr/sbin/uninstall_packages
@@ -0,0 +1,26 @@
+#!/bin/sh
+# Copyright Broadcom, Inc. All Rights Reserved.
+# SPDX-License-Identifier: APACHE-2.0
+set -eu
+
+n=0
+max=2
+export DEBIAN_FRONTEND=noninteractive
+
+until [ $n -gt $max ]; do
+    set +e
+    (
+        apt-get autoremove --purge -y "$@"
+    )
+    CODE=$?
+    set -e
+    if [ $CODE -eq 0 ]; then
+        break
+    fi
+    if [ $n -eq $max ]; then
+        exit $CODE
+    fi
+    echo "apt failed, retrying"
+    n=$(($n + 1))
+done
+apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives