diff --git a/manifests/profile/base/gnocchi/metricd.pp b/manifests/profile/base/gnocchi/metricd.pp
index 4d7eb891e..e69bbd5a3 100644
--- a/manifests/profile/base/gnocchi/metricd.pp
+++ b/manifests/profile/base/gnocchi/metricd.pp
@@ -28,7 +28,9 @@ class tripleo::profile::base::gnocchi::metricd (
 ) {
   include ::tripleo::profile::base::gnocchi
 
-  if $step >= 4 {
+  if $step >= 5 {
     include ::gnocchi::metricd
+    Keystone_endpoint<||> -> Service['gnocchi-metricd']
+    Keystone_user_role<||> -> Service['gnocchi-metricd']
   }
 }
diff --git a/manifests/profile/base/gnocchi/statsd.pp b/manifests/profile/base/gnocchi/statsd.pp
index 775b0437a..1fe406745 100644
--- a/manifests/profile/base/gnocchi/statsd.pp
+++ b/manifests/profile/base/gnocchi/statsd.pp
@@ -28,7 +28,9 @@ class tripleo::profile::base::gnocchi::statsd (
 ) {
   include ::tripleo::profile::base::gnocchi
 
-  if $step >= 4 {
+  if $step >= 5 {
     include ::gnocchi::statsd
+    Keystone_endpoint<||> -> Service['gnocchi-statsd']
+    Keystone_user_role<||> -> Service['gnocchi-statsd']
   }
 }