diff --git a/src/com/mirantis/mk/Orchestrate.groovy b/src/com/mirantis/mk/Orchestrate.groovy
index bd5124e..7ff5e4a 100644
--- a/src/com/mirantis/mk/Orchestrate.groovy
+++ b/src/com/mirantis/mk/Orchestrate.groovy
@@ -726,6 +726,8 @@
     if (salt.testTarget(master, 'I@ceph:radosgw')) {
         salt.runSaltProcessStep(master, 'I@ceph:radosgw', 'saltutil.sync_grains', [], null, true)
         salt.enforceState(master, 'I@ceph:radosgw', 'ceph.radosgw', true)
+        // setup Keystone service and endpoints for swift or / and S3
+        salt.enforceState(master, 'I@keystone:client', 'keystone.client', true)
     }
 }