diff --git a/files/build_templates/enable_counters.service b/files/build_templates/enable_counters.service
index 95424474cb15..282707f3a933 100644
--- a/files/build_templates/enable_counters.service
+++ b/files/build_templates/enable_counters.service
@@ -1,8 +1,12 @@
 [Unit]
 Description=Enable SONiC counters
-PartOf=swss.service
+Requires=swss.service
+After=swss.service
 
 [Service]
 Type=oneshot
-ExecStart=/bin/bash -c 'sleep 60 ; /usr/bin/counterpoll queue enable ; /usr/bin/counterpoll port enable ; /usr/bin/pfcwd counter_poll enable'
+ExecStart=/bin/bash -c '/bin/sleep 60 ; /usr/bin/counterpoll queue enable ; /usr/bin/counterpoll port enable ; /usr/bin/pfcwd counter_poll enable'
 RemainAfterExit=yes
+
+[Install]
+WantedBy=swss.service