diff --git a/barbican/values.yaml b/barbican/values.yaml
index 136ee17d..45adc8a4 100644
--- a/barbican/values.yaml
+++ b/barbican/values.yaml
@@ -447,9 +447,6 @@ endpoints:
         default: 3306
   oslo_messaging:
     auth:
-      admin:
-        username: admin
-        password: password
       user:
         username: rabbitmq
         password: password
diff --git a/ceilometer/values.yaml b/ceilometer/values.yaml
index ae536586..f8a555a5 100644
--- a/ceilometer/values.yaml
+++ b/ceilometer/values.yaml
@@ -1746,9 +1746,6 @@ endpoints:
         default: 11211
   oslo_messaging:
     auth:
-      admin:
-        username: admin
-        password: password
       user:
         username: rabbitmq
         password: password
diff --git a/cinder/values.yaml b/cinder/values.yaml
index b9edd820..3f18ab0c 100644
--- a/cinder/values.yaml
+++ b/cinder/values.yaml
@@ -735,9 +735,6 @@ endpoints:
         default: 3306
   oslo_messaging:
     auth:
-      admin:
-        username: admin
-        password: password
       user:
         username: rabbitmq
         password: password
diff --git a/congress/values.yaml b/congress/values.yaml
index cb5254fc..280bc4ac 100644
--- a/congress/values.yaml
+++ b/congress/values.yaml
@@ -204,9 +204,6 @@ endpoints:
         default: 11211
   oslo_messaging:
     auth:
-      admin:
-        username: admin
-        password: password
       user:
         username: rabbitmq
         password: password
diff --git a/glance/values.yaml b/glance/values.yaml
index 319ddc26..ed5d7d18 100644
--- a/glance/values.yaml
+++ b/glance/values.yaml
@@ -472,9 +472,6 @@ endpoints:
         default: 11211
   oslo_messaging:
     auth:
-      admin:
-        username: admin
-        password: password
       user:
         username: rabbitmq
         password: password
diff --git a/heat/values.yaml b/heat/values.yaml
index b0e9c327..116c8c11 100644
--- a/heat/values.yaml
+++ b/heat/values.yaml
@@ -455,9 +455,6 @@ endpoints:
         default: 11211
   oslo_messaging:
     auth:
-      admin:
-        username: admin
-        password: password
       user:
         username: rabbitmq
         password: password
diff --git a/keystone/values.yaml b/keystone/values.yaml
index f1c0ed09..c1cbae4e 100644
--- a/keystone/values.yaml
+++ b/keystone/values.yaml
@@ -566,9 +566,6 @@ endpoints:
   oslo_messaging:
     namespace: null
     auth:
-      admin:
-        username: admin
-        password: password
       user:
         username: keystone
         password: password
diff --git a/magnum/values.yaml b/magnum/values.yaml
index 238b8ab1..ec4c222a 100644
--- a/magnum/values.yaml
+++ b/magnum/values.yaml
@@ -263,9 +263,6 @@ endpoints:
         default: 11211
   oslo_messaging:
     auth:
-      admin:
-        username: admin
-        password: password
       user:
         username: rabbitmq
         password: password
diff --git a/mistral/values.yaml b/mistral/values.yaml
index aa76fa9e..a61e73d1 100644
--- a/mistral/values.yaml
+++ b/mistral/values.yaml
@@ -202,9 +202,6 @@ endpoints:
         default: 3306
   oslo_messaging:
     auth:
-      admin:
-        username: admin
-        password: password
       user:
         username: rabbitmq
         password: password
diff --git a/neutron/values.yaml b/neutron/values.yaml
index 24b517d7..4f4d88ed 100644
--- a/neutron/values.yaml
+++ b/neutron/values.yaml
@@ -1086,9 +1086,6 @@ endpoints:
          default: 3306
   oslo_messaging:
      auth:
-       admin:
-         username: admin
-         password: password
        user:
          username: rabbitmq
          password: password
diff --git a/nova/values.yaml b/nova/values.yaml
index f754b4a6..1ca5b56e 100644
--- a/nova/values.yaml
+++ b/nova/values.yaml
@@ -1110,9 +1110,6 @@ endpoints:
         default: 3306
   oslo_messaging:
     auth:
-      admin:
-        username: admin
-        password: password
       user:
         username: rabbitmq
         password: password
diff --git a/senlin/values.yaml b/senlin/values.yaml
index 1ffc0abe..db816009 100644
--- a/senlin/values.yaml
+++ b/senlin/values.yaml
@@ -275,9 +275,6 @@ endpoints:
         default: 11211
   oslo_messaging:
     auth:
-      admin:
-        username: admin
-        password: password
       user:
         username: rabbitmq
         password: password