diff --git a/ansible/fatimage.yml b/ansible/fatimage.yml
index 1c72416ee..839c8dc4a 100644
--- a/ansible/fatimage.yml
+++ b/ansible/fatimage.yml
@@ -190,6 +190,11 @@
         tasks_from: install.yml
       when: "'alertmanager' in group_names"
 
+    - name: Download HPL source
+      include_role:
+        name: hpctests
+        tasks_from: source-hpl.yml
+
 - hosts: prometheus
   become: yes
   gather_facts: yes
diff --git a/ansible/roles/hpctests/tasks/build-hpl.yml b/ansible/roles/hpctests/tasks/build-hpl.yml
index 4fec6b75e..7f6d48b99 100644
--- a/ansible/roles/hpctests/tasks/build-hpl.yml
+++ b/ansible/roles/hpctests/tasks/build-hpl.yml
@@ -5,18 +5,21 @@
     path: "{{ hpctests_rootdir }}/hpl"
     state: directory
 
-- name: Download HPL sources
+- name: Unarchive HPL sources from /opt/hpl
   unarchive:
-    src: "http://www.netlib.org/benchmark/hpl/hpl-{{ hpctests_hpl_version }}.tar.gz"
-    remote_src: yes
+    src: "/opt/hpl/hpl-{{ hpctests_hpl_version }}.tar.gz"
     dest: "{{ hpctests_rootdir }}/hpl"
+    remote_src: yes
+    owner: "{{ hpctests_user }}"
+    group: "{{ hpctests_group }}"
+    mode: '0755'
     keep_newer: yes
 
-- name: Copy BLAS make file
-  command:
-    cmd: "cp setup/Make.Linux_PII_CBLAS Make.{{ hpctests_hpl_arch }}"
-    chdir: "{{ hpctests_hpl_srcdir }}"
-    creates: "{{ hpctests_hpl_srcdir }}/Make.{{ hpctests_hpl_arch }}"
+- name: Copy BLAS makefile
+  copy:
+    src: "{{ hpctests_hpl_srcdir }}/setup/Make.Linux_PII_CBLAS"
+    dest: "{{ hpctests_hpl_srcdir }}/Make.{{ hpctests_hpl_arch }}"
+    remote_src: yes
 
 - name: Modify make file
   replace:
diff --git a/ansible/roles/hpctests/tasks/source-hpl.yml b/ansible/roles/hpctests/tasks/source-hpl.yml
new file mode 100644
index 000000000..43585d3e6
--- /dev/null
+++ b/ansible/roles/hpctests/tasks/source-hpl.yml
@@ -0,0 +1,17 @@
+---
+
+- name: Make directory
+  file:
+    path: "/opt/hpl"
+    state: directory
+    owner: root
+    group: root
+    mode: '0755'
+
+- name: Download HPL tarball
+  get_url:
+    url: "http://www.netlib.org/benchmark/hpl/hpl-{{ hpctests_hpl_version }}.tar.gz"
+    dest: "/opt/hpl/hpl-{{ hpctests_hpl_version }}.tar.gz"
+    owner: root
+    group: root
+    mode: '0644'
diff --git a/docs/experimental/isolated-clusters.md b/docs/experimental/isolated-clusters.md
index 304b625d2..a570465ea 100644
--- a/docs/experimental/isolated-clusters.md
+++ b/docs/experimental/isolated-clusters.md
@@ -12,14 +12,7 @@ created by cookiecutter for a new environment.
 The full list of features and whether they are functional on such an "isolated"
 network is shown in the table below. Note that:
 
-1. The `hpl` test from the `ansible/adhoc/hpctests.yml` playbook is not
-   functional and must be skipped using:
-
-    ```shell
-    ansible-playbook ansible/adhoc/hpctests.yml --skip-tags hpl-solo
-    ```
-
-2. Using [EESSI](https://www.eessi.io/docs/) necessarily requires outbound
+-  Using [EESSI](https://www.eessi.io/docs/) necessarily requires outbound
    network access for the CernVM File System. However this can be provided
    via an authenticated proxy. While the proxy configuration on the cluster node
    is readable by all users, this proxy could be limited via acls to only provide
@@ -51,7 +44,7 @@ See above for definition of "Default" features. In the "Isolated?" column:
 | freeipa_client        | - | Y - image build required |
 | gateway               | n/a | n/a - build only | 
 | grafana               | Y | Y | 
-| hpctests              | Y | Y  - except hpl-solo, see above | 
+| hpctests              | Y | Y | 
 | k3s_agent             | - | ? | 
 | k3s_server            | - | ? | 
 | k9s                   | - | ? | 
diff --git a/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json b/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json
index 36533455d..0486c41d7 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-250804-1050-baf92bc5",
-        "RL9": "openhpc-RL9-250804-1050-baf92bc5"
+        "RL8": "openhpc-RL8-250805-1048-59517120",
+        "RL9": "openhpc-RL9-250805-1050-59517120"
     }
 }