diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
index 8890a7529..1ecc2893c 100644
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@@ -93,7 +93,7 @@ kibana_image_repo: "gcr.io/google_containers/kibana"
 kibana_image_tag: "{{ kibana_version }}"
 heapster_grafana_version: "v4.0.2"
 heapster_grafana_image_repo: "gcr.io/google_containers/heapster-grafana-amd64"
-heapster_grafana_image_tag: "{{ grafana_version }}"
+heapster_grafana_image_tag: "{{ heapster_grafana_version }}"
 heapster_version: "v1.3.0-beta.1"
 heapster_image_repo: "gcr.io/google_containers/heapster-amd64"
 heapster_image_tag: "{{ heapster_version }}"
@@ -238,7 +238,6 @@ downloads:
     repo: "{{ kibana_image_repo }}"
     tag: "{{ kibana_image_tag }}"
     sha256: "{{ kibana_digest_checksum|default(None) }}"
-<<<<<<< HEAD
   helm:
     container: true
     repo: "{{ helm_image_repo }}"
diff --git a/roles/kubernetes-apps/heapster/default/main.yml b/roles/kubernetes-apps/heapster/default/main.yml
index 3c840ec4a..bd6a130a3 100644
--- a/roles/kubernetes-apps/heapster/default/main.yml
+++ b/roles/kubernetes-apps/heapster/default/main.yml
@@ -1,9 +1,9 @@
 ---
 heapster_namespace: kube-system
 
-grafana_version: "v4.0.2"
-grafana_image_repo: "gcr.io/google_containers/heapster-grafana-amd64"
-grafana_image_tag: "{{ grafana_version }}"
+heapster_grafana_version: "v4.0.2"
+heapster_grafana_image_repo: "gcr.io/google_containers/heapster-grafana-amd64"
+heapster_grafana_image_tag: "{{ heapster_grafana_version }}"
 
 heapster_version: "v1.3.0-beta.1"
 heapster_image_repo: "gcr.io/google_containers/heapster-amd64"
diff --git a/roles/kubernetes-apps/heapster/templates/grafana-deploy.yml.j2 b/roles/kubernetes-apps/heapster/templates/grafana-deploy.yml.j2
index f39e97f67..2f819f739 100644
--- a/roles/kubernetes-apps/heapster/templates/grafana-deploy.yml.j2
+++ b/roles/kubernetes-apps/heapster/templates/grafana-deploy.yml.j2
@@ -13,7 +13,7 @@ spec:
     spec:
       containers:
       - name: grafana
-        image: "{{ grafana_image_repo }}:{{ grafana_image_tag }}"
+        image: "{{ heapster_grafana_image_repo }}:{{ heapster_grafana_image_tag }}"
         ports:
           - containerPort: 3000
             protocol: TCP