diff --git a/keystone/Chart.yaml b/keystone/Chart.yaml
index 83e7f295f3..72c0d936e1 100644
--- a/keystone/Chart.yaml
+++ b/keystone/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Keystone
 name: keystone
-version: 0.1.6
+version: 0.1.7
 home: https://docs.openstack.org/keystone/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Keystone/OpenStack_Project_Keystone_vertical.png
 sources:
diff --git a/keystone/values.yaml b/keystone/values.yaml
index 66ca5fcd86..2d4327ed73 100644
--- a/keystone/values.yaml
+++ b/keystone/values.yaml
@@ -100,13 +100,16 @@ dependencies:
         services:
           - endpoint: node
             service: local_image_registry
+    rabbit_init:
+      services:
+        - service: oslo_messaging
+          endpoint: internal
   static:
     api:
       jobs:
         - keystone-db-sync
         - keystone-credential-setup
         - keystone-fernet-setup
-        - keystone-rabbit-init
       services:
         - endpoint: internal
           service: oslo_cache
@@ -142,10 +145,6 @@ dependencies:
       services:
         - endpoint: internal
           service: oslo_db
-    rabbit_init:
-      services:
-        - service: oslo_messaging
-          endpoint: internal
     domain_manage:
       services:
         - endpoint: internal
diff --git a/releasenotes/notes/keystone.yaml b/releasenotes/notes/keystone.yaml
index 608b691429..17c4332c17 100644
--- a/releasenotes/notes/keystone.yaml
+++ b/releasenotes/notes/keystone.yaml
@@ -7,3 +7,4 @@ keystone:
   - 0.1.4 UPDATE
   - 0.1.5 Revert clusterissuer change
   - 0.1.6 Fix typo in subPath entry
+  - 0.1.7 Move rabbit-init to dynamic dependency