diff --git a/tripleo_ansible/roles/tripleo-ceph-run-ansible/tasks/create_ceph_ansible_remote_tmp.yml b/tripleo_ansible/roles/tripleo-ceph-run-ansible/tasks/create_ceph_ansible_remote_tmp.yml
index 92d011722..23bfbd280 100644
--- a/tripleo_ansible/roles/tripleo-ceph-run-ansible/tasks/create_ceph_ansible_remote_tmp.yml
+++ b/tripleo_ansible/roles/tripleo-ceph-run-ansible/tasks/create_ceph_ansible_remote_tmp.yml
@@ -34,8 +34,8 @@
             become: true
             file:
               path: "{{ ceph_ansible_remote_tmp }}"
-              owner: "{{ ansible_user | default('tripleo-admin', true) }}"
-              group: "{{ ansible_user | default('tripleo-admin', true) }}"
+              owner: "{{ lookup('env','ANSIBLE_REMOTE_USER') | default(ansible_user, true) }}"
+              group: "{{ lookup('env','ANSIBLE_REMOTE_USER') | default(ansible_user, true) }}"
               mode: "700"
               state: directory