diff --git a/bitnami/acmesolver/0/debian-10/Dockerfile b/bitnami/acmesolver/0/debian-10/Dockerfile
index 36a587c277b9..40072b097a98 100644
--- a/bitnami/acmesolver/0/debian-10/Dockerfile
+++ b/bitnami/acmesolver/0/debian-10/Dockerfile
@@ -1,6 +1,11 @@
 FROM docker.io/bitnami/minideb:buster
 LABEL maintainer "Bitnami <containers@bitnami.com>"
 
+ENV HOME="/" \
+    OS_ARCH="amd64" \
+    OS_FLAVOUR="debian-10" \
+    OS_NAME="linux"
+
 COPY prebuildfs /
 # Install required system packages and dependencies
 RUN install_packages ca-certificates curl gzip procps tar wget
@@ -13,11 +18,7 @@ RUN apt-get update && apt-get upgrade -y && \
 RUN chmod g+rwX /opt/bitnami
 
 ENV BITNAMI_APP_NAME="acmesolver" \
-    BITNAMI_IMAGE_VERSION="0.15.2-debian-10-r17" \
-    HOME="/" \
-    OS_ARCH="amd64" \
-    OS_FLAVOUR="debian-10" \
-    OS_NAME="linux" \
+    BITNAMI_IMAGE_VERSION="0.15.2-debian-10-r18" \
     PATH="/opt/bitnami/acmesolver/bin:$PATH"
 
 WORKDIR /opt/bitnami/acmesolver
diff --git a/bitnami/acmesolver/README.md b/bitnami/acmesolver/README.md
index 34d8596e4ea0..6493a31f3e79 100644
--- a/bitnami/acmesolver/README.md
+++ b/bitnami/acmesolver/README.md
@@ -32,7 +32,7 @@ Non-root container images add an extra layer of security and are generally recom
 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/).
 
 
-* [`0-debian-10`, `0.15.2-debian-10-r17`, `0`, `0.15.2`, `latest` (0/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-acmesolver/blob/0.15.2-debian-10-r17/0/debian-10/Dockerfile)
+* [`0-debian-10`, `0.15.2-debian-10-r18`, `0`, `0.15.2`, `latest` (0/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-acmesolver/blob/0.15.2-debian-10-r18/0/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/acmesolver GitHub repo](https://github.com/bitnami/bitnami-docker-acmesolver).