diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index 63fc13a989..99386df044 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -819,6 +819,6 @@ use_common_mariadb_user: "no"
 ############
 enable_prometheus_haproxy_exporter: "{{ enable_haproxy | bool }}"
 enable_prometheus_mysqld_exporter: "{{ enable_mariadb | bool }}"
-enable_prometheus_node_exporter: "yes"
+enable_prometheus_node_exporter: "{{ enable_prometheus | bool }}"
 enable_prometheus_memcached_exporter: "{{ enable_memcached | bool }}"
-enable_prometheus_cadvisor: "yes"
+enable_prometheus_cadvisor: "{{ enable_prometheus | bool }}"
diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml
index 0b296d8e12..7ac8428700 100644
--- a/etc/kolla/globals.yml
+++ b/etc/kolla/globals.yml
@@ -457,5 +457,5 @@ tempest_floating_network_name:
 ############
 #enable_prometheus_haproxy_exporter: "{{ enable_haproxy | bool }}"
 #enable_prometheus_mysqld_exporter: "{{ enable_mariadb | bool }}"
-#enable_prometheus_node_exporter: "yes"
-#enable_prometheus_cadvisor: "yes"
+#enable_prometheus_node_exporter: "{{ enable_prometheus | bool }}"
+#enable_prometheus_cadvisor: "{{ enable_prometheus | bool }}"