diff --git a/deploy_docker.sh b/deploy_docker.sh
index cc81cd9..c32e663 100755
--- a/deploy_docker.sh
+++ b/deploy_docker.sh
@@ -65,7 +65,7 @@ $dry tox
 images=()
 for tag in ${!arch_map[@]}; do
     # Verison specific tags for ongoing history
-    $dry docker tag $localimg:v4.0_$tag $remoteimg:${version}_${tag}
+    $dry docker tag $localimg:v4.1_$tag $remoteimg:${version}_${tag}
     $dry docker push pihole/pihole:${version}_${tag}
     images+=(pihole/pihole:${version}_${tag})
 done
diff --git a/test/test_bash_functions.py b/test/test_bash_functions.py
index e0e237a..d174f00 100644
--- a/test/test_bash_functions.py
+++ b/test/test_bash_functions.py
@@ -104,9 +104,13 @@ def test_DNS_Envs_are_secondary_to_setupvars(Docker, args, expected_stdout, dns1
     assert expected_stdout in function.stdout
 
     expected_servers = 'server={}\nserver={}\n'.format(dns1, dns2)
-    servers = Docker.run('grep "^server=" /etc/dnsmasq.d/01-pihole.conf').stdout
-    searchDns1 = servers.split('\n')[0]
-    searchDns2 = servers.split('\n')[1]
+    servers = Docker.run('grep "^server=" /etc/dnsmasq.d/01-pihole.conf')
+    servers = servers.stdout.strip().split('\n')
+    expected_count = 2
+    if len(servers) != expected_count:
+        assert False, "{} is not {}".format(servers, expected_count)
+    searchDns1 = servers[0]
+    searchDns2 = servers[1]
 
     # Then the servers are still what the user had customized if forced dnsmasq is not set
     assert 'server={}'.format(dns1) == searchDns1