diff --git a/01-stage-picompose/05-set-hostname/files/configure_hostname.service b/01-stage-picompose/05-set-hostname/files/configure_hostname.service
index 00e2414..73e74b1 100644
--- a/01-stage-picompose/05-set-hostname/files/configure_hostname.service
+++ b/01-stage-picompose/05-set-hostname/files/configure_hostname.service
@@ -6,6 +6,7 @@ Wants=network-online.target
 [Service]
 Type=oneshot
 ExecStart=/usr/bin/configure_hostname.sh
+ExecStartPost=/bin/systemctl disable --now %n
 RemainAfterExit=yes
 Restart=on-failure
 RestartSec=30s
diff --git a/01-stage-picompose/05-set-hostname/files/configure_hostname.sh b/01-stage-picompose/05-set-hostname/files/configure_hostname.sh
index d916efc..01afc85 100644
--- a/01-stage-picompose/05-set-hostname/files/configure_hostname.sh
+++ b/01-stage-picompose/05-set-hostname/files/configure_hostname.sh
@@ -1,5 +1,14 @@
 #!/bin/bash
 
+# Get current hostname
+CURRENT_HOSTNAME=$(hostname)
+
+# Only proceed if current hostname is "picompose"
+if [ "$CURRENT_HOSTNAME" != "picompose" ]; then
+    echo "Current hostname is $CURRENT_HOSTNAME (not picompose), skipping hostname change"
+    exit 0
+fi
+
 # Get active interface
 IFACE=$(ip route | grep default | awk '{print $5}' | head -n 1)