diff --git a/roles/tobiko-devstack/defaults/main.yaml b/roles/tobiko-devstack/defaults/main.yaml
index b69173e7c..7f5ae25f5 100644
--- a/roles/tobiko-devstack/defaults/main.yaml
+++ b/roles/tobiko-devstack/defaults/main.yaml
@@ -10,4 +10,4 @@ devstack_tobiko_dir: '{{ devstack_dest_dir }}/tobiko'
 
 devstack_src_dir: '{{ devstack_workspace_dir }}/devstack'
 
-sudo_secure_path: '/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
+sudo_secure_path: ''
diff --git a/roles/tobiko-devstack/tasks/ensure-stack-user.yaml b/roles/tobiko-devstack/tasks/ensure-stack-user.yaml
index d129166a7..371a5ea5c 100644
--- a/roles/tobiko-devstack/tasks/ensure-stack-user.yaml
+++ b/roles/tobiko-devstack/tasks/ensure-stack-user.yaml
@@ -1,13 +1,5 @@
 ---
 
-- name: ensure /usr/local/bin is in sudo secure path
-  become: yes
-  lineinfile:
-    path: /etc/sudoers
-    regexp: 'secure_path'
-    line: 'Defaults    secure_path = /sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin'
-    validate: '/usr/sbin/visudo -cf %s'
-
 
 - name: ensure stack group exists
   become: yes
diff --git a/roles/tobiko-devstack/tasks/run-stack.yaml b/roles/tobiko-devstack/tasks/run-stack.yaml
index db45d501e..9f196bfe7 100644
--- a/roles/tobiko-devstack/tasks/run-stack.yaml
+++ b/roles/tobiko-devstack/tasks/run-stack.yaml
@@ -3,14 +3,18 @@
 - name: run stack.sh
   become: yes
   become_user: stack
-  command:
-    cmd: /bin/bash ./stack.sh
+  shell:
+    cmd: |
+      source /etc/profile
+      ./stack.sh 2>&1
+      rc=$?
+      echo "*** FINISHED ***"
+      exit $rc
     chdir: '{{ devstack_dir }}'
-    executable: '/bin/bash'
   register: run_stack
   ignore_errors: yes
 
 
 - name: show stack.sh output
-  debug: var=run_stack.stderr_lines
-  failed_when: yes
+  debug: var=run_stack.stdout_lines
+  failed_when: run_stack is failed
diff --git a/roles/tobiko-devstack/tasks/run-unstack.yaml b/roles/tobiko-devstack/tasks/run-unstack.yaml
index 4dd2fc86a..bf5c612fd 100644
--- a/roles/tobiko-devstack/tasks/run-unstack.yaml
+++ b/roles/tobiko-devstack/tasks/run-unstack.yaml
@@ -10,8 +10,13 @@
 - name: run unstack.sh
   become: yes
   become_user: stack
-  command:
-    cmd: /bin/bash ./unstack.sh
+  shell:
+    cmd: |
+      source /etc/profile
+      ./unstack.sh 2>&1
+      rc=$?
+      echo "*** FINISHED ***"
+      exit $rc
     chdir: '{{ devstack_dir }}'
   register: run_unstack
   ignore_errors: yes
@@ -19,5 +24,5 @@
     check_devstack_local_conf_file_exists.stat.exists | default(False)
 
 
-- debug: var=run_unstack.stderr_lines
+- debug: var=run_unstack.stdout_lines
   when: run_unstack is failed