diff --git a/.github/workflows/fatimage.yml b/.github/workflows/fatimage.yml
index 331035001..6649a3533 100644
--- a/.github/workflows/fatimage.yml
+++ b/.github/workflows/fatimage.yml
@@ -23,11 +23,11 @@ jobs:
       matrix: # build RL8, RL9
         build:
           - image_name: openhpc-RL8
-            source_image_name: rocky-latest-RL8
-            inventory_groups: control,compute,login
+            source_image_name: Rocky-8-GenericCloud-Base-8.9-20231119.0.x86_64.qcow2
+            inventory_groups: control,compute,login,update
           - image_name: openhpc-RL9
-            source_image_name: rocky-latest-RL9
-            inventory_groups: control,compute,login
+            source_image_name: Rocky-9-GenericCloud-Base-9.4-20240523.0.x86_64.qcow2
+            inventory_groups: control,compute,login,update
     env:
       ANSIBLE_FORCE_COLOR: True
       OS_CLOUD: openstack
diff --git a/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json b/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json
index 7c59abf36..db25176e2 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-241216-1607-2357a730",
-        "RL9": "openhpc-RL9-241216-1607-2357a730"
+        "RL8": "openhpc-RL8-241218-1011-5effb3fa",
+        "RL9": "openhpc-RL9-241218-1011-5effb3fa"
     }
 }
diff --git a/environments/common/inventory/group_vars/all/defaults.yml b/environments/common/inventory/group_vars/all/defaults.yml
index 1bac4590d..29724fb6f 100644
--- a/environments/common/inventory/group_vars/all/defaults.yml
+++ b/environments/common/inventory/group_vars/all/defaults.yml
@@ -84,12 +84,12 @@ appliances_local_users: "{{ appliances_local_users_default + appliances_local_us
 
 appliances_repo_timestamps:
   baseos:
-    '9.4': 20240816T002610
+    '9.4': 20241115T011711
   appstream:
-    '9.4': 20240816T002610
+    '9.4': 20241112T003151
   crb:
-    '9.4': 20240816T002610
+    '9.4': 20241115T003133
   extras:
-    '9.4': 20240816T002610
+    '9.4': 20241118T002802
   epel:
-    '9': 20240902T080424
+    '9': 20241213T010218