diff --git a/barbican/values.yaml b/barbican/values.yaml
index 17be7fe065..d88b35a1bc 100644
--- a/barbican/values.yaml
+++ b/barbican/values.yaml
@@ -450,9 +450,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 ac549b5ddf..8d74fb9145 100644
--- a/ceilometer/values.yaml
+++ b/ceilometer/values.yaml
@@ -1749,9 +1749,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 e9b4d980c8..9e07e76d36 100644
--- a/cinder/values.yaml
+++ b/cinder/values.yaml
@@ -738,9 +738,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 c2d54ddaa1..aeb110f99d 100644
--- a/congress/values.yaml
+++ b/congress/values.yaml
@@ -206,9 +206,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 1b447823d3..81c0a5fdaf 100644
--- a/glance/values.yaml
+++ b/glance/values.yaml
@@ -478,9 +478,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 19ea413973..8ecf0a853e 100644
--- a/heat/values.yaml
+++ b/heat/values.yaml
@@ -464,9 +464,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 a7b064f921..804918cda0 100644
--- a/keystone/values.yaml
+++ b/keystone/values.yaml
@@ -569,9 +569,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 09749ad812..78b66f2ba4 100644
--- a/magnum/values.yaml
+++ b/magnum/values.yaml
@@ -266,9 +266,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 dc1fc525bc..6486ace9e8 100644
--- a/mistral/values.yaml
+++ b/mistral/values.yaml
@@ -205,9 +205,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 88bb775d2a..78e0f54121 100644
--- a/neutron/values.yaml
+++ b/neutron/values.yaml
@@ -1089,9 +1089,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 5b7ae7edbe..1e6f65d0a9 100644
--- a/nova/values.yaml
+++ b/nova/values.yaml
@@ -1119,9 +1119,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 f1afe36775..6c61d008d1 100644
--- a/senlin/values.yaml
+++ b/senlin/values.yaml
@@ -278,9 +278,6 @@ endpoints:
         default: 11211
   oslo_messaging:
     auth:
-      admin:
-        username: admin
-        password: password
       user:
         username: rabbitmq
         password: password