diff --git a/.zuul.yaml b/.zuul.yaml
index ff268c2140..66db2fce28 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -3,9 +3,9 @@
     parent: devstack
     description: |
       Base job for devstack-based functional tests
-    pre-run: playbooks/osc-devstack/pre
-    run: playbooks/osc-devstack/run
-    post-run: playbooks/osc-devstack/post
+    pre-run: playbooks/osc-devstack/pre.yaml
+    run: playbooks/osc-devstack/run.yaml
+    post-run: playbooks/osc-devstack/post.yaml
     required-projects:
       - name: openstack/swift
     roles:
@@ -13,35 +13,35 @@
     timeout: 9000
     vars:
       devstack_localrc:
-        SWIFT_HASH: "1234123412341234"
-        LIBS_FROM_GIT: 'python-openstackclient'
+        SWIFT_HASH: '1234123412341234'
+        LIBS_FROM_GIT: python-openstackclient
         # NOTE(dtroyer): OSC needs to support Image v1 for a while yet so re-enable
-        GLANCE_V1_ENABLED: True
+        GLANCE_V1_ENABLED: true
         # NOTE(dtroyer): Functional tests need a bit more volume headroom
         VOLUME_BACKING_FILE_SIZE: 20G
       devstack_local_conf:
         post-config:
-          "$CINDER_CONF":
+          $CINDER_CONF:
             DEFAULT:
               # NOTE(dtroyer): OSC needs to support Volume v1 for a while yet so re-enable
-              enable_v1_api: True
+              enable_v1_api: true
       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
       osc_environment:
         PYTHONUNBUFFERED: 'true'
-        OS_CLOUD: 'devstack-admin'
-      tox_install_siblings: False
+        OS_CLOUD: devstack-admin
+      tox_install_siblings: false
       zuul_work_dir: src/git.openstack.org/openstack/python-openstackclient
 
 # The Neutron bits are here rather than in osc-functional-devstack-base to
@@ -55,9 +55,9 @@
         # NOTE(amotoki): Some neutron features are enabled by devstack plugin
         neutron: https://git.openstack.org/openstack/neutron
       devstack_services:
-        neutron-segments: True
-        q-metering: True
-        q-qos: True
+        neutron-segments: true
+        q-metering: true
+        q-qos: true
       tox_envlist: functional
 
 - job:
@@ -66,20 +66,20 @@
     timeout: 7800
     vars:
       devstack_localrc:
-        FLAT_INTERFACE: 'br_flat'
-        PUBLIC_INTERFACE: 'br_pub'
+        FLAT_INTERFACE: br_flat
+        PUBLIC_INTERFACE: br_pub
       devstack_services:
-        n-cell: True
-        n-net: True
-        neutron: False
-        neutron-segments: False
-        q-agt: False
-        q-dhcp: False
-        q-l3: False
-        q-meta: False
-        q-metering: False
-        q-qos: False
-        q-svc: False
+        n-cell: true
+        n-net: true
+        neutron: false
+        neutron-segments: false
+        q-agt: false
+        q-dhcp: false
+        q-l3: false
+        q-meta: false
+        q-metering: false
+        q-qos: false
+        q-svc: false
       tox_envlist: functional
 
 - job:
@@ -93,19 +93,19 @@
       - openstack/python-openstacksdk
     vars:
       devstack_localrc:
-        USE_PYTHON3: True
-        LIBS_FROM_GIT: 'python-openstackclient,python-openstacksdk,osc-lib,os-client-config'
+        USE_PYTHON3: true
+        LIBS_FROM_GIT: python-openstackclient,python-openstacksdk,osc-lib,os-client-config
         # This is insufficient, but leaving it here as a reminder of what may
         # someday be all we need to make this work
         # disable_python3_package swift
-        DISABLED_PYTHON3_PACKAGES: 'swift'
+        DISABLED_PYTHON3_PACKAGES: swift
       devstack_services:
         # Swift is not ready for python3 yet: At a minimum keystonemiddleware needs
         # to be installed in the py2 env, there are probably other things too...
-        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_envlist: functional-tips
 
 - project: