diff --git a/group_vars/ceph-fetch-keys.sample b/group_vars/ceph-fetch-keys.sample
index ceb397202..dabde1f95 100644
--- a/group_vars/ceph-fetch-keys.sample
+++ b/group_vars/ceph-fetch-keys.sample
@@ -9,4 +9,5 @@ dummy:
 
 
 #fetch_directory: fetch/
+#cluster: ceph
 
diff --git a/roles/ceph-fetch-keys/defaults/main.yml b/roles/ceph-fetch-keys/defaults/main.yml
index aae9a5351..c69b2b795 100644
--- a/roles/ceph-fetch-keys/defaults/main.yml
+++ b/roles/ceph-fetch-keys/defaults/main.yml
@@ -1,3 +1,4 @@
 ---
 
 fetch_directory: fetch/
+cluster: ceph
diff --git a/roles/ceph-fetch-keys/tasks/main.yml b/roles/ceph-fetch-keys/tasks/main.yml
index c6da11e72..2fb02ded7 100644
--- a/roles/ceph-fetch-keys/tasks/main.yml
+++ b/roles/ceph-fetch-keys/tasks/main.yml
@@ -21,6 +21,6 @@
   run_once: true
   with_items:
     - "{{ ceph_keys.stdout_lines }}"
-    - /var/lib/ceph/bootstrap-osd/ceph.keyring
-    - /var/lib/ceph/bootstrap-rgw/ceph.keyring
-    - /var/lib/ceph/bootstrap-mds/ceph.keyring
+    - "/var/lib/ceph/bootstrap-osd/{{ cluster }}.keyring"
+    - "/var/lib/ceph/bootstrap-rgw/{{ cluster }}.keyring"
+    - "/var/lib/ceph/bootstrap-mds/{{ cluster }}.keyring"