diff --git a/deployment/ceph-ansible/ceph-base.yaml b/deployment/ceph-ansible/ceph-base.yaml
index 7f7df294db..db1b77e5e5 100644
--- a/deployment/ceph-ansible/ceph-base.yaml
+++ b/deployment/ceph-ansible/ceph-base.yaml
@@ -719,6 +719,10 @@ outputs:
                     data: {get_param: CephAnsibleEnvironmentVariables}
                     expression: $.data.items().select($.join('='))
                 ceph_ansible_skip_tags: {get_param:  CephAnsibleSkipTags}
+            - name: Refresh ceph-ansible group_vars variables
+              include_role:
+                name: tripleo_ceph_work_dir
+                tasks_from: prepare
             - name: get ssh private key
               include_role:
                 name: tripleo-ceph-work-dir
diff --git a/deployment/ceph-ansible/ceph-rgw.yaml b/deployment/ceph-ansible/ceph-rgw.yaml
index b49748fb8f..49b081a3fa 100644
--- a/deployment/ceph-ansible/ceph-rgw.yaml
+++ b/deployment/ceph-ansible/ceph-rgw.yaml
@@ -147,10 +147,6 @@ outputs:
                       - radosgw_frontend_ssl_certificate: '/etc/pki/tls/certs/ceph_rgw.pem'
                     - {get_attr: [CephRgwAnsibleVars, value, vars]}
                   ceph_rgw_config_overrides: {get_attr: [CephRgwConfigOverrides, value, vars]}
-              - name: create ceph-ansible working directory
-                include_role:
-                  name: tripleo-ceph-work-dir
-                  tasks_from: prepare
               - name: generate ceph-ansible group vars rgws
                 copy:
                   dest: "{{playbook_dir}}/ceph-ansible/group_vars/rgws.yml"