diff --git a/roles/compute-diag/tasks/main.yml b/roles/compute-diag/tasks/main.yml
index 050c7c5..d6290b9 100644
--- a/roles/compute-diag/tasks/main.yml
+++ b/roles/compute-diag/tasks/main.yml
@@ -1,12 +1,13 @@
 ---
 # compute-diag/tasks/main.yml
-
-- name: Create diag_dir subdirs
+#
+- name: Create diag_dir subdir
   file:
-    dest="{{ diag_dir }}/{{ inventory_hostname }}"
+    dest="/tmp/{{ hostvars[groups['head'][0]]['diag_dir'] }}/{{ inventory_hostname }}"
+    state=directory
 
 - name: Compute node diag collection
-  shell: "{{ item }} > {{ diag_dir }}/{{ inventory_hostname}}/{{ item | regex_replace('[^\\w-]', '_')}}"
+  shell: "{{ item }} > /tmp/{{ hostvars[groups['head'][0]]['diag_dir'] }}/{{ inventory_hostname }}/{{ item | regex_replace('[^\\w-]', '_')}}"
   with_items:
    - "arp -n"
    - "brctl show"