diff --git a/src/reactive/gnocchi_handlers.py b/src/reactive/gnocchi_handlers.py
index 8539c80..7289ed7 100644
--- a/src/reactive/gnocchi_handlers.py
+++ b/src/reactive/gnocchi_handlers.py
@@ -74,8 +74,10 @@ def storage_ceph_connected(ceph):
 
 @reactive.when('storage-ceph.available')
 def configure_ceph(ceph):
-    ceph_helper.create_keyring(hookenv.service_name(),
-                               ceph.key())
+    ceph_helper.ensure_ceph_keyring(service=hookenv.service_name(),
+                                    key=ceph.key(),
+                                    user='gnocchi',
+                                    group='gnocchi')
 
 
 @reactive.when_not('storage-ceph.connected')
diff --git a/unit_tests/test_gnocchi_handlers.py b/unit_tests/test_gnocchi_handlers.py
index 566adaf..4d496ad 100644
--- a/unit_tests/test_gnocchi_handlers.py
+++ b/unit_tests/test_gnocchi_handlers.py
@@ -109,9 +109,11 @@ class TestHandlers(test_utils.PatchHelper):
         mock_ceph.key.return_value = 'testkey'
         mock_hookenv.service_name.return_value = 'gnocchi'
         handlers.configure_ceph(mock_ceph)
-        mock_ceph_helper.create_keyring.assert_called_once_with(
-            'gnocchi',
-            'testkey',
+        mock_ceph_helper.ensure_ceph_keyring.assert_called_once_with(
+            service='gnocchi',
+            key='testkey',
+            user='gnocchi',
+            group='gnocchi'
         )
         mock_ceph.key.assert_called_once_with()