diff --git a/.github/workflows/overcloud-host-image-build.yml b/.github/workflows/overcloud-host-image-build.yml
index 9a3323e38..ed275351f 100644
--- a/.github/workflows/overcloud-host-image-build.yml
+++ b/.github/workflows/overcloud-host-image-build.yml
@@ -171,9 +171,11 @@ jobs:
 
       - name: Write Terraform network interface config
         run: |
-          mkdir -p etc/kayobe/environments/$KAYOBE_ENVIRONMENT/inventory/group_vars/seed
-          cat << EOF > etc/kayobe/environments/$KAYOBE_ENVIRONMENT/inventory/group_vars/seed/tf-network-interfaces
+          mkdir -p src/kayobe-config/etc/kayobe/environments/$KAYOBE_ENVIRONMENT/inventory/group_vars/seed
+          rm -f src/kayobe-config/etc/kayobe/environments/$KAYOBE_ENVIRONMENT/inventory/group_vars/seed/network-interfaces
+          cat << EOF > src/kayobe-config/etc/kayobe/environments/$KAYOBE_ENVIRONMENT/inventory/group_vars/seed/network-interfaces
           admin_interface: "{{ access_interface.value }}"
+          aio_interface: "{{ access_interface.value }}"
           EOF
 
       - name: Manage SSH keys
@@ -234,6 +236,7 @@ jobs:
           -e stackhpc_overcloud_dib_name=overcloud-centos-8-stream
         env:
           KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
+        if: inputs.centos
 
       - name: Show last error logs
         continue-on-error: true
@@ -486,7 +489,7 @@ jobs:
         run: |
           mkdir logs
           scp -r rocky@$(jq -r .access_ip_v4.value src/kayobe-config/etc/kayobe/environments/ci-builder/tf-outputs.yml):/opt/kayobe/images/*/*.std* ./logs/
-          scp -r rocky@$(jq -r .access_ip_v4.value src/kayobe-config/etc/kayobe/environments/ci-builder/tf-outputs.yml):/tmp/updated_images.txt ./logs/
+          scp -r rocky@$(jq -r .access_ip_v4.value src/kayobe-config/etc/kayobe/environments/ci-builder/tf-outputs.yml):/tmp/updated_images.txt ./logs/ || true
         if: always()
 
       - name: Fail if any overcloud host image builds failed
@@ -504,6 +507,7 @@ jobs:
         with:
           name: Build logs
           path: ./logs
+        if: always()
 
       - name: Destroy
         run: terraform destroy -auto-approve
diff --git a/etc/kayobe/environments/ci-builder/inventory/group_vars/seed/network-interfaces b/etc/kayobe/environments/ci-builder/inventory/group_vars/seed/network-interfaces
index c143fe2c9..a583b7214 100644
--- a/etc/kayobe/environments/ci-builder/inventory/group_vars/seed/network-interfaces
+++ b/etc/kayobe/environments/ci-builder/inventory/group_vars/seed/network-interfaces
@@ -2,5 +2,12 @@
 ###############################################################################
 # Network interface definitions for the controller group.
 
-# Seed interface on all-in-one network.
-aio_interface: eth0
+# Controller interface on all-in-one network.
+aio_interface: breth1
+# Use dummy1 if it exists, otherwise the bridge will have no ports.
+aio_bridge_ports: "{{ ['dummy1'] if 'dummy1' in hostvars[inventory_hostname].ansible_facts else [] }}"
+
+###############################################################################
+# Dummy variable to allow Ansible to accept this file.
+workaround_ansible_issue_8743: yes
+
diff --git a/etc/kayobe/overcloud-dib.yml b/etc/kayobe/overcloud-dib.yml
index d7f6dbd69..ad15000f3 100644
--- a/etc/kayobe/overcloud-dib.yml
+++ b/etc/kayobe/overcloud-dib.yml
@@ -71,7 +71,7 @@ overcloud_dib_host_packages_extra:
 overcloud_dib_git_elements_extra:
   - repo: "https://github.com/stackhpc/stackhpc-image-elements"
     local: "{{ source_checkout_path }}/stackhpc-image-elements"
-    version: "v1.6.1"
+    version: "fix-rocky-containerfile"
     elements_path: "elements"
 
 # List of git repositories containing Diskimage Builder (DIB) elements. See
diff --git a/etc/kayobe/pulp-host-image-versions.yml b/etc/kayobe/pulp-host-image-versions.yml
index 8afd0e45a..40b18d6ec 100644
--- a/etc/kayobe/pulp-host-image-versions.yml
+++ b/etc/kayobe/pulp-host-image-versions.yml
@@ -3,6 +3,6 @@
 # These images must be in SMS, since they are used by our AIO CI runners
 stackhpc_centos_8_stream_overcloud_host_image_version: "yoga-20240326T091511"
 stackhpc_rocky_8_overcloud_host_image_version: "yoga-20240326T091511"
-stackhpc_rocky_9_overcloud_host_image_version: "yoga-20240326T091511"
+stackhpc_rocky_9_overcloud_host_image_version: "yoga-20240327T123643"
 stackhpc_ubuntu_focal_overcloud_host_image_version: "yoga-20240326T091511"
 stackhpc_ubuntu_jammy_overcloud_host_image_version: "yoga-20240326T091511"
diff --git a/etc/kayobe/pulp-repo-versions.yml b/etc/kayobe/pulp-repo-versions.yml
index 407aaf298..2b3b67795 100644
--- a/etc/kayobe/pulp-repo-versions.yml
+++ b/etc/kayobe/pulp-repo-versions.yml
@@ -64,8 +64,8 @@ stackhpc_pulp_repo_rocky_9_3_crb_version: 20231215T005810
 stackhpc_pulp_repo_rocky_9_3_extras_version: 20231211T120328
 stackhpc_pulp_repo_rocky_9_3_highavailability_version: 20231214T005538
 stackhpc_pulp_repo_treasuredata_4_version: 20230903T003752
-stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20231019T125502
-stackhpc_pulp_repo_ubuntu_focal_security_version: 20231018T165217
-stackhpc_pulp_repo_ubuntu_focal_version: 20231018T165217
-stackhpc_pulp_repo_ubuntu_jammy_security_version: 20231020T074329
-stackhpc_pulp_repo_ubuntu_jammy_version: 20231020T074329
+stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20240327T041648
+stackhpc_pulp_repo_ubuntu_focal_security_version: 20240327T041026
+stackhpc_pulp_repo_ubuntu_focal_version: 20240327T041026
+stackhpc_pulp_repo_ubuntu_jammy_security_version: 20240327T015223
+stackhpc_pulp_repo_ubuntu_jammy_version: 20240327T015223
diff --git a/etc/kayobe/stackhpc-overcloud-dib.yml b/etc/kayobe/stackhpc-overcloud-dib.yml
index fcce90746..3ed4d44db 100644
--- a/etc/kayobe/stackhpc-overcloud-dib.yml
+++ b/etc/kayobe/stackhpc-overcloud-dib.yml
@@ -21,7 +21,7 @@ stackhpc_overcloud_dib_name: "deployment_image"
 
 # StackHPC overcloud DIB image elements.
 stackhpc_overcloud_dib_elements:
-  - "{{ os_distribution }}-{% if os_distribution == 'rocky' %}container-stackhpc{% else %}minimal{% endif %}"
+  - "{{ os_distribution }}-{% if os_distribution == 'rocky' %}container{% else %}minimal{% endif %}"
   - "cloud-init-datasources"
   - "{% if os_distribution in ['centos', 'rocky'] %}disable-selinux{% endif %}"
   - "enable-serial-console"
@@ -41,7 +41,6 @@ stackhpc_overcloud_dib_env_vars:
   DIB_CLOUD_INIT_DATASOURCES: "ConfigDrive"
   DIB_CONTAINERFILE_RUNTIME: "docker"
   DIB_CONTAINERFILE_NETWORK_DRIVER: "host"
-  DIB_CONTAINERFILE_DOCKERFILE: "/opt/kayobe/src/stackhpc-image-elements/elements/rocky-container-stackhpc/containerfiles/9-stackhpc"
   # NOTE: Not currently syncing Ubuntu packages, since the on_demand mirror in
   # Ark does not work if the upstream mirror pulls packages (which it does
   # sometimes).