diff --git a/Dockerfile b/Dockerfile
index 212779fd2..a626296bb 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -38,6 +38,9 @@ ENV ENABLE_ID_OBFUSCATION=false
 ENV REDACT_IP_ADDRESSES=false
 ENV WEBPORT=80
 
+# https://httpd.apache.org/docs/2.4/stopping.html#gracefulstop
+STOPSIGNAL SIGWINCH
+
 # Final touches
 EXPOSE 80
 CMD ["bash", "/entrypoint.sh"]
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 6717429c1..172fd3198 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -88,4 +88,4 @@ fi
 echo "Done, Starting APACHE"
 
 # This runs apache
-apache2-foreground
+exec apache2-foreground