diff --git a/src/freedombone-app-pihole b/src/freedombone-app-pihole
index cb487907711145bd61505a2167e6e14389fd6f06..46f2800cece2a3469a6a026c5a95903bd60a0aa5 100755
--- a/src/freedombone-app-pihole
+++ b/src/freedombone-app-pihole
@@ -134,8 +134,6 @@ function pihole_update {
     { echo 'domain-needed';
       echo 'bogus-priv';
       echo 'no-resolv';
-      echo 'local=/local/';
-      echo 'domain=local';
       echo "server=${PIHOLE_DNS1}";
       echo "server=${PIHOLE_DNS2}";
       echo "interface=${PIHOLE_IFACE}";
diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise
index 0235e96344dae2fb9b6a53962a4012232bc895a6..c05b93ae842be7a3a0e547b8811197c3d4b564aa 100755
--- a/src/freedombone-image-customise
+++ b/src/freedombone-image-customise
@@ -2118,7 +2118,7 @@ sed -i 's|domain-name=.*|domain-name=local|g' "$rootdir/etc/avahi/avahi-daemon.c
 sed -i "s|use-ipv4=.*|use-ipv4=yes|g" "$rootdir/etc/avahi/avahi-daemon.conf"
 sed -i "s|use-ipv6=.*|use-ipv6=no|g" "$rootdir/etc/avahi/avahi-daemon.conf"
 sed -i "s|#disallow-other-stacks=.*|disallow-other-stacks=yes|g" "$rootdir/etc/avahi/avahi-daemon.conf"
-sed -i "s|hosts:.*|hosts:          files mdns4_minimal dns mdns4 mdns|g" "$rootdir/etc/nsswitch.conf"
+sed -i "s|hosts:.*|hosts:          files mdns4_minimal mdns4 mdns dns|g" "$rootdir/etc/nsswitch.conf"
 sed -i "s|#publish-domain=.*|publish-domain=yes|g" "$rootdir/etc/avahi/avahi-daemon.conf"
 sed -i "s|publish-domain=.*|publish-domain=yes|g" "$rootdir/etc/avahi/avahi-daemon.conf"
 sed -i "s|#publish-addresses=.*|publish-addresses=yes|g" "$rootdir/etc/avahi/avahi-daemon.conf"
diff --git a/src/freedombone-utils-dns b/src/freedombone-utils-dns
index 20c3bba71c57576aea3d4c75c442f9acdbc26808..32a1222661d54453171dc0bfb9d9ab3ef6147292 100755
--- a/src/freedombone-utils-dns
+++ b/src/freedombone-utils-dns
@@ -97,7 +97,7 @@ EXTERNAL_IP_SERVICES=( \
 
 function enable_mdns {
     # files gw_name myhostname mdns4_minimal [NOTFOUND=return] dns
-    sed -i "s|hosts:.*|hosts:          files mdns4_minimal dns mdns4 mdns|g" /etc/nsswitch.conf
+    sed -i "s|hosts:.*|hosts:          files mdns4_minimal mdns4 mdns dns|g" /etc/nsswitch.conf
 }
 
 function update_inadyn_config {
diff --git a/src/freedombone-utils-mesh b/src/freedombone-utils-mesh
index bd5ce638065a1833d97273adfbb82e947e7a1b2a..d7983d81ac0076b50564f38f91ca552c035118ee 100755
--- a/src/freedombone-utils-mesh
+++ b/src/freedombone-utils-mesh
@@ -60,7 +60,7 @@ function mesh_protocol_init {
         sed -i "s|use-ipv4=.*|use-ipv4=no|g" /etc/avahi/avahi-daemon.conf
         sed -i "s|use-ipv6=.*|use-ipv6=yes|g" /etc/avahi/avahi-daemon.conf
         sed -i "s|#disallow-other-stacks=.*|disallow-other-stacks=yes|g" /etc/avahi/avahi-daemon.conf
-        sed -i "s|hosts:.*|hosts:          files mdns4_minimal dns mdns4 mdns|g" /etc/nsswitch.conf
+        sed -i "s|hosts:.*|hosts:          files mdns4_minimal mdns4 mdns dns|g" /etc/nsswitch.conf
     fi
 
     # Mesh definition