diff --git a/bitnami/pushgateway/0/debian-9/Dockerfile b/bitnami/pushgateway/0/debian-9/Dockerfile
new file mode 100644
index 000000000000..faae9ef9df17
--- /dev/null
+++ b/bitnami/pushgateway/0/debian-9/Dockerfile
@@ -0,0 +1,23 @@
+FROM bitnami/minideb:stretch as buildenv
+
+RUN install_packages ca-certificates wget
+RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stacksmith/pushgateway-0.5.2-0-linux-amd64-debian-9.tar.gz && \
+    echo "eaead463b00c9b33b42934b12d5b0f4475208eb210e478ab78e9540a8bc5b460  /tmp/bitnami/pkg/cache/pushgateway-0.5.2-0-linux-amd64-debian-9.tar.gz" | sha256sum -c - && \
+    tar -zxf /tmp/bitnami/pkg/cache/pushgateway-0.5.2-0-linux-amd64-debian-9.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \
+    rm -rf /tmp/bitnami/pkg/cache/pushgateway-0.5.2-0-linux-amd64-debian-9.tar.gz
+
+##################
+
+FROM bitnami/minideb:stretch
+LABEL maintainer "Bitnami <containers@bitnami.com>"
+
+COPY --from=buildenv /opt/bitnami/pushgateway /opt/bitnami/pushgateway
+ENV BITNAMI_APP_NAME="pushgateway" \
+    BITNAMI_IMAGE_VERSION="0.5.2-debian-9-r0" \
+    PATH="/opt/bitnami/pushgateway/bin:$PATH"
+
+EXPOSE 9091
+
+WORKDIR /opt/bitnami/pushgateway
+USER 1001
+ENTRYPOINT ["/opt/bitnami/pushgateway/bin/pushgateway"]
diff --git a/bitnami/pushgateway/0/debian-9/docker-compose.yml b/bitnami/pushgateway/0/debian-9/docker-compose.yml
new file mode 100644
index 000000000000..fa9c49939192
--- /dev/null
+++ b/bitnami/pushgateway/0/debian-9/docker-compose.yml
@@ -0,0 +1,5 @@
+version: '2'
+
+services:
+  pushgateway:
+    image: bitnami/pushgateway:0
diff --git a/bitnami/pushgateway/README.md b/bitnami/pushgateway/README.md
index 5bb8a7a92bf4..6b63800b404f 100644
--- a/bitnami/pushgateway/README.md
+++ b/bitnami/pushgateway/README.md
@@ -23,8 +23,8 @@ $ docker run --name pushgateway bitnami/pushgateway:latest
 # Supported tags and respective `Dockerfile` links
 
 * [`0-ol-7`, `0.5.2-ol-7-r14` (0/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-pushgateway/blob/0.5.2-ol-7-r14/0/ol-7/Dockerfile)
+* [`0-debian-9`, `0.5.2-debian-9-r0` (0/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-pushgateway/blob/0.5.2-debian-9-r0/0/debian-9/Dockerfile)
 * [`0-debian-8`, `0.5.2-debian-8-r20`, `0`, `0.5.2`, `0.5.2-r20`, `latest` (0/Dockerfile)](https://github.com/bitnami/bitnami-docker-pushgateway/blob/0.5.2-debian-8-r20/0/Dockerfile)
-* [`0-debian-9`, `0.0.0-debian-9-r0` (0/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-pushgateway/blob/0.0.0-debian-9-r0/0/debian-9/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/pushgateway GitHub repo](https://github.com/bitnami/bitnami-docker-pushgateway).