diff --git a/magnum/drivers/common/templates/kubernetes/fragments/enable-services-master.sh b/magnum/drivers/common/templates/kubernetes/fragments/enable-services-master.sh
index 126a40faf3..f3b41fa837 100644
--- a/magnum/drivers/common/templates/kubernetes/fragments/enable-services-master.sh
+++ b/magnum/drivers/common/templates/kubernetes/fragments/enable-services-master.sh
@@ -16,10 +16,11 @@ while [ ! -f /etc/kubernetes/certs/ca.key ] && \
 done
 
 echo "starting services"
-for service in etcd docker kube-apiserver kube-controller-manager kube-scheduler kubelet kube-proxy; do
-    echo "activating service $service"
-    $ssh_cmd systemctl enable $service
-    $ssh_cmd systemctl restart $service
+for action in enable restart; do
+    for service in etcd docker kube-apiserver kube-controller-manager kube-scheduler kubelet kube-proxy; do
+        echo "$action service $service"
+        $ssh_cmd systemctl $action $service
+    done
 done
 
 # Label self as master
diff --git a/magnum/drivers/common/templates/kubernetes/fragments/enable-services-minion.sh b/magnum/drivers/common/templates/kubernetes/fragments/enable-services-minion.sh
index 62979a436b..1dc37e5f48 100644
--- a/magnum/drivers/common/templates/kubernetes/fragments/enable-services-minion.sh
+++ b/magnum/drivers/common/templates/kubernetes/fragments/enable-services-minion.sh
@@ -13,8 +13,9 @@ $ssh_cmd systemctl stop docker
 # make sure we pick up any modified unit files
 $ssh_cmd systemctl daemon-reload
 
-for service in docker kubelet kube-proxy; do
-    echo "activating service $service"
-    $ssh_cmd systemctl enable $service
-    $ssh_cmd systemctl start $service
+for action in enable restart; do
+    for service in docker kubelet kube-proxy; do
+        echo "$action service $service"
+        $ssh_cmd systemctl $action $service
+    done
 done