diff --git a/ansible/inventory/group_vars/all/grafana b/ansible/inventory/group_vars/all/grafana
index 6e92d0875d15cc8bd74cd93d9eed9b8a65160039..9a2e73b52d32d86fc96caa0763c2c1370860c68e 100644
--- a/ansible/inventory/group_vars/all/grafana
+++ b/ansible/inventory/group_vars/all/grafana
@@ -2,8 +2,7 @@
 ###############################################################################
 # Grafana configuration.
 
-# Grafana local admin user name. If you are deploying Monasca Grafana this
-# should not conflict with an OpenStack user name.
+# Grafana local admin user name.
 grafana_local_admin_user_name: "grafana_local_admin"
 
 ###############################################################################
diff --git a/ansible/roles/kolla-ansible/templates/overcloud-components.j2 b/ansible/roles/kolla-ansible/templates/overcloud-components.j2
index 41b5db0c877c80bb435ed287f8bb52d1d7e1bdaa..9fca0ed71caf631a2fa1a6a0a35bc8f595df9e40 100644
--- a/ansible/roles/kolla-ansible/templates/overcloud-components.j2
+++ b/ansible/roles/kolla-ansible/templates/overcloud-components.j2
@@ -40,9 +40,6 @@ monitoring
 [prometheus:children]
 monitoring
 
-[kafka:children]
-control
-
 [telegraf:children]
 compute
 control
@@ -68,19 +65,6 @@ control
 [outward-rabbitmq:children]
 control
 
-[monasca-agent:children]
-compute
-control
-monitoring
-network
-storage
-
-[monasca:children]
-monitoring
-
-[storm:children]
-monitoring
-
 [keystone:children]
 control
 
@@ -183,9 +167,6 @@ control
 [bifrost:children]
 deployment
 
-[zookeeper:children]
-control
-
 [zun:children]
 control
 
diff --git a/ansible/roles/kolla-ansible/templates/overcloud-services.j2 b/ansible/roles/kolla-ansible/templates/overcloud-services.j2
index 19b9f582fdfb414ef537b97edbfe4400ed0337d6..bef54bb09f1e247e16dbaf01faa5a549f882505f 100644
--- a/ansible/roles/kolla-ansible/templates/overcloud-services.j2
+++ b/ansible/roles/kolla-ansible/templates/overcloud-services.j2
@@ -206,41 +206,6 @@ murano
 [murano-engine:children]
 murano
 
-# Monasca
-[monasca-agent-collector:children]
-monasca-agent
-
-[monasca-agent-forwarder:children]
-monasca-agent
-
-[monasca-agent-statsd:children]
-monasca-agent
-
-[monasca-api:children]
-monasca
-
-[monasca-log-persister:children]
-monasca
-
-[monasca-log-metrics:children]
-monasca
-
-[monasca-thresh:children]
-monasca
-
-[monasca-notification:children]
-monasca
-
-[monasca-persister:children]
-monasca
-
-# Storm
-[storm-worker:children]
-storm
-
-[storm-nimbus:children]
-storm
-
 # Ironic
 [ironic-api:children]
 ironic
diff --git a/etc/kayobe/grafana.yml b/etc/kayobe/grafana.yml
index d67a972e3fc61e4c78f982e3271fbb3a0f0978e8..66d19c7a362f6abe56aab580757ab96875039283 100644
--- a/etc/kayobe/grafana.yml
+++ b/etc/kayobe/grafana.yml
@@ -2,8 +2,7 @@
 ###############################################################################
 # Grafana configuration.
 
-# Grafana local admin user name. If you are deploying Monasca Grafana this
-# should not conflict with an OpenStack user name.
+# Grafana local admin user name.
 #grafana_local_admin_user_name:
 
 ###############################################################################