diff --git a/.github/workflows/stackhpc-all-in-one.yml b/.github/workflows/stackhpc-all-in-one.yml
index f819bf7e0..d76a28e8c 100644
--- a/.github/workflows/stackhpc-all-in-one.yml
+++ b/.github/workflows/stackhpc-all-in-one.yml
@@ -22,7 +22,7 @@ on:
       vm_image:
         description: Image for the all-in-one VM
         type: string
-        default: CentOS-stream8
+        default: bb8c0a34-533f-42fb-a49b-3461e677f3f6
       vm_interface:
         description: Default network interface name
         type: string
diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
index 72404e9c6..dbb5b1b3c 100644
--- a/etc/kayobe/kolla.yml
+++ b/etc/kayobe/kolla.yml
@@ -291,6 +291,16 @@ kolla_build_blocks:
     RUN sed -i 's/"pc-q35-rhel8.5.0"/"pc-q35-*"/' /usr/share/qemu/firmware/50-edk2-ovmf-cc.json
     {% endif %}
     {% endraw %}
+  neutron_server_footer: |
+    # This is a workaround for a bug in etcd3gw that was fixed in 1.0.1, but not in v0.2.3.
+    # https://opendev.org/openstack/etcd3gw/commit/ed899b34e464862525f76fff2377a2cceeb65af7
+    {% raw %}
+    {% if base_distro == 'centos' %}
+    RUN sed -i 's/decode_unicode=True/decode_unicode=False/' /var/lib/kolla/venv/lib/python3.6/site-packages/etcd3gw/watch.py
+    {% elif base_distro == 'ubuntu' %}
+    RUN sed -i 's/decode_unicode=True/decode_unicode=False/' /var/lib/kolla/venv/lib/python3.8/site-packages/etcd3gw/watch.py
+    {% endif %}
+    {% endraw %}
 
 # Dict mapping image customization variable names to their values.
 # Each variable takes the form:
diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml
index 129c99e6c..5ac963f76 100644
--- a/etc/kayobe/kolla/globals.yml
+++ b/etc/kayobe/kolla/globals.yml
@@ -13,7 +13,7 @@ blazar_tag: xena-20230315T122920
 caso_tag: xena-20230315T122920
 ironic_tag: xena-20230316T162305
 ironic_dnsmasq_tag: xena-20230214T150257
-neutron_tag: xena-20230307T142413
+neutron_tag: xena-20230320T143013
 prometheus_node_exporter_tag: xena-20230310T170439
 {% else %}
 bifrost_tag: xena-20230215T195824
@@ -22,7 +22,7 @@ caso_tag: xena-20230315T122918
 ironic_tag: xena-20230317T090705
 ironic_dnsmasq_tag: xena-20230215T164524
 keystone_tag: xena-20230308T120251
-neutron_tag: xena-20230307T142414
+neutron_tag: xena-20230320T143007
 prometheus_node_exporter_tag: xena-20230315T164024
 {% endif %}
 
diff --git a/releasenotes/notes/fixes-broken-etcdgw-library-2af353ec0dc42109.yaml b/releasenotes/notes/fixes-broken-etcdgw-library-2af353ec0dc42109.yaml
new file mode 100644
index 000000000..e48b16fdc
--- /dev/null
+++ b/releasenotes/notes/fixes-broken-etcdgw-library-2af353ec0dc42109.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    The etcdgw library in the neutron-server container has been patched to
+    workaround a python3 incompatability. This affects the batching feature in
+    networking generic switch.
diff --git a/terraform/aio/vm.tf b/terraform/aio/vm.tf
index bf881e5cc..6a65cff44 100644
--- a/terraform/aio/vm.tf
+++ b/terraform/aio/vm.tf
@@ -33,9 +33,14 @@ variable "aio_vm_subnet" {
   type = string
 }
 
+locals {
+  image_is_uuid = length(regexall("^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$", var.aio_vm_image)) > 0
+}
+
 data "openstack_images_image_v2" "image" {
   name        = var.aio_vm_image
   most_recent = true
+  count = local.image_is_uuid ? 0 : 1
 }
 
 data "openstack_networking_subnet_v2" "network" {
@@ -52,7 +57,7 @@ resource "openstack_compute_instance_v2" "kayobe-aio" {
   }
 
   block_device {
-    uuid                  = data.openstack_images_image_v2.image.id
+    uuid                  = local.image_is_uuid ? var.aio_vm_image: data.openstack_images_image_v2.image[0].id
     source_type           = "image"
     volume_size           = 100
     boot_index            = 0