diff --git a/.zuul.yaml b/.zuul.yaml
index dc3c863fc..ccc4500d7 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -42,9 +42,9 @@
     parent: devstack
     description: |
       Base job for devstack-based functional tests
-    pre-run: playbooks/devstack/pre
-    run: playbooks/devstack/run
-    post-run: playbooks/devstack/post
+    pre-run: playbooks/devstack/pre.yaml
+    run: playbooks/devstack/run.yaml
+    post-run: playbooks/devstack/post.yaml
     required-projects:
       # These jobs will DTRT when shade triggers them, but we want to make
       # sure stable branches of shade never get cloned by other people,
@@ -58,25 +58,25 @@
     timeout: 9000
     vars:
       devstack_localrc:
-        SWIFT_HASH: "1234123412341234"
+        SWIFT_HASH: '1234123412341234'
       devstack_local_conf:
         post-config:
-          "$CINDER_CONF":
+          $CINDER_CONF:
             DEFAULT:
               osapi_max_limit: 6
       devstack_services:
-        ceilometer-acentral: False
-        ceilometer-acompute: False
-        ceilometer-alarm-evaluator: False
-        ceilometer-alarm-notifier: False
-        ceilometer-anotification: False
-        ceilometer-api: False
-        ceilometer-collector: False
-        horizon: False
-        s-account: True
-        s-container: True
-        s-object: True
-        s-proxy: True
+        ceilometer-acentral: false
+        ceilometer-acompute: false
+        ceilometer-alarm-evaluator: false
+        ceilometer-alarm-notifier: false
+        ceilometer-anotification: false
+        ceilometer-api: false
+        ceilometer-collector: false
+        horizon: false
+        s-account: true
+        s-container: true
+        s-object: true
+        s-proxy: true
       devstack_plugins:
         heat: https://git.openstack.org/openstack/heat
       tox_environment:
@@ -89,7 +89,7 @@
         SHADE_HAS_MAGNUM: 0
         SHADE_HAS_NEUTRON: 1
         SHADE_HAS_SWIFT: 1
-      tox_install_siblings: False
+      tox_install_siblings: false
       tox_envlist: functional
       zuul_work_dir: src/git.openstack.org/openstack-infra/shade
 
@@ -102,7 +102,7 @@
     voting: false
     vars:
       devstack_localrc:
-        ENABLE_IDENTITY_V2: True
+        ENABLE_IDENTITY_V2: true
         FLAT_INTERFACE: br_flat
         PUBLIC_INTERFACE: br_pub
       tox_environment:
@@ -139,7 +139,7 @@
       - name: openstack/keystoneauth
       - name: openstack/os-client-config
     vars:
-      tox_install_siblings: True
+      tox_install_siblings: true
 
 - job:
     name: shade-functional-devstack-tips-python3
@@ -163,13 +163,13 @@
       devstack_plugins:
         magnum: https://git.openstack.org/openstack/magnum
       devstack_localrc:
-        MAGNUM_GUEST_IMAGE_URL: "https://tarballs.openstack.org/magnum/images/fedora-atomic-f23-dib.qcow2"
+        MAGNUM_GUEST_IMAGE_URL: https://tarballs.openstack.org/magnum/images/fedora-atomic-f23-dib.qcow2
         MAGNUM_IMAGE_NAME: fedora-atomic-f23-dib
       devstack_services:
-        s-account: False
-        s-container: False
-        s-object: False
-        s-proxy: False
+        s-account: false
+        s-container: false
+        s-object: false
+        s-proxy: false
       tox_environment:
         SHADE_HAS_SWIFT: 0
         SHADE_HAS_MAGNUM: 1
@@ -194,7 +194,7 @@
     #   - github.com/ansible/ansible
     voting: false
     vars:
-      tox_install_siblings: True
+      tox_install_siblings: true
 
 - project-template:
     name: shade-functional-tips