diff --git a/ansible/oooq/baremetal-virt-undercloud-tripleo-browbeat.yml b/ansible/oooq/baremetal-virt-undercloud-tripleo-browbeat.yml
index d68ce6c25..04b2bcb59 100644
--- a/ansible/oooq/baremetal-virt-undercloud-tripleo-browbeat.yml
+++ b/ansible/oooq/baremetal-virt-undercloud-tripleo-browbeat.yml
@@ -60,5 +60,4 @@
 - name: Run Browbeat
   hosts: undercloud
   roles:
-    - browbeat/grafana-dashboard-setup
     - browbeat/browbeat-run
diff --git a/ansible/oooq/quickstart-browbeat.yml b/ansible/oooq/quickstart-browbeat.yml
index 2b9d6a1df..c6636ce7a 100644
--- a/ansible/oooq/quickstart-browbeat.yml
+++ b/ansible/oooq/quickstart-browbeat.yml
@@ -31,5 +31,4 @@
   roles:
     - browbeat/collectd
     - browbeat/bug-check
-    - browbeat/grafana-dashboard-setup
     - browbeat/browbeat-run
diff --git a/ansible/oooq/roles/template-configs/templates/browbeat-api-ci.yaml.j2 b/ansible/oooq/roles/template-configs/templates/browbeat-api-ci.yaml.j2
index a2899d1d6..44ef4478e 100644
--- a/ansible/oooq/roles/template-configs/templates/browbeat-api-ci.yaml.j2
+++ b/ansible/oooq/roles/template-configs/templates/browbeat-api-ci.yaml.j2
@@ -3,8 +3,8 @@ browbeat:
   rerun: 3
   cloud_name: {{ browbeat_cloud_name }}
 elasticsearch:
-  enabled: {{ elastic_enabled_template }}
-  host: {{ elastic_host_template }}
+  enabled: {{ elastic_enabled }}
+  host: {{ elastic_host }}
   port: 9200
   regather: true
   metadata_files:
@@ -27,11 +27,11 @@ ansible:
   grafana_snapshot: ansible/browbeat/snapshot-general-performance-dashboard.yml
   metadata: ansible/gather/site.yml
 connmon:
-  enabled: {{ connmon_enabled_template }}
+  enabled: {{ connmon_enabled }}
   sudo: true
 grafana:
-  enabled: {{ grafana_enabled_template }}
-  grafana_ip: {{ grafana_host_template }}
+  enabled: {{ grafana_enabled }}
+  grafana_ip: {{ grafana_host }}
   grafana_port: 3000
   dashboards:
     - openstack-general-system-performance
diff --git a/ansible/oooq/roles/template-configs/templates/browbeat-basic.yaml.j2 b/ansible/oooq/roles/template-configs/templates/browbeat-basic.yaml.j2
index 685922261..238c5e159 100644
--- a/ansible/oooq/roles/template-configs/templates/browbeat-basic.yaml.j2
+++ b/ansible/oooq/roles/template-configs/templates/browbeat-basic.yaml.j2
@@ -5,8 +5,8 @@ browbeat:
   rerun: 1
   cloud_name: {{ browbeat_cloud_name }}
 elasticsearch:
-  enabled: {{ elastic_enabled_template }}
-  host: {{ elastic_host_template }}
+  enabled: {{ elastic_enabled }}
+  host: {{ elastic_host }}
   port: 9200
   regather: true
   metadata_files:
@@ -29,11 +29,11 @@ ansible:
   grafana_snapshot: ansible/browbeat/snapshot-general-performance-dashboard.yml
   metadata: ansible/gather/site.yml
 connmon:
-  enabled: {{ connmon_enabled_template }}
+  enabled: {{ connmon_enabled }}
   sudo: true
 grafana:
-  enabled: {{ grafana_enabled_template }}
-  grafana_ip: {{ grafana_host_template }}
+  enabled: {{ grafana_enabled }}
+  grafana_ip: {{ grafana_host }}
   grafana_port: 3000
   dashboards:
     - openstack-general-system-performance
diff --git a/ansible/oooq/roles/template-configs/templates/browbeat-yoda-scale.yaml.j2 b/ansible/oooq/roles/template-configs/templates/browbeat-yoda-scale.yaml.j2
index a0e53ccd4..2053db111 100644
--- a/ansible/oooq/roles/template-configs/templates/browbeat-yoda-scale.yaml.j2
+++ b/ansible/oooq/roles/template-configs/templates/browbeat-yoda-scale.yaml.j2
@@ -5,8 +5,8 @@ browbeat:
   rerun: 1
   cloud_name: {{ browbeat_cloud_name }}
 elasticsearch:
-  enabled: {{ elastic_enabled_template }}
-  host: {{ elastic_host_template }}
+  enabled: {{ elastic_enabled }}
+  host: {{ elastic_host }}
   port: 9200
   regather: true
   metadata_files:
@@ -29,11 +29,11 @@ ansible:
   grafana_snapshot: ansible/browbeat/snapshot-general-performance-dashboard.yml
   metadata: ansible/gather/site.yml
 connmon:
-  enabled: {{ connmon_enabled_template }}
+  enabled: {{ connmon_enabled }}
   sudo: true
 grafana:
-  enabled: {{ grafana_enabled_template }}
-  grafana_ip: {{ grafana_host_template }}
+  enabled: {{ grafana_enabled }}
+  grafana_ip: {{ grafana_host }}
   grafana_port: 3000
   dashboards:
     - openstack-general-system-performance
diff --git a/ansible/oooq/roles/template-configs/vars/main.yml b/ansible/oooq/roles/template-configs/vars/main.yml
index aa2b524cc..73929f4bc 100644
--- a/ansible/oooq/roles/template-configs/vars/main.yml
+++ b/ansible/oooq/roles/template-configs/vars/main.yml
@@ -1,8 +1,8 @@
-elastic_enabled_template: false
-elastic_host_template: "1.2.3.4.5"
-connmon_enabled_template: false
-grafana_enabled_template: false
-grafana_host_template: "1.2.3.4.5"
+elastic_enabled: false
+elastic_host: "1.2.3.4.5"
+connmon_enabled: false
+grafana_enabled: false
+grafana_host: "1.2.3.4.5"
 browbeat_config_file: "browbeat-basic.yaml.j2"
 browbeat_cloud_name: "browbeat_ci"
 overcloud_size: "{{ groups['overcloud'] | length }}"
diff --git a/ci-scripts/tripleo/microbrow.sh b/ci-scripts/tripleo/microbrow.sh
index 9f9852a35..34bf026f9 100755
--- a/ci-scripts/tripleo/microbrow.sh
+++ b/ci-scripts/tripleo/microbrow.sh
@@ -23,9 +23,9 @@ export HW_ENV_DIR=$WORKSPACE/tripleo-environments/hardware_environments/$HW_ENV
 export NETWORK_ISOLATION=no_vlan
 export REQS=quickstart-extras-requirements.txt
 export PLAYBOOK=baremetal-virt-undercloud-tripleo-browbeat.yml
-export VARS="elastic_enabled_template=true \
---extra-vars grafana_enabled_template=false \
---extra-vars elastic_host_template=$ELASTIC_HOST \
+export VARS="elastic_enabled=true \
+--extra-vars grafana_enabled=true \
+--extra-vars elastic_host=$ELASTIC_HOST \
 --extra-vars graphite_host=$GRAPH_HOST \
 --extra-vars statsd_host=$GRAPH_HOST \
 --extra-vars statsd_enabled=True \