diff --git a/inventory/group_vars/k8s-cluster.yml b/inventory/group_vars/k8s-cluster.yml
index 35f79ef17..bcaa07f30 100644
--- a/inventory/group_vars/k8s-cluster.yml
+++ b/inventory/group_vars/k8s-cluster.yml
@@ -141,3 +141,6 @@ efk_enabled: false
 
 # Helm deployment
 helm_enabled: false
+
+# Heapster deployment
+heapster_enabled: false
diff --git a/roles/kubernetes-apps/meta/main.yml b/roles/kubernetes-apps/meta/main.yml
index ec3e4cc4a..65bc6afb6 100644
--- a/roles/kubernetes-apps/meta/main.yml
+++ b/roles/kubernetes-apps/meta/main.yml
@@ -16,4 +16,5 @@ dependencies:
     when: helm_enabled
     tags: [ apps, helm ]
   - role: kubernetes-apps/heapster
+    when: heapster_enabled
     tags: [ apps, heapster ]