diff --git a/.github/workflows/fatimage.yml b/.github/workflows/fatimage.yml
index 5bb0fde9a..51ea29a60 100644
--- a/.github/workflows/fatimage.yml
+++ b/.github/workflows/fatimage.yml
@@ -31,7 +31,7 @@ jobs:
             source_image_name: Rocky-8-GenericCloud-Base-8.10-20240528.0.x86_64.raw
             inventory_groups: control,compute,login,update
           - image_name: openhpc-RL9
-            source_image_name: Rocky-9-GenericCloud-Base-9.5-20241118.0.x86_64.raw
+            source_image_name: Rocky-9-GenericCloud-Base-9.6-20250531.0.x86_64.qcow2
             inventory_groups: control,compute,login,update
     env:
       ANSIBLE_FORCE_COLOR: True
diff --git a/ansible/roles/lustre/README.md b/ansible/roles/lustre/README.md
index 9abbb9b1b..0269ad6fa 100644
--- a/ansible/roles/lustre/README.md
+++ b/ansible/roles/lustre/README.md
@@ -19,10 +19,8 @@ The following variables control configuration of Lustre clients.
 - `lustre_mount_options`. Optional default mount options. Default values are systemd defaults from [Lustre client docs](http://wiki.lustre.org/Mounting_a_Lustre_File_System_on_Client_Nodes).
 
 The following variables control the package build and and install:
-- `lustre_version`: Optional str. Version of lustre to build, default `2.15.6/lu-18085`
-  which is the first version with EL9.5 support, plus a fix for https://jira.whamcloud.com/browse/LU-18085.
-- `lustre_repo`: Optional str. URL for Lustre repo. Default is a StackHPC repo
-  incorporating the above fix.
+- `lustre_version`: Optional str. Version of lustre to build, default `2.15.7`
+- `lustre_repo`: Optional str. URL for Lustre repo. Default is `git://git.whamcloud.com/fs/lustre-release`.git.
 - `lustre_build_packages`: Optional list. Prerequisite packages required to build Lustre. See `defaults/main.yml`.
 - `lustre_build_dir`: Optional str. Path to build lustre at, default `/tmp/lustre-release`.
 - `lustre_configure_opts`: Optional list. Options to `./configure` command. Default builds client rpms supporting Mellanox OFED, without support for GSS keys.
diff --git a/ansible/roles/lustre/defaults/main.yml b/ansible/roles/lustre/defaults/main.yml
index 72337733c..0fe5d61a1 100644
--- a/ansible/roles/lustre/defaults/main.yml
+++ b/ansible/roles/lustre/defaults/main.yml
@@ -1,5 +1,4 @@
-lustre_repo: https://github.com/stackhpc/lustre-release.git
-lustre_version: '2.15.6/lu-18085' # Fixes https://jira.whamcloud.com/browse/LU-18085
+lustre_version: '2.15.7'
 lustre_lnet_label: tcp
 #lustre_mgs_nid:
 lustre_mounts: []
@@ -7,7 +6,7 @@ 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_git_repo: "git://git.whamcloud.com/fs/lustre-release.git"
+lustre_repo: "git://git.whamcloud.com/fs/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 03b092564..36533455d 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-250708-1502-1494192e",
-        "RL9": "openhpc-RL9-250708-1547-1494192e"
+        "RL8": "openhpc-RL8-250804-1050-baf92bc5",
+        "RL9": "openhpc-RL9-250804-1050-baf92bc5"
     }
 }
diff --git a/environments/common/inventory/group_vars/all/timestamps.yml b/environments/common/inventory/group_vars/all/timestamps.yml
index 971515d2f..455c26005 100644
--- a/environments/common/inventory/group_vars/all/timestamps.yml
+++ b/environments/common/inventory/group_vars/all/timestamps.yml
@@ -9,6 +9,9 @@ appliances_pulp_repos:
     '9.5':
       path: rocky/9.5/AppStream/x86_64/os
       timestamp: 20250514T014704
+    '9.6':
+      path: rocky/9.6/AppStream/x86_64/os
+      timestamp: 20250726T040613
   baseos:
     '8.10':
       path: rocky/8.10/BaseOS/x86_64/os
@@ -19,13 +22,16 @@ appliances_pulp_repos:
     '9.5':
       path: rocky/9.5/BaseOS/x86_64/os
       timestamp: 20250513T031844
+    '9.6':
+      path: rocky/9.6/BaseOS/x86_64/os
+      timestamp: 20250726T052250
   ceph:
     '8':
       path: centos/8-stream/storage/x86_64/ceph-quincy
       timestamp: 20231104T015751
     '9':
       path: centos/9-stream/storage/x86_64/ceph-reef
-      timestamp: 20250514T025809
+      timestamp: 20250617T023108
   crb:
     '8.10':
       path: rocky/8.10/PowerTools/x86_64/os
@@ -36,13 +42,16 @@ appliances_pulp_repos:
     '9.5':
       path: rocky/9.5/CRB/x86_64/os
       timestamp: 20250514T014704
+    '9.6':
+      path: rocky/9.6/CRB/x86_64/os
+      timestamp: 20250726T040613
   epel:
     '8':
       path: epel/8/Everything/x86_64
       timestamp: 20250615T234151
     '9':
       path: epel/9/Everything/x86_64
-      timestamp: 20250615T000221
+      timestamp: 20250729T235750
   extras:
     '8.10':
       path: rocky/8.10/extras/x86_64/os
@@ -53,13 +62,16 @@ appliances_pulp_repos:
     '9.5':
       path: rocky/9.5/extras/x86_64/os
       timestamp: 20250506T032818
+    '9.6':
+      path: rocky/9.6/extras/x86_64/os
+      timestamp: 20250726T040613
   grafana:
     '8':
       path: grafana/oss/rpm
       timestamp: 20250615T005738
     '9':
       path: grafana/oss/rpm
-      timestamp: 20250615T005738
+      timestamp: 20250730T011314
   openhpc_base:
     '8':
       path: OpenHPC/2/EL_8