diff --git a/base/Dockerfile b/base/Dockerfile
index f1a0e9e..46f2f30 100644
--- a/base/Dockerfile
+++ b/base/Dockerfile
@@ -2,7 +2,9 @@ FROM debian:stretch-slim
 
 ARG JITSI_RELEASE=stable
 
-ADD https://github.com/just-containers/s6-overlay/releases/download/v1.21.4.0/s6-overlay-amd64.tar.gz /tmp/s6-overlay.tar.gz
+ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2
+
+ADD https://github.com/just-containers/s6-overlay/releases/download/v1.22.1.0/s6-overlay-amd64.tar.gz /tmp/s6-overlay.tar.gz
 ADD https://download.jitsi.org/jitsi-key.gpg.key /tmp/jitsi.key
 ADD https://github.com/subchen/frep/releases/download/v1.3.5/frep-1.3.5-linux-amd64 /usr/bin/frep