diff --git a/tripleo_ansible/roles/tripleo_ceph_client/defaults/main.yml b/tripleo_ansible/roles/tripleo_ceph_client/defaults/main.yml
index b1911f11e..6a3a68cd6 100644
--- a/tripleo_ansible/roles/tripleo_ceph_client/defaults/main.yml
+++ b/tripleo_ansible/roles/tripleo_ceph_client/defaults/main.yml
@@ -22,10 +22,10 @@ tripleo_ceph_client_debug: "{{ (ansible_verbosity | int) >= 2 | bool }}"
 tripleo_ceph_client_hide_sensitive_logs: true
 tripleo_ceph_client_config_home: "/etc/ceph"
 tripleo_ceph_client_fetch_dir: "{{ playbook_dir }}/ceph_client_fetch_dir"
-tripleo_ceph_client_cluster: "ceph"
-tripleo_ceph_client_fsid: ''
+tripleo_ceph_client_cluster: "{{ tripleo_ceph_cluster_name | default('ceph', true) }}"
+tripleo_ceph_client_fsid: "{{ tripleo_ceph_cluster_fsid | default('', true) }}"
 tripleo_ceph_client_mon_ips: []
-tripleo_ceph_client_keys: []
+tripleo_ceph_client_keys: "{{ tripleo_ceph_cluster_keys | default([], true) }}"
 tripleo_ceph_client_config_overrides: {}
 tripleo_ceph_client_rbd_admin_socket_path: '/var/run/ceph'
 tripleo_ceph_client_rbd_log_path: '/var/log/ceph'
diff --git a/tripleo_ansible/roles/tripleo_ceph_client/tasks/multiple_external_ceph_clusters.yml b/tripleo_ansible/roles/tripleo_ceph_client/tasks/multiple_external_ceph_clusters.yml
index 30f2b061a..21c198e8c 100644
--- a/tripleo_ansible/roles/tripleo_ceph_client/tasks/multiple_external_ceph_clusters.yml
+++ b/tripleo_ansible/roles/tripleo_ceph_client/tasks/multiple_external_ceph_clusters.yml
@@ -19,9 +19,9 @@
     - name: Prepare ceph config variables
       set_fact:
         external_cluster_mon_ips: "{{ multiple.external_cluster_mon_ips }}"
-        tripleo_ceph_client_fsid: "{{ multiple.fsid }}"
+        tripleo_ceph_client_fsid: "{{ multiple.fsid | default(multiple.tripleo_ceph_cluster_fsid, true) }}"
         tripleo_ceph_client_cluster_network: ''
         tripleo_ceph_client_mon_ips: []
-        tripleo_ceph_client_cluster: "{{ multiple.cluster }}"
+        tripleo_ceph_client_cluster: "{{ multiple.cluster | default(multiple.tripleo_ceph_cluster_name, true) }}"
         tripleo_ceph_client_keys: "{{ multiple.get('keys',[]) }}"
         tripleo_ceph_client_config_overrides: "{{ multiple.get('ceph_conf_overrides',{}) }}"