diff --git a/common/recipes-phosphor/sensors/phosphor-hwmon/70-hwmon.rules b/common/recipes-phosphor/sensors/phosphor-hwmon/70-hwmon.rules
index 070d88f..503b2d0 100644
--- a/common/recipes-phosphor/sensors/phosphor-hwmon/70-hwmon.rules
+++ b/common/recipes-phosphor/sensors/phosphor-hwmon/70-hwmon.rules
@@ -1 +1,2 @@
-SUBSYSTEM=="hwmon", ACTION=="add", TAG+="systemd", ENV{SYSTEMD_WANTS}+="xyz.openbmc_project.Hwmon@%E{OF_FULLNAME}.service"
+SUBSYSTEM=="hwmon", ACTION=="add", RUN="/usr/bin/start_hwmon.sh start %p %E{OF_FULLNAME}"
+SUBSYSTEM=="hwmon", ACTION=="remove", RUN="/usr/bin/start_hwmon.sh stop %p %E{OF_FULLNAME}"
diff --git a/common/recipes-phosphor/sensors/phosphor-hwmon/70-iio.rules b/common/recipes-phosphor/sensors/phosphor-hwmon/70-iio.rules
index f332d11..45fb4b0 100644
--- a/common/recipes-phosphor/sensors/phosphor-hwmon/70-iio.rules
+++ b/common/recipes-phosphor/sensors/phosphor-hwmon/70-iio.rules
@@ -1 +1,2 @@
-SUBSYSTEM=="iio", ACTION=="add", TAG+="systemd", ENV{SYSTEMD_WANTS}+="xyz.openbmc_project.Hwmon@%E{OF_FULLNAME}.service"
+SUBSYSTEM=="iio", ACTION=="add", RUN="/usr/bin/start_hwmon.sh start %p %E{OF_FULLNAME}"
+SUBSYSTEM=="iio", ACTION=="remove", RUN="/usr/bin/start_hwmon.sh stop %p %E{OF_FULLNAME}"
diff --git a/common/recipes-phosphor/sensors/phosphor-hwmon/start_hwmon.sh b/common/recipes-phosphor/sensors/phosphor-hwmon/start_hwmon.sh
new file mode 100755
index 0000000..cde0f96
--- /dev/null
+++ b/common/recipes-phosphor/sensors/phosphor-hwmon/start_hwmon.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+action=$1
+devpath=$2
+of_fullname=$3
+
+#Use of_fullname if it's there, otherwise use devpath.
+
+path=$of_fullname
+if [ -z "$path" ]
+then
+    path=$devpath
+
+    if [[ "$path" =~ (.*)/hwmon/hwmon[0-9]+$ ]];
+    then
+        path=${BASH_REMATCH[1]}
+    fi
+fi
+
+path="${path//:/--}"
+
+systemctl $action 'xyz.openbmc_project.Hwmon@'$path'.service'
diff --git a/common/recipes-phosphor/sensors/phosphor-hwmon/xyz.openbmc_project.Hwmon@.service b/common/recipes-phosphor/sensors/phosphor-hwmon/xyz.openbmc_project.Hwmon@.service
index 8dca3ad..9d3e263 100644
--- a/common/recipes-phosphor/sensors/phosphor-hwmon/xyz.openbmc_project.Hwmon@.service
+++ b/common/recipes-phosphor/sensors/phosphor-hwmon/xyz.openbmc_project.Hwmon@.service
@@ -1,11 +1,10 @@
 [Unit]
 Description=Phosphor Hwmon Poller
 ConditionFileNotEmpty=/etc/default/obmc/hwmon/%I.conf
-StopWhenUnneeded=true
 After=xyz.openbmc_project.ObjectMapper.service
 
 [Service]
-Restart=always
+Restart=on-failure
 ExecStart=/usr/bin/env phosphor-hwmon-readd -o %f
 SyslogIdentifier=phosphor-hwmon-readd
 EnvironmentFile=/etc/default/obmc/hwmon/%I.conf