diff --git a/.github/workflows/stackhpc-container-image-build.yml b/.github/workflows/stackhpc-container-image-build.yml
index f69626d27..396b506a6 100644
--- a/.github/workflows/stackhpc-container-image-build.yml
+++ b/.github/workflows/stackhpc-container-image-build.yml
@@ -67,6 +67,14 @@ jobs:
           sudo ip l set dummy1 up
           sudo ip l set dummy1 master breth1
 
+      # FIXME: Without this workaround we see the following issue after the runner is power cycled:
+      # TASK [MichaelRigart.interfaces : RedHat | ensure network service is started and enabled] ***
+      #   Unable to start service network: Job for network.service failed because the control process exited with error code.
+      #   See \"systemctl status network.service\" and \"journalctl -xe\" for details.
+      - name: Kill dhclient (workaround)
+        run: |
+          (sudo killall dhclient || true) && sudo systemctl restart network
+
       - name: Install Kayobe
         run: |
           mkdir -p venvs &&
diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
index f98dd5a9a..e3ab11dd8 100644
--- a/etc/kayobe/kolla.yml
+++ b/etc/kayobe/kolla.yml
@@ -259,6 +259,14 @@ kolla_build_blocks:
         && grafana-cli plugins install grafana-piechart-panel
   ironic_inspector_header: |
     ADD additions-archive /
+  nova_base_footer: |
+    # Fix for https://bugs.launchpad.net/nova/+bug/1955035, i.e.
+    # https://bugzilla.redhat.com/show_bug.cgi?id=2090752 on c8s
+    {% raw %}
+    {% if base_package_type == 'rpm' %}
+    RUN sed -i 's/"pc-q35-rhel8.5.0"/"pc-q35-*"/' /usr/share/qemu/firmware/50-edk2-ovmf-cc.json
+    {% 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 c2c7ce5c6..3cb843778 100644
--- a/etc/kayobe/kolla/globals.yml
+++ b/etc/kayobe/kolla/globals.yml
@@ -10,6 +10,7 @@ enable_docker_repo: {% raw %}"{{ 'overcloud' not in group_names or ansible_facts
 {% if kolla_base_distro == 'centos' %}
 bifrost_tag: xena-20221128T101757
 magnum_tag: xena-20230111T093652
+nova_tag: xena-20230120T115956
 rabbitmq_tag: xena-20230105T141714
 {% else %}
 bifrost_tag: xena-20221213T224057
diff --git a/etc/kayobe/pulp-repo-versions.yml b/etc/kayobe/pulp-repo-versions.yml
index d67eefc19..d05050d83 100644
--- a/etc/kayobe/pulp-repo-versions.yml
+++ b/etc/kayobe/pulp-repo-versions.yml
@@ -28,4 +28,9 @@ stackhpc_pulp_repo_rocky_8_6_baseos_version: 20220914T080246
 stackhpc_pulp_repo_rocky_8_6_extras_version: 20220904T041706
 stackhpc_pulp_repo_rocky_8_6_nfv_version: 20220918T035853
 stackhpc_pulp_repo_rocky_8_6_powertools_version: 20220918T035853
+stackhpc_pulp_repo_rocky_8_7_appstream_version: 20221201T192704
+stackhpc_pulp_repo_rocky_8_7_baseos_version: 20221202T032715
+stackhpc_pulp_repo_rocky_8_7_extras_version: 20221201T192704
+stackhpc_pulp_repo_rocky_8_7_nfv_version: 20221202T032715
+stackhpc_pulp_repo_rocky_8_7_powertools_version: 20221202T032715
 stackhpc_pulp_repo_mlnx_ofed_5_7_1_0_2_0_rhel8_6_version: 20220920T151419
diff --git a/etc/kayobe/pulp.yml b/etc/kayobe/pulp.yml
index 22b9320f0..61f7c4dba 100644
--- a/etc/kayobe/pulp.yml
+++ b/etc/kayobe/pulp.yml
@@ -179,8 +179,8 @@ stackhpc_pulp_sync_centos_stream8: "{{ os_distribution == 'centos' }}"
 
 # Whether to sync Rocky Linux 8 packages.
 stackhpc_pulp_sync_rocky_8: "{{ os_distribution == 'rocky' }}"
-# Rocky 8 minor version number. Supported values: 6.
-stackhpc_pulp_repo_rocky_8_minor_version: 6
+# Rocky 8 minor version number. Supported values: 6, 7
+stackhpc_pulp_repo_rocky_8_minor_version: 7
 # Rocky 8 Snapshot versions. The defaults use the appropriate version from
 # pulp-repo-versions.yml for the selected minor release.
 stackhpc_pulp_repo_rocky_8_appstream_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_8_%s_appstream_version' % stackhpc_pulp_repo_rocky_8_minor_version) }}"
diff --git a/releasenotes/notes/magnum-bump-tags-7841edcbd3da4b9c.yaml b/releasenotes/notes/magnum-bump-tags-7841edcbd3da4b9c.yaml
index 28b922e76..4850e4995 100644
--- a/releasenotes/notes/magnum-bump-tags-7841edcbd3da4b9c.yaml
+++ b/releasenotes/notes/magnum-bump-tags-7841edcbd3da4b9c.yaml
@@ -3,7 +3,7 @@ fixes:
   - |
     Fixes CoreDNS for Magnum clusters crashing on startup.
   - |
-    Allows cinder-csi nodeplugin to start on the same Magnum cluster host as 
+    Allows cinder-csi nodeplugin to start on the same Magnum cluster host as
     cinder-csi controllerplugin.
   - |
     Corrects ClusterRole rules for Magnum cluster-autoscaler, and sets
diff --git a/releasenotes/notes/nova-uefi-edk2-ovmf-d636c299e76728e8.yaml b/releasenotes/notes/nova-uefi-edk2-ovmf-d636c299e76728e8.yaml
new file mode 100644
index 000000000..e75630ff0
--- /dev/null
+++ b/releasenotes/notes/nova-uefi-edk2-ovmf-d636c299e76728e8.yaml
@@ -0,0 +1,4 @@
+---
+fixes:
+  - |
+    Fix creation of VM instances with UEFI enabled and Secure Boot disabled.
diff --git a/releasenotes/notes/rocky-87-rpms-999565263dacde42.yaml b/releasenotes/notes/rocky-87-rpms-999565263dacde42.yaml
new file mode 100644
index 000000000..4f9db394b
--- /dev/null
+++ b/releasenotes/notes/rocky-87-rpms-999565263dacde42.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    Sync Rocky Linux 8.7 RPM repositories to local Pulp servers.