diff --git a/ansible/roles/doca/defaults/main.yml b/ansible/roles/doca/defaults/main.yml
index 8fb5e920c..0edcf9a7c 100644
--- a/ansible/roles/doca/defaults/main.yml
+++ b/ansible/roles/doca/defaults/main.yml
@@ -1,3 +1,3 @@
-doca_version: '2.9.3' # 2.9 is LTS, last to support ConnectX-4, 3 years for bug fixes and CVE updates
+doca_version: '3.1.0'
 doca_profile: doca-ofed
 doca_repo_url: "https://linux.mellanox.com/public/repo/doca/{{ doca_version }}/rhel{{ ansible_distribution_version }}/{{ ansible_architecture }}/"
diff --git a/ansible/roles/lustre/defaults/main.yml b/ansible/roles/lustre/defaults/main.yml
index 14ddc0551..23bb3a43a 100644
--- a/ansible/roles/lustre/defaults/main.yml
+++ b/ansible/roles/lustre/defaults/main.yml
@@ -1,4 +1,5 @@
-lustre_version: '2.15.7'
+lustre_repo: https://github.com/stackhpc/lustre-release.git
+lustre_version: '2.15.7/lu-19289'
 lustre_lnet_label: tcp
 #lustre_mgs_nid:
 lustre_mounts: []
@@ -6,7 +7,6 @@ lustre_mount_state: mounted
 lustre_mount_options: 'defaults,_netdev,noauto,x-systemd.automount,x-systemd.requires=lnet.service,nosuid,nodev'
 
 # below variables are for build and should not generally require changes
-lustre_repo: "https://github.com/lustre/lustre-release.git"
 lustre_build_packages:
   - "kernel-devel-{{ ansible_kernel }}"
   - git
diff --git a/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json b/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json
index 88cdb4264..ce4efbd4f 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"
+        "RL8": "openhpc-RL8-250908-1247-db99a7a6",
+        "RL9": "openhpc-RL9-250908-1321-db99a7a6"
     }
 }
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..8c6eaf6c5 100644
--- a/environments/common/inventory/group_vars/all/dnf_repo_timestamps.yml
+++ b/environments/common/inventory/group_vars/all/dnf_repo_timestamps.yml
@@ -8,10 +8,28 @@ 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
-      pulp_timestamp: 20250614T013846
+      pulp_timestamp: 20250902T051143
       repo_file: Rocky-AppStream
     '9.4':
       pulp_path: rocky/9.4/AppStream/x86_64/os
@@ -23,12 +41,12 @@ 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':
       pulp_path: rocky/8.10/BaseOS/x86_64/os
-      pulp_timestamp: 20250614T013846
+      pulp_timestamp: 20250902T051143
       repo_file: Rocky-BaseOS
     '9.4':
       pulp_path: rocky/9.4/BaseOS/x86_64/os
@@ -40,12 +58,12 @@ 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':
       pulp_path: rocky/8.10/PowerTools/x86_64/os
-      pulp_timestamp: 20250614T013846
+      pulp_timestamp: 20250902T051143
       repo_file: Rocky-PowerTools
       repo_name: powertools
     '9.4':
@@ -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: 20250908T001730
+      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
@@ -80,37 +107,10 @@ dnf_repos_default:
   grafana:
     '8':
       pulp_path: grafana/oss/rpm
-      pulp_timestamp: 20250730T011314
+      pulp_timestamp: 20250906T025340
       repo_file: grafana
       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