diff --git a/Dockerfile.template b/Dockerfile.template
index 0238f37..86e7d62 100644
--- a/Dockerfile.template
+++ b/Dockerfile.template
@@ -29,7 +29,7 @@ EXPOSE 443
 ENV S6_LOGGING 0
 ENV S6_KEEP_ENV 1
 ENV S6_BEHAVIOUR_IF_STAGE2_FAILS 2
-ENV FTL_CMD debug
+ENV FTL_CMD no-daemon
 
 ENV VERSION {{ pihole.version }}
 ENV ARCH {{ pihole.arch }}
diff --git a/Dockerfile_aarch64 b/Dockerfile_aarch64
index 2d96b5f..8bf90f7 100644
--- a/Dockerfile_aarch64
+++ b/Dockerfile_aarch64
@@ -29,13 +29,13 @@ EXPOSE 443
 ENV S6_LOGGING 0
 ENV S6_KEEP_ENV 1
 ENV S6_BEHAVIOUR_IF_STAGE2_FAILS 2
-ENV FTL_CMD debug
+ENV FTL_CMD no-daemon
 
-ENV VERSION v4.1
+ENV VERSION v4.1.1
 ENV ARCH aarch64
 ENV PATH /opt/pihole:${PATH}
 
-LABEL image="pihole/pihole:v4.1_aarch64"
+LABEL image="pihole/pihole:v4.1.1_aarch64"
 LABEL maintainer="adam@diginc.us"
 LABEL url="https://www.github.com/pi-hole/docker-pi-hole"
 
diff --git a/Dockerfile_amd64 b/Dockerfile_amd64
index 148138a..e8ce0e4 100644
--- a/Dockerfile_amd64
+++ b/Dockerfile_amd64
@@ -29,7 +29,7 @@ EXPOSE 443
 ENV S6_LOGGING 0
 ENV S6_KEEP_ENV 1
 ENV S6_BEHAVIOUR_IF_STAGE2_FAILS 2
-ENV FTL_CMD debug
+ENV FTL_CMD no-daemon
 
 ENV VERSION v4.1.1
 ENV ARCH amd64
diff --git a/Dockerfile_armel b/Dockerfile_armel
index 4f746b1..d1535c4 100644
--- a/Dockerfile_armel
+++ b/Dockerfile_armel
@@ -29,13 +29,13 @@ EXPOSE 443
 ENV S6_LOGGING 0
 ENV S6_KEEP_ENV 1
 ENV S6_BEHAVIOUR_IF_STAGE2_FAILS 2
-ENV FTL_CMD debug
+ENV FTL_CMD no-daemon
 
-ENV VERSION v4.1
+ENV VERSION v4.1.1
 ENV ARCH armel
 ENV PATH /opt/pihole:${PATH}
 
-LABEL image="pihole/pihole:v4.1_armel"
+LABEL image="pihole/pihole:v4.1.1_armel"
 LABEL maintainer="adam@diginc.us"
 LABEL url="https://www.github.com/pi-hole/docker-pi-hole"
 
diff --git a/Dockerfile_armhf b/Dockerfile_armhf
index 037e68a..da661e9 100644
--- a/Dockerfile_armhf
+++ b/Dockerfile_armhf
@@ -29,13 +29,13 @@ EXPOSE 443
 ENV S6_LOGGING 0
 ENV S6_KEEP_ENV 1
 ENV S6_BEHAVIOUR_IF_STAGE2_FAILS 2
-ENV FTL_CMD debug
+ENV FTL_CMD no-daemon
 
-ENV VERSION v4.1
+ENV VERSION v4.1.1
 ENV ARCH armhf
 ENV PATH /opt/pihole:${PATH}
 
-LABEL image="pihole/pihole:v4.1_armhf"
+LABEL image="pihole/pihole:v4.1.1_armhf"
 LABEL maintainer="adam@diginc.us"
 LABEL url="https://www.github.com/pi-hole/docker-pi-hole"
 
diff --git a/deploy_docker.sh b/deploy_docker.sh
index 310a778..dd63e4b 100755
--- a/deploy_docker.sh
+++ b/deploy_docker.sh
@@ -70,7 +70,7 @@ $dry tox
 images=()
 for tag in ${!arch_map[@]}; do
     # Verison specific tags for ongoing history
-    $dry docker tag $localimg:v4.1_$tag $remoteimg:${version}_${tag}
+    $dry docker tag $localimg:v4.1.1_$tag $remoteimg:${version}_${tag}
     $dry docker push pihole/pihole:${version}_${tag}
     images+=(pihole/pihole:${version}_${tag})
 done
diff --git a/s6/debian-root/etc/services.d/pihole-FTL/run b/s6/debian-root/etc/services.d/pihole-FTL/run
index 98e9cba..cc72e5d 100644
--- a/s6/debian-root/etc/services.d/pihole-FTL/run
+++ b/s6/debian-root/etc/services.d/pihole-FTL/run
@@ -1,5 +1,5 @@
 #!/usr/bin/with-contenv bash
 
 s6-echo "Starting pihole-FTL ($FTL_CMD)"
-s6-setuidgid root pihole-FTL $FTL_CMD
-
+# /var/log/pihole*.log has this data - this duplicates it in docker logs unless you send to dev null
+s6-setuidgid root pihole-FTL $FTL_CMD >/dev/null 2>&1
diff --git a/test/conftest.py b/test/conftest.py
index 881454b..43117d4 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -8,7 +8,7 @@ check_output = testinfra.get_backend(
 def DockerGeneric(request, args, image, cmd, entrypoint=''):
     assert 'docker' in check_output('id'), "Are you in the docker group?"
     if 'pihole' in image:
-       args += " --dns 127.0.0.1 --dns 1.1.1.1 -v /dev/null:/etc/pihole/adlists.default -e PYTEST=1"
+       args += " --dns 127.0.0.1 --dns 1.1.1.1 -v /dev/null:/etc/pihole/adlists.default -e PYTEST=1 --cap-add=NET_ADMIN"
     docker_run = "docker run -d -t {args} {entry} {image} {cmd}".format(args=args, entry=entrypoint, image=image, cmd=cmd)
     print docker_run
     docker_id = check_output(docker_run)