diff --git a/recipes-phosphor/network/first-boot-set-hostname/first-boot-set-hostname.service b/recipes-phosphor/network/first-boot-set-hostname/first-boot-set-hostname.service
index e58a046..22bb80c 100644
--- a/recipes-phosphor/network/first-boot-set-hostname/first-boot-set-hostname.service
+++ b/recipes-phosphor/network/first-boot-set-hostname/first-boot-set-hostname.service
@@ -1,5 +1,6 @@
 [Unit]
 Description=Init BMC Hostname
+ConditionPathExists=!/var/lib/first-boot-set-hostname
 Wants=op-vpd-parser.service
 After=op-vpd-parser.service
 
diff --git a/recipes-phosphor/network/first-boot-set-hostname/first-boot-set-hostname.sh b/recipes-phosphor/network/first-boot-set-hostname/first-boot-set-hostname.sh
index 62284d1..eaabb0a 100644
--- a/recipes-phosphor/network/first-boot-set-hostname/first-boot-set-hostname.sh
+++ b/recipes-phosphor/network/first-boot-set-hostname/first-boot-set-hostname.sh
@@ -81,4 +81,5 @@
 
 sync_hostname
 
-systemctl --no-reload disable first-boot-set-hostname.service
+# Prevent start at next boot time
+touch "/var/lib/first-boot-set-hostname"