diff --git a/playbooks/tobiko-devstack-pre-run.yaml b/playbooks/tobiko-devstack-pre-run.yaml
index 6c7f7b00c..ac9670017 100644
--- a/playbooks/tobiko-devstack-pre-run.yaml
+++ b/playbooks/tobiko-devstack-pre-run.yaml
@@ -35,10 +35,21 @@
 
 - hosts: all
   roles:
+
+    - name: ensures has 'python3' and 'pip3' commands
+      role: python
+      vars:
+        python_command: python3
+        python_version: 3.7
+        python_release: 3.7.5
+        pip_command: pip3
+
     - role: copy-build-sshkey
       copy_sshkey_target_user: stack
-    - multi-node-setup
-    - orchestrate-devstack
+
+    - role: multi-node-setup
+
+    - role: orchestrate-devstack
 
 
 - hosts: tempest
diff --git a/zuul.d/tobiko-devstack.yaml b/zuul.d/tobiko-devstack.yaml
index 6c8104c76..e0fa8e8c7 100644
--- a/zuul.d/tobiko-devstack.yaml
+++ b/zuul.d/tobiko-devstack.yaml
@@ -218,16 +218,6 @@
     parent: tobiko-devstack-faults
     nodeset: openstack-three-node-centos-7
     voting: false
-    vars:
-      devstack_localrc:
-        # CentOS has no support for Python3
-        USE_PYTHON3: False
-      python_version: 2
-    group-vars:
-      subnode:
-        devstack_localrc:
-          USE_PYTHON3: False
-        python_version: 2
 
 
 - job: