diff --git a/.github/workflows/fatimage.yml b/.github/workflows/fatimage.yml
index a8d3dbe29..d40504168 100644
--- a/.github/workflows/fatimage.yml
+++ b/.github/workflows/fatimage.yml
@@ -33,10 +33,10 @@ jobs:
       SOURCE_IMAGES_MAP: |
         {
           "RL8": {
-            "openstack.openhpc": "rocky-latest-RL8"
+            "openstack.openhpc": "rocky-latest-test-RL8"
           },
           "RL9": {
-            "openstack.openhpc": "rocky-latest-RL9"
+            "openstack.openhpc": "rocky-latest-test-RL9"
           }
         }
 
diff --git a/.github/workflows/nightlybuild.yml b/.github/workflows/nightlybuild.yml
index da3de4ea5..66cbe8ba7 100644
--- a/.github/workflows/nightlybuild.yml
+++ b/.github/workflows/nightlybuild.yml
@@ -27,7 +27,7 @@ jobs:
           - RL8
           - RL9
         build:
-          - openstack.rocky-latest
+          - openstack.rocky-latest-test
     env:
       ANSIBLE_FORCE_COLOR: True
       OS_CLOUD: openstack
@@ -138,7 +138,7 @@ jobs:
           - RL8
           - RL9
         image:
-          - rocky-latest
+          - rocky-latest-test
         exclude:
           - target_cloud: LEAFCLOUD
     env:
diff --git a/ansible/bootstrap.yml b/ansible/bootstrap.yml
index 733d4b3f8..92eef90b1 100644
--- a/ansible/bootstrap.yml
+++ b/ansible/bootstrap.yml
@@ -1,5 +1,22 @@
 ---
 
+# - hosts: all
+#   become: yes
+#   tasks:
+#     - name: Override /etc/dnf/vars/releasever with "9.4"
+#       ansible.builtin.lineinfile:
+#         path: /etc/dnf/vars/releasever
+#         line: "9"
+#         create: yes
+#         owner: root
+#         group: root
+#         mode: '0644'
+#       when: ansible_distribution_major_version == "9"
+
+#     - name: Clean DNF metadata
+#       ansible.builtin.command:
+#         cmd: dnf clean all
+
 - hosts: cluster
   gather_facts: false
   become: yes
diff --git a/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json b/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json
index f9a2087c8..e3a2bd242 100644
--- a/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json
+++ b/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json
@@ -1,6 +1,6 @@
 {
     "cluster_image": {
-        "RL8": "openhpc-RL8-241118-0918-4538c6df",
-        "RL9": "openhpc-RL9-241118-0918-4538c6df"
+        "RL8": "openhpc-RL8-241120-2119-bcee1b6b",
+        "RL9": "openhpc-RL9-241120-2119-bcee1b6b"
     }
 }
diff --git a/packer/openstack.pkr.hcl b/packer/openstack.pkr.hcl
index 52202ead1..6fb1ff633 100644
--- a/packer/openstack.pkr.hcl
+++ b/packer/openstack.pkr.hcl
@@ -127,6 +127,7 @@ variable "volume_size" {
   default = {
     # fat image builds, GB:
     rocky-latest = 15
+    rocky-latest-test = 15
     openhpc = 15
   }
 }
@@ -152,6 +153,7 @@ variable "groups" {
   default = {
     # fat image builds:
     rocky-latest = ["update"]
+    rocky-latest-test = ["update"]
     openhpc = ["control", "compute", "login"]
   }
 }
@@ -206,6 +208,12 @@ build {
     image_name = "${source.name}-${var.os_version}"
   }
 
+  # latest nightly image test:
+  source "source.openstack.openhpc" {
+    name = "rocky-latest-test"
+    image_name = "${source.name}-${var.os_version}"
+  }
+
   # fat image:
   source "source.openstack.openhpc" {
     name = "openhpc"