diff --git a/service_files/op-clock-data-logger@.service.in b/service_files/op-clock-data-logger@.service.in
index 67e477e..a08ba22 100644
--- a/service_files/op-clock-data-logger@.service.in
+++ b/service_files/op-clock-data-logger@.service.in
@@ -11,4 +11,4 @@
 ExecStart=/usr/bin/openpower-clock-data-logger
 
 [Install]
-WantedBy=obmc-host-startmin@0.target
+#WantedBy=obmc-host-startmin@0.target
diff --git a/service_files/op-continue-mpreboot@.service.in b/service_files/op-continue-mpreboot@.service.in
index 5c7fbc8..3fb00d8 100644
--- a/service_files/op-continue-mpreboot@.service.in
+++ b/service_files/op-continue-mpreboot@.service.in
@@ -20,4 +20,4 @@
 RemainAfterExit=yes
 
 [Install]
-WantedBy=obmc-host-startmin@%i.target
+#WantedBy=obmc-host-startmin@%i.target
diff --git a/service_files/op-enter-mpreboot@.service.in b/service_files/op-enter-mpreboot@.service.in
index 5407b5a..6191ce4 100644
--- a/service_files/op-enter-mpreboot@.service.in
+++ b/service_files/op-enter-mpreboot@.service.in
@@ -30,4 +30,4 @@
 ExecStart=/bin/sh -c "busctl set-property  xyz.openbmc_project.State.Host /xyz/openbmc_project/state/host%i xyz.openbmc_project.State.Host RestartCause s  xyz.openbmc_project.State.Host.RestartCause.HostCrash"
 
 [Install]
-WantedBy=obmc-host-diagnostic-mode@%i.target
+#WantedBy=obmc-host-diagnostic-mode@%i.target
diff --git a/service_files/op-reset-host-check@.service.in b/service_files/op-reset-host-check@.service.in
index dc48bbf..d6f497b 100644
--- a/service_files/op-reset-host-check@.service.in
+++ b/service_files/op-reset-host-check@.service.in
@@ -19,4 +19,4 @@
 ExecStart=/usr/bin/openpower-proc-control checkHostRunning
 
 [Install]
-WantedBy=obmc-host-reset@%i.target
+#WantedBy=obmc-host-reset@%i.target
diff --git a/service_files/op-reset-host-clear.service.in b/service_files/op-reset-host-clear.service.in
index ff757b7..0f203cb 100644
--- a/service_files/op-reset-host-clear.service.in
+++ b/service_files/op-reset-host-clear.service.in
@@ -11,4 +11,4 @@
 ExecStart=/usr/bin/openpower-proc-control clearHostRunning
 
 [Install]
-WantedBy=obmc-host-stop@0.target
+#WantedBy=obmc-host-stop@0.target
diff --git a/service_files/op-stop-instructions@.service.in b/service_files/op-stop-instructions@.service.in
index b252e1e..8fada7e 100644
--- a/service_files/op-stop-instructions@.service.in
+++ b/service_files/op-stop-instructions@.service.in
@@ -17,4 +17,4 @@
 ExecStart=/usr/bin/openpower-proc-control threadStopAll
 
 [Install]
-WantedBy=obmc-host-stop@%i.target
+#WantedBy=obmc-host-stop@%i.target
diff --git a/service_files/pcie-poweroff@.service.in b/service_files/pcie-poweroff@.service.in
index 5b59f96..bb0546d 100644
--- a/service_files/pcie-poweroff@.service.in
+++ b/service_files/pcie-poweroff@.service.in
@@ -8,4 +8,4 @@
 ExecStart=@bindir@/openpower-proc-control cleanupPcie
 
 [Install]
-WantedBy=obmc-chassis-poweroff@%i.target
+#WantedBy=obmc-chassis-poweroff@%i.target
diff --git a/service_files/phal-create-boottime-guard-indicator.service.in b/service_files/phal-create-boottime-guard-indicator.service.in
index bd1c259..30b9cf5 100644
--- a/service_files/phal-create-boottime-guard-indicator.service.in
+++ b/service_files/phal-create-boottime-guard-indicator.service.in
@@ -11,5 +11,5 @@
 ExecStart=/bin/touch /tmp/phal/boottime_guard_indicator
 
 [Install]
-WantedBy=obmc-host-start@0.target
-WantedBy=obmc-host-quiesce@0.target
+#WantedBy=obmc-host-start@0.target
+#WantedBy=obmc-host-quiesce@0.target
diff --git a/service_files/phal-export-devtree@.service.in b/service_files/phal-export-devtree@.service.in
index 3fab02e..7ad059e 100644
--- a/service_files/phal-export-devtree@.service.in
+++ b/service_files/phal-export-devtree@.service.in
@@ -11,4 +11,4 @@
 ExecStart=/usr/bin/phal-export-devtree
 
 [Install]
-WantedBy=obmc-host-startmin@0.target
+#WantedBy=obmc-host-startmin@0.target
diff --git a/service_files/phal-reinit-devtree.service.in b/service_files/phal-reinit-devtree.service.in
index fd2a156..c5623ba 100644
--- a/service_files/phal-reinit-devtree.service.in
+++ b/service_files/phal-reinit-devtree.service.in
@@ -12,4 +12,4 @@
 ExecStart=/usr/bin/openpower-proc-control reinitDevtree
 
 [Install]
-RequiredBy=obmc-host-start@0.target
+#RequiredBy=obmc-host-start@0.target
diff --git a/service_files/proc-pre-poweroff@.service.in b/service_files/proc-pre-poweroff@.service.in
index be9c32c..cf1ca2c 100644
--- a/service_files/proc-pre-poweroff@.service.in
+++ b/service_files/proc-pre-poweroff@.service.in
@@ -15,4 +15,4 @@
 ExecStart=/usr/bin/openpower-proc-control prePoweroff
 
 [Install]
-WantedBy=obmc-power-stop-pre@%i.target
+#WantedBy=obmc-power-stop-pre@%i.target
diff --git a/service_files/set-spi-mux.service.in b/service_files/set-spi-mux.service.in
index 291aef7..8917333 100644
--- a/service_files/set-spi-mux.service.in
+++ b/service_files/set-spi-mux.service.in
@@ -14,4 +14,4 @@
 
 [Install]
 WantedBy=multi-user.target
-WantedBy=obmc-chassis-poweroff@0.target
+#WantedBy=obmc-chassis-poweroff@0.target
diff --git a/service_files/xyz.openbmc_project.Control.Host.NMI.service.in b/service_files/xyz.openbmc_project.Control.Host.NMI.service.in
index 06f85d8..ecba48e 100644
--- a/service_files/xyz.openbmc_project.Control.Host.NMI.service.in
+++ b/service_files/xyz.openbmc_project.Control.Host.NMI.service.in
@@ -13,4 +13,4 @@
 BusName=xyz.openbmc_project.Control.Host.NMI
 
 [Install]
-WantedBy=obmc-host-started@0.target
+#WantedBy=obmc-host-started@0.target