diff --git a/src/freedombone-image-mesh b/src/freedombone-image-mesh
index 0a0cd071..ee9b5c13 100755
--- a/src/freedombone-image-mesh
+++ b/src/freedombone-image-mesh
@@ -1302,7 +1302,7 @@ function initialise_scuttlebot_pub {
     fi
 
     echo '{' > /etc/scuttlebot/.ssb/config
-    echo "  \"host\": \"${HOSTNAME}\"," >> /etc/scuttlebot/.ssb/config
+    echo "  \"host\": \"$P{PEER_ID}.local\"," >> /etc/scuttlebot/.ssb/config
     echo "  \"port\": ${SCUTTLEBOT_PORT}," >> /etc/scuttlebot/.ssb/config
     echo '  "allowPrivate": true,' >> /etc/scuttlebot/.ssb/config
     echo '  "timeout": 30000,' >> /etc/scuttlebot/.ssb/config
@@ -1330,6 +1330,7 @@ function initialise_scuttlebot_pub {
         ln -s /etc/nginx/sites-available/git_ssb /etc/nginx/sites-enabled/git_ssb
         systemctl enable git_ssb.service
         systemctl start git_ssb.service
+
     fi
 }
 
diff --git a/src/freedombone-mesh-batman b/src/freedombone-mesh-batman
index beb688a4..47dfb143 100755
--- a/src/freedombone-mesh-batman
+++ b/src/freedombone-mesh-batman
@@ -507,6 +507,9 @@ function start {
         systemctl disable tor
     fi
 
+    sed -i "s|\"host\":.*|\"host\": \"${HOSTNAME}.local\",|g" /etc/scuttlebot/.ssb/config
+    systemctl restart scuttlebot
+
     verify
 }