diff --git a/Dockerfile.template b/Dockerfile.template
index 9520fd9..0238f37 100644
--- a/Dockerfile.template
+++ b/Dockerfile.template
@@ -1,6 +1,6 @@
 FROM {{ pihole.base }}
 
-ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/download/v1.21.4.0/s6-overlay-amd64.tar.gz
+ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/download/{{ pihole.s6_version }}/s6-overlay-{{ pihole.s6arch }}.tar.gz
 COPY install.sh /usr/local/bin/install.sh
 ENV PIHOLE_INSTALL /root/ph_install.sh
 
diff --git a/Dockerfile_aarch64 b/Dockerfile_aarch64
index f03faef..2d96b5f 100644
--- a/Dockerfile_aarch64
+++ b/Dockerfile_aarch64
@@ -1,6 +1,6 @@
 FROM multiarch/debian-debootstrap:arm64-stretch-slim
 
-ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/download/v1.21.4.0/s6-overlay-amd64.tar.gz
+ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/download/v1.21.7.0/s6-overlay-aarch64.tar.gz
 COPY install.sh /usr/local/bin/install.sh
 ENV PIHOLE_INSTALL /root/ph_install.sh
 
diff --git a/Dockerfile_amd64 b/Dockerfile_amd64
index a7fad91..0bee311 100644
--- a/Dockerfile_amd64
+++ b/Dockerfile_amd64
@@ -1,6 +1,6 @@
 FROM pihole/debian-base:latest
 
-ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/download/v1.21.4.0/s6-overlay-amd64.tar.gz
+ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/download/v1.21.7.0/s6-overlay-amd64.tar.gz
 COPY install.sh /usr/local/bin/install.sh
 ENV PIHOLE_INSTALL /root/ph_install.sh
 
diff --git a/Dockerfile_armel b/Dockerfile_armel
index b3a7e20..4f746b1 100644
--- a/Dockerfile_armel
+++ b/Dockerfile_armel
@@ -1,6 +1,6 @@
 FROM multiarch/debian-debootstrap:armel-stretch-slim
 
-ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/download/v1.21.4.0/s6-overlay-amd64.tar.gz
+ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/download/v1.21.7.0/s6-overlay-arm.tar.gz
 COPY install.sh /usr/local/bin/install.sh
 ENV PIHOLE_INSTALL /root/ph_install.sh
 
diff --git a/Dockerfile_armhf b/Dockerfile_armhf
index c61c24a..037e68a 100644
--- a/Dockerfile_armhf
+++ b/Dockerfile_armhf
@@ -1,6 +1,6 @@
 FROM multiarch/debian-debootstrap:armhf-stretch-slim
 
-ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/download/v1.21.4.0/s6-overlay-amd64.tar.gz
+ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/download/v1.21.7.0/s6-overlay-armhf.tar.gz
 COPY install.sh /usr/local/bin/install.sh
 ENV PIHOLE_INSTALL /root/ph_install.sh