diff --git a/ansible/fatimage.yml b/ansible/fatimage.yml
index d811f53e8..e0aa81977 100644
--- a/ansible/fatimage.yml
+++ b/ansible/fatimage.yml
@@ -206,6 +206,7 @@
       ansible.builtin.include_role:
         name: hpctests
         tasks_from: source-hpl.yml
+      when: "'hpctests' in group_names"
 
 - hosts: prometheus
   become: true
diff --git a/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json b/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json
index 5c41f2aff..f6ee4ac1d 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-251014-1152-20aa2a49",
-    "RL9": "openhpc-RL9-251014-1152-20aa2a49"
+    "RL8": "openhpc-RL8-251021-1221-915ed3fc",
+    "RL9": "openhpc-RL9-251021-1221-915ed3fc"
   }
 }
diff --git a/environments/common/inventory/groups b/environments/common/inventory/groups
index c6f1bd2aa..92c6c849c 100644
--- a/environments/common/inventory/groups
+++ b/environments/common/inventory/groups
@@ -22,9 +22,8 @@ login
 control
 compute
 
-[hpctests:children]
+[hpctests]
 # Login group to use for running mpi-based testing.
-login
 
 [additional]
 # Additional nodes to include in "cluster" group
diff --git a/environments/site/inventory/groups b/environments/site/inventory/groups
index 9871cf9d8..09c54aa54 100644
--- a/environments/site/inventory/groups
+++ b/environments/site/inventory/groups
@@ -13,6 +13,11 @@ fatimage
 [nfs:children]
 openhpc
 
+[hpctests:children]
+# Login group to use for running mpi-based testing.
+login
+fatimage
+
 [mysql:children]
 control