diff --git a/etc/kayobe/kolla/config/grafana.ini b/etc/kayobe/kolla/config/grafana.ini
new file mode 100644
index 000000000..ee8bc0301
--- /dev/null
+++ b/etc/kayobe/kolla/config/grafana.ini
@@ -0,0 +1,2 @@
+[unified_alerting]
+enabled = true
diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml
index 3a7ec0ef7..aa560f5fd 100644
--- a/etc/kayobe/kolla/globals.yml
+++ b/etc/kayobe/kolla/globals.yml
@@ -9,8 +9,10 @@ enable_docker_repo: {% raw %}"{{ 'overcloud' not in group_names or ansible_facts
 
 {% if kolla_base_distro == 'centos' %}
 bifrost_tag: yoga-20230217T160618
+neutron_tag: yoga-20230222T141329
 {% else %}
 bifrost_tag: yoga-20230220T184947
+neutron_tag: yoga-20230222T151000
 {% endif %}
 
 glance_tls_proxy_tag: "{% raw %}{{ haproxy_tag | default(openstack_tag) }}{% endraw %}"
diff --git a/releasenotes/notes/adds-support-for-trunk-ports-7301a258dca0c469.yaml b/releasenotes/notes/adds-support-for-trunk-ports-7301a258dca0c469.yaml
new file mode 100644
index 000000000..a2cadd35a
--- /dev/null
+++ b/releasenotes/notes/adds-support-for-trunk-ports-7301a258dca0c469.yaml
@@ -0,0 +1,14 @@
+---
+features:
+  - |
+    Updates neutron containers to contain a version of
+    networking-generic-switch with support for trunk ports when using DellOS 10
+    or Cisco switches. See this `PR
+    <https://github.com/stackhpc/networking-generic-switch/pull/52>`_ for more
+    details.
+  - |
+    Updates neutron containers to contain a version of
+    networking-generic-switch with support for DellOS 10. See this `PR
+    <https://github.com/stackhpc/networking-generic-switch/pull/50>`_ for more
+    details.
+