diff --git a/README.md b/README.md
index f9547cc899..67b80d8794 100644
--- a/README.md
+++ b/README.md
@@ -58,13 +58,13 @@ This provider's versions are able to install and manage the following versions o
 
 This provider's versions are able to install Kubernetes to the following versions of OpenStack:
 
-|                                    | Pike | Queens | Rocky | Stein | Train | Ussuri | Victoria | Wallaby | Xena | Yoga |
-|------------------------------------| ---- | ------ | ----- | ----- | ----- | ------ | -------- | ------- | ---- | ---- |
-| OpenStack Provider v1alpha3 (v0.3) | +    | +      | +     | ✓     | ✓     | ✓      | ✓        |         |      |      |
-| OpenStack Provider v1alpha4 (v0.4) | +    | +      | +     | +     | +     | +      | ✓        |         |      |      |
-| OpenStack Provider v1alpha4 (v0.5) | +    | +      | +     | +     | +     | +      | ✓        |         |      |      |
-| OpenStack Provider v1alpha5 (v0.6) | +    | +      | +     | +     | +     | +      | ✓        | ✓       | ✓    | ✓    |
-| OpenStack Provider v1alpha6        | +    | +      | +     | +     | +     | +      | ✓        | ✓       | ✓    | ✓    |
+|                                    | Pike | Queens | Rocky | Stein | Train | Ussuri | Victoria | Wallaby | Xena | Yoga | Zed |
+|------------------------------------| ---- | ------ | ----- | ----- | ----- | ------ | -------- | ------- | ---- | ---- | --- |
+| OpenStack Provider v1alpha3 (v0.3) | +    | +      | +     | ✓     | ✓     | ✓      | ✓        |         |      |      |     |
+| OpenStack Provider v1alpha4 (v0.4) | +    | +      | +     | +     | +     | +      | ✓        |         |      |      |     |
+| OpenStack Provider v1alpha4 (v0.5) | +    | +      | +     | +     | +     | +      | ✓        |         |      |      |     |
+| OpenStack Provider v1alpha5 (v0.6) | +    | +      | +     | +     | +     | +      | ✓        | ✓       | ✓    | ✓    |     |
+| OpenStack Provider v1alpha6        | +    | +      | +     | +     | +     | +      | ✓        | ✓       | ✓    | ✓    | ✓   |
 
 Test status:
 
diff --git a/hack/ci/cloud-init/controller.yaml.tpl b/hack/ci/cloud-init/controller.yaml.tpl
index 958ddaf5d0..6500b3573b 100644
--- a/hack/ci/cloud-init/controller.yaml.tpl
+++ b/hack/ci/cloud-init/controller.yaml.tpl
@@ -12,7 +12,6 @@
     VERBOSE=True
     LOG_COLOR=True
 
-    # Neutron
     enable_plugin neutron https://github.com/openstack/neutron stable/${OPENSTACK_RELEASE}
 
     # Octavia
@@ -36,8 +35,8 @@
 
     # Neutron
     ENABLED_SERVICES+=,neutron-api,neutron-agent,neutron-dhcp,neutron-l3,neutron-trunk
-
     ENABLED_SERVICES+=,neutron-metadata-agent,neutron-qos
+
     # Octavia
     ENABLED_SERVICES+=,octavia,o-api,o-cw,o-hm,o-hk,o-da
 
@@ -82,7 +81,7 @@
 
     [[post-config|$NEUTRON_CONF]]
     [DEFAULT]
-    service_plugins = trunk,router
+    service_plugins = trunk, router
 - path: /tmp/register-worker.sh
   permissions: 0755
   content: |
diff --git a/hack/ci/create_devstack.sh b/hack/ci/create_devstack.sh
index dd88e2f040..e1d7c623b0 100755
--- a/hack/ci/create_devstack.sh
+++ b/hack/ci/create_devstack.sh
@@ -31,7 +31,7 @@ source "${scriptdir}/${RESOURCE_TYPE}.sh"
 
 CLUSTER_NAME=${CLUSTER_NAME:-"capo-e2e"}
 
-OPENSTACK_RELEASE=${OPENSTACK_RELEASE:-"yoga"}
+OPENSTACK_RELEASE=${OPENSTACK_RELEASE:-"zed"}
 OPENSTACK_ENABLE_HORIZON=${OPENSTACK_ENABLE_HORIZON:-"false"}
 
 # Devstack will create a provider network using this range
@@ -84,7 +84,7 @@ function ensure_openstack_client {
         # Until then, this script tries to carefully navigate around current
         # issues running openstack client on python 3.7.
         #
-        # We explicitly pin the yoga version of openstackclient. This is the
+        # We explicitly pin the zed version of openstackclient. This is the
         # last version of openstackclient which will support python 3.7.
 
         # Install virtualenv to install the openstack client and curl to fetch
@@ -94,12 +94,12 @@ function ensure_openstack_client {
         VIRTUAL_ENV_DISABLE_PROMPT=1 source /tmp/openstack-venv/bin/activate
 
         # openstackclient has never actually supported python 3.7, only 3.6 and
-        # 3.8. Here we download the yoga constraints file and modify all the
+        # 3.8. Here we download the zed constraints file and modify all the
         # 3.8 constraints to be 3.7 constraints.
-        curl -L https://releases.openstack.org/constraints/upper/yoga -o /tmp/yoga-constraints
-        sed -i "s/python_version=='3.8'/python_version=='3.7'/" /tmp/yoga-constraints
+        # curl -L https://releases.openstack.org/constraints/upper/zed -o /tmp/zed-constraints
+        # sed -i "s/python_version=='3.8'/python_version=='3.7'/" /tmp/zed-constraints
 
-        pip install -c /tmp/yoga-constraints \
+        pip install \
                 python-openstackclient python-cinderclient \
                 python-glanceclient python-keystoneclient \
                 python-neutronclient python-novaclient python-octaviaclient
@@ -169,6 +169,8 @@ function wait_for_devstack {
     # Continuously capture devstack logs until killed
     $ssh_cmd "$ip" -- sudo journalctl --no-tail -a -b -u 'devstack@*' -f > "${devstackdir}/${name}-devstack.log" &
 
+    $ssh_cmd "$ip" -- sudo journalctl --no-tail -a -b -u 'devstack@neutron-api.service' -f > "${devstackdir}/${name}-neutron.log" &
+
     # Capture cloud-init logs
     # Devstack logs are in cloud-final
     for service in cloud-config cloud-final cloud-init-local cloud-init; do