diff --git a/ansible/cleanup.yml b/ansible/cleanup.yml
index c428e9072..fc3391a23 100644
--- a/ansible/cleanup.yml
+++ b/ansible/cleanup.yml
@@ -23,9 +23,14 @@
     path: /etc/NetworkManager/conf.d/99-cloud-init.conf
     state: absent
 
+- name: Get remote environment for ansible_user
+  setup:
+    gather_subset: env
+  become: no
+
 - name: Delete any injected ssh config for ansible_user
   file:
-    path: "/home/{{ ansible_user }}/.ssh/"
+    path: "{{ ansible_env.HOME }}/.ssh/"
     state: absent
 
 - name: Run cloud-init cleanup
diff --git a/environments/.stackhpc/terraform/main.tf b/environments/.stackhpc/terraform/main.tf
index 46709463f..537638d5e 100644
--- a/environments/.stackhpc/terraform/main.tf
+++ b/environments/.stackhpc/terraform/main.tf
@@ -28,9 +28,9 @@ variable "cluster_image" {
     description = "single image for all cluster nodes, keyed by os_version - a convenience for CI"
     type = map(string)
     default = {
-        # https://github.com/stackhpc/ansible-slurm-appliance/pull/353
-        RL8: "openhpc-RL8-240313-1028-15f9ab38"
-        RL9: "openhpc-RL9-240313-1057-15f9ab38"
+        # https://github.com/stackhpc/ansible-slurm-appliance/pull/382
+        RL8: "openhpc-RL8-240327-1050-4812f852"
+        RL9: "openhpc-RL9-240327-1026-4812f852"
     }
 }