diff --git a/roles/clean/tasks/main.yml b/roles/clean/tasks/main.yml
index f27e02f..d99dbdd 100644
--- a/roles/clean/tasks/main.yml
+++ b/roles/clean/tasks/main.yml
@@ -45,7 +45,7 @@
   become: yes
 
 - name: reload supervisor
-  shell: /etc/init.d/supervisor reload
+  shell: service supervisor reload
   become: yes
 
 - name: delete nginx app server conf link
@@ -63,7 +63,7 @@
   become: yes
 
 - name: reload nginx
-  shell: /etc/init.d/nginx reload
+  shell: service nginx reload
   become: yes
 
 - name: delete /etc app directory
diff --git a/roles/end/tasks/main.yml b/roles/end/tasks/main.yml
index 0aef275..42778d7 100644
--- a/roles/end/tasks/main.yml
+++ b/roles/end/tasks/main.yml
@@ -1,9 +1,9 @@
 - name: reload supervisor
-  shell: /etc/init.d/supervisor force-reload
+  shell: service supervisor force-reload
   become: yes
 
 - name: reload nginx
-  shell: /etc/init.d/nginx force-reload || true
+  shell: service nginx force-reload || true
   become: yes
   tags:
     - tls
diff --git a/test-nspawn b/test-nspawn
index 4a390e4..f6f9e4f 100755
--- a/test-nspawn
+++ b/test-nspawn
@@ -18,7 +18,7 @@ then
     usermod -a -G sudo testuser
     grep -q testuser /etc/sudoers || echo 'testuser ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
     chown -R testuser /opt/publik-devinst
-    /etc/init.d/postgresql start
+    service postgresql start
     hostname jenkins
     PORT=`pg_lsclusters | tail -n1 | awk '{ print $3 }'`
     echo 'cd /opt/publik-devinst; ansible-playbook -i inventory.yml -e "{postgresql_port: '$PORT'}" install.yml'