diff --git a/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json b/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json
index 88cdb4264..6b294d157 100644
--- a/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json
+++ b/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json
@@ -1,6 +1,6 @@
 {
     "cluster_image": {
         "RL8": "openhpc-RL8-250820-0800-767addd8",
-        "RL9": "openhpc-RL9-250820-0800-767addd8"
+        "RL9": "openhpc-RL9-250908-2047-d90ebd0e"
     }
 }
diff --git a/environments/common/inventory/group_vars/all/dnf_repo_timestamps.yml b/environments/common/inventory/group_vars/all/dnf_repo_timestamps.yml
index d2df041b4..c80a85aa3 100644
--- a/environments/common/inventory/group_vars/all/dnf_repo_timestamps.yml
+++ b/environments/common/inventory/group_vars/all/dnf_repo_timestamps.yml
@@ -8,6 +8,24 @@ dnf_repos_default:
       pulp_path: centos/9-stream/storage/x86_64/ceph-reef
       pulp_timestamp: 20250617T023108
       repo_file: ceph
+  OpenHPC:
+    '8':
+      pulp_path: OpenHPC/2/EL_8
+      pulp_timestamp: 20241218T154614
+      repo_file: OpenHPC
+    '9':
+      pulp_path: OpenHPC/3/EL_9
+      pulp_timestamp: 20241218T154614
+      repo_file: OpenHPC
+  OpenHPC-updates:
+    '8':
+      pulp_path: OpenHPC/2/updates/EL_8
+      pulp_timestamp: 20250512T003315
+      repo_file: OpenHPC
+    '9':
+      pulp_path: OpenHPC/3/updates/EL_9
+      pulp_timestamp: 20250510T003301
+      repo_file: OpenHPC
   appstream:
     '8.10':
       pulp_path: rocky/8.10/AppStream/x86_64/os
@@ -23,7 +41,7 @@ dnf_repos_default:
       repo_file: rocky
     '9.6':
       pulp_path: rocky/9.6/AppStream/x86_64/os
-      pulp_timestamp: 20250816T020215
+      pulp_timestamp: 20250902T060015
       repo_file: rocky
   baseos:
     '8.10':
@@ -40,7 +58,7 @@ dnf_repos_default:
       repo_file: rocky
     '9.6':
       pulp_path: rocky/9.6/BaseOS/x86_64/os
-      pulp_timestamp: 20250815T050653
+      pulp_timestamp: 20250902T094855
       repo_file: rocky
   crb:
     '8.10':
@@ -58,8 +76,17 @@ dnf_repos_default:
       repo_file: rocky
     '9.6':
       pulp_path: rocky/9.6/CRB/x86_64/os
-      pulp_timestamp: 20250815T034418
+      pulp_timestamp: 20250902T060015
       repo_file: rocky
+  epel:
+    '8':
+      pulp_path: epel/8/Everything/x86_64
+      pulp_timestamp: 20250615T234151
+      repo_file: epel
+    '9':
+      pulp_path: epel/9/Everything/x86_64
+      pulp_timestamp: 20250908T001730
+      repo_file: epel
   extras:
     '8.10':
       pulp_path: rocky/8.10/extras/x86_64/os
@@ -85,32 +112,5 @@ dnf_repos_default:
       timestamp: 20250615T005738
     '9':
       pulp_path: grafana/oss/rpm
-      pulp_timestamp: 20250730T011314
+      pulp_timestamp: 20250906T025340
       repo_file: grafana
-  epel:
-    '8':
-      pulp_path: epel/8/Everything/x86_64
-      pulp_timestamp: 20250615T234151
-      repo_file: epel
-    '9':
-      pulp_path: epel/9/Everything/x86_64
-      pulp_timestamp: 20250817T000753
-      repo_file: epel
-  OpenHPC:
-    '8':
-      pulp_path: OpenHPC/2/EL_8
-      pulp_timestamp: 20241218T154614
-      repo_file: OpenHPC
-    '9':
-      pulp_path: OpenHPC/3/EL_9
-      pulp_timestamp: 20241218T154614
-      repo_file: OpenHPC
-  OpenHPC-updates:
-    '8':
-      pulp_path: OpenHPC/2/updates/EL_8
-      pulp_timestamp: 20250512T003315
-      repo_file: OpenHPC
-    '9':
-      pulp_path: OpenHPC/3/updates/EL_9
-      pulp_timestamp: 20250510T003301
-      repo_file: OpenHPC