diff --git a/roles/tobiko-devstack/tasks/run-stack.yaml b/roles/tobiko-devstack/tasks/run-stack.yaml
index 9f196bfe7..dea8768e1 100644
--- a/roles/tobiko-devstack/tasks/run-stack.yaml
+++ b/roles/tobiko-devstack/tasks/run-stack.yaml
@@ -5,8 +5,7 @@
   become_user: stack
   shell:
     cmd: |
-      source /etc/profile
-      ./stack.sh 2>&1
+      sudo su -l stack -c "cd '{{ devstack_dir }}' && ./stack.sh" 2>&1
       rc=$?
       echo "*** FINISHED ***"
       exit $rc
diff --git a/roles/tobiko-devstack/tasks/run-unstack.yaml b/roles/tobiko-devstack/tasks/run-unstack.yaml
index bf5c612fd..9a775a564 100644
--- a/roles/tobiko-devstack/tasks/run-unstack.yaml
+++ b/roles/tobiko-devstack/tasks/run-unstack.yaml
@@ -12,12 +12,10 @@
   become_user: stack
   shell:
     cmd: |
-      source /etc/profile
-      ./unstack.sh 2>&1
+      sudo su -l stack -c "cd '{{ devstack_dir }}' && ./unstack.sh" 2>&1
       rc=$?
       echo "*** FINISHED ***"
       exit $rc
-    chdir: '{{ devstack_dir }}'
   register: run_unstack
   ignore_errors: yes
   when: