diff --git a/.gitignore b/.gitignore
index 4c49bd7..e58e5a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 .env
+.idea
diff --git a/bin/heroku-tailscale-start.sh b/bin/heroku-tailscale-start.sh
index 2317d81..3c3e6f3 100755
--- a/bin/heroku-tailscale-start.sh
+++ b/bin/heroku-tailscale-start.sh
@@ -28,7 +28,7 @@ else
       tailscale_hostname=${HEROKU_SLUG_COMMIT:0:8}"-$DYNO-$HEROKU_APP_NAME"
     fi
   else
-    tailscale_hostname="$TAILSCALE_HOSTNAME"
+    tailscale_hostname="$TAILSCALE_HOSTNAME-${HEROKU_SLUG_COMMIT:0:8}"
   fi
   log "Using Tailscale hostname=$tailscale_hostname"