diff --git a/README.rst b/README.rst
index 49c0a6f..0b69c9f 100644
--- a/README.rst
+++ b/README.rst
@@ -33,9 +33,9 @@
           mon:
             mon debug dump transactions: false
         keyring:
-        - name: cinder
+        cinder:
           key: 00000000000000000000000000000000000000==
-        - name: glance
+        glance:
           key: 00000000000000000000000000000000000000==
 
 Monitors: A Ceph Monitor maintains maps of the cluster state, including the monitor map, the OSD map, the Placement Group (PG) map, and the CRUSH map. Ceph maintains a history (called an “epoch”) of each state change in the Ceph Monitors, Ceph OSD Daemons, and PGs.
@@ -60,9 +60,9 @@
           mon:
             mon debug dump transactions: false
         keyring:
-        - name: cinder
+        cinder:
           key: 00000000000000000000000000000000000000==
-        - name: glance
+        glance:
           key: 00000000000000000000000000000000000000==
 
 Client pillar - ussually located at cinder-volume or glance-registry.
@@ -87,9 +87,9 @@
           mon:
             mon debug dump transactions: false
         keyring:
-        - name: cinder
+        cinder:
           key: 00000000000000000000000000000000000000==
-        - name: glance
+        glance:
           key: 00000000000000000000000000000000000000==
 
 Read more
diff --git a/ceph/client.sls b/ceph/client.sls
index 73a228a..ff0d874 100644
--- a/ceph/client.sls
+++ b/ceph/client.sls
@@ -10,6 +10,7 @@
 
 {%- endfor %}
 
+{#
 {%- load_yaml as config %}
 {{ client.config|yaml }}
 {%- for keyring_name, keyring in client.keyring.iteritems() %}
@@ -17,6 +18,12 @@
   keyring: /etc/ceph/ceph.client.{{ keyring_name }}.keyring
 {%- endfor %}
 {%- endload %}
+#}
+
+{%- set config = client.config %}
+{%- for keyring_name, keyring in client.keyring.iteritems() %}
+{%- set _dummy = config.update({'client.'+keyring_name:'etc/ceph/ceph.client.'+keyring_name+'.keyring'}) %}
+{%- endfor %}
 
 /etc/ceph/ceph.conf:
   ini.options_present: