diff --git a/.github/workflows/extra.yml b/.github/workflows/extra.yml
index 1941064a2..b8531c1b1 100644
--- a/.github/workflows/extra.yml
+++ b/.github/workflows/extra.yml
@@ -25,7 +25,7 @@ jobs:
         build:
           - image_name: openhpc-extra-RL8
             source_image_name_key: RL8 # key into environments/.stackhpc/tofu/cluster_image.auto.tfvars.json
-            inventory_groups: doca,cuda,lustre
+            inventory_groups: doca,cuda # lustre disabled due to https://github.com/stackhpc/ansible-slurm-appliance/pull/759 
             volume_size: 35 # needed for cuda
           - image_name: openhpc-extra-RL9
             source_image_name_key: RL9
diff --git a/.github/workflows/fatimage.yml b/.github/workflows/fatimage.yml
index 407bd440b..d9884ca6f 100644
--- a/.github/workflows/fatimage.yml
+++ b/.github/workflows/fatimage.yml
@@ -54,6 +54,7 @@ jobs:
       - name: Record settings for CI cloud
         run: |
           echo CI_CLOUD: ${{ env.CI_CLOUD }}
+          echo cleanup_on_failure: ${{ github.event.inputs.cleanup_on_failure  }}
 
       - name: Setup ssh
         run: |
@@ -91,7 +92,7 @@ jobs:
           packer init .
 
           PACKER_LOG=1 packer build \
-          -on-error=${{ github.event.inputs.cleanup_on_failure && 'cleanup' || 'abort' }} \
+          -on-error=${{ github.event.inputs.cleanup_on_failure == 'true' && 'cleanup' || 'abort' }} \
           -var-file="$PKR_VAR_environment_root/${{ env.CI_CLOUD }}.pkrvars.hcl" \
           -var "source_image_name=${{ matrix.build.source_image_name }}" \
           -var "image_name=${{ matrix.build.image_name }}" \
diff --git a/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json b/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json
index 2000b5e6d..b0d102224 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-250918-0840-930223fb",
-    "RL9": "openhpc-RL9-250918-0840-930223fb"
+    "RL8": "openhpc-RL8-250923-1321-5fcc36b0",
+    "RL9": "openhpc-RL9-250923-1321-5fcc36b0"
   }
 }
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 c80a85aa3..ef2e2d4c7 100644
--- a/environments/common/inventory/group_vars/all/dnf_repo_timestamps.yml
+++ b/environments/common/inventory/group_vars/all/dnf_repo_timestamps.yml
@@ -29,7 +29,7 @@ dnf_repos_default:
   appstream:
     '8.10':
       pulp_path: rocky/8.10/AppStream/x86_64/os
-      pulp_timestamp: 20250614T013846
+      pulp_timestamp: 20250923T022841
       repo_file: Rocky-AppStream
     '9.4':
       pulp_path: rocky/9.4/AppStream/x86_64/os
@@ -41,12 +41,21 @@ dnf_repos_default:
       repo_file: rocky
     '9.6':
       pulp_path: rocky/9.6/AppStream/x86_64/os
-      pulp_timestamp: 20250902T060015
+      pulp_timestamp: 20250923T031638
+      repo_file: rocky
+  appstream-source:
+    '8.10':
+      pulp_path: rocky/8.10/AppStream/source/os
+      pulp_timestamp: 20250923T024945
+      repo_file: Rocky-Sources
+    '9.6':
+      pulp_path: rocky/9.6/AppStream/source/os
+      pulp_timestamp: 20250923T043546
       repo_file: rocky
   baseos:
     '8.10':
       pulp_path: rocky/8.10/BaseOS/x86_64/os
-      pulp_timestamp: 20250614T013846
+      pulp_timestamp: 20250918T034501
       repo_file: Rocky-BaseOS
     '9.4':
       pulp_path: rocky/9.4/BaseOS/x86_64/os
@@ -58,12 +67,21 @@ dnf_repos_default:
       repo_file: rocky
     '9.6':
       pulp_path: rocky/9.6/BaseOS/x86_64/os
-      pulp_timestamp: 20250902T094855
+      pulp_timestamp: 20250923T045903
+      repo_file: rocky
+  baseos-source:
+    '8.10':
+      pulp_path: rocky/8.10/BaseOS/source/os
+      pulp_timestamp: 20250918T040529
+      repo_file: Rocky-Sources
+    '9.6':
+      pulp_path: rocky/9.6/BaseOS/source/os
+      pulp_timestamp: 20250923T043546
       repo_file: rocky
   crb:
     '8.10':
       pulp_path: rocky/8.10/PowerTools/x86_64/os
-      pulp_timestamp: 20250614T013846
+      pulp_timestamp: 20250918T034501
       repo_file: Rocky-PowerTools
       repo_name: powertools
     '9.4':
@@ -76,16 +94,35 @@ dnf_repos_default:
       repo_file: rocky
     '9.6':
       pulp_path: rocky/9.6/CRB/x86_64/os
-      pulp_timestamp: 20250902T060015
+      pulp_timestamp: 20250923T031638
+      repo_file: rocky
+  crb-source:
+    '8.10':
+      pulp_path: rocky/8.10/PowerTools/source/tree
+      pulp_timestamp: 20250923T125600
+      repo_file: Rocky-Sources
+      repo_name: powertools-source
+    '9.6':
+      pulp_path: rocky/9.6/CRB/source/os
+      pulp_timestamp: 20250923T043546
       repo_file: rocky
   epel:
     '8':
       pulp_path: epel/8/Everything/x86_64
-      pulp_timestamp: 20250615T234151
+      pulp_timestamp: 20250923T001717
       repo_file: epel
     '9':
       pulp_path: epel/9/Everything/x86_64
-      pulp_timestamp: 20250908T001730
+      pulp_timestamp: 20250923T001717
+      repo_file: epel
+  epel-source:
+    '8':
+      pulp_path: epel/8/Everything/source
+      pulp_timestamp: 20250923T001717
+      repo_file: epel
+    '9':
+      pulp_path: epel/9/Everything/source
+      pulp_timestamp: 20250923T001717
       repo_file: epel
   extras:
     '8.10':
@@ -104,13 +141,22 @@ dnf_repos_default:
       pulp_path: rocky/9.6/extras/x86_64/os
       pulp_timestamp: 20250726T040613
       repo_file: rocky-extras
+  extras-source:
+    '8.10':
+      pulp_path: rocky/8.10/extras/source/os
+      pulp_timestamp: 20250828T161842
+      repo_file: Rocky-Sources
+    '9.6':
+      pulp_path: rocky/9.6/extras/source/os
+      pulp_timestamp: 20250828T161842
+      repo_file: rocky-extras
   grafana:
     '8':
       pulp_path: grafana/oss/rpm
-      pulp_timestamp: 20250730T011314
+      pulp_timestamp: 20250917T024714
       repo_file: grafana
       timestamp: 20250615T005738
     '9':
       pulp_path: grafana/oss/rpm
-      pulp_timestamp: 20250906T025340
+      pulp_timestamp: 20250917T024714
       repo_file: grafana