diff --git a/core/src/epicli/data/common/ansible/playbooks/roles/kubernetes_master/tasks/main.yml b/core/src/epicli/data/common/ansible/playbooks/roles/kubernetes_master/tasks/main.yml
index 4d4aaf9c9e..7bcabf121d 100644
--- a/core/src/epicli/data/common/ansible/playbooks/roles/kubernetes_master/tasks/main.yml
+++ b/core/src/epicli/data/common/ansible/playbooks/roles/kubernetes_master/tasks/main.yml
@@ -103,3 +103,8 @@
   lineinfile:
     path: "/home/{{ admin_user.name }}/.bashrc"
     line: source <(kubectl completion bash)
+
+- name: Include Helm binary installation
+  include_role:
+    name: helm
+    tasks_from: install-bin
diff --git a/core/src/epicli/data/common/ansible/playbooks/roles/prometheus/templates/prometheus.yml.j2 b/core/src/epicli/data/common/ansible/playbooks/roles/prometheus/templates/prometheus.yml.j2
index 765f92808d..2ed625d9f7 100644
--- a/core/src/epicli/data/common/ansible/playbooks/roles/prometheus/templates/prometheus.yml.j2
+++ b/core/src/epicli/data/common/ansible/playbooks/roles/prometheus/templates/prometheus.yml.j2
@@ -60,7 +60,7 @@ scrape_configs:
       - __meta_kubernetes_namespace
       - __meta_kubernetes_service_name
       - __meta_kubernetes_endpoint_port_name
-	  
+
 # Scrape config for node exporters in "k8s as cloud service"
 
 {% if k8s_as_cloud_service is defined and k8s_as_cloud_service %}
diff --git a/core/src/epicli/data/common/ansible/playbooks/roles/vault/tasks/main.yml b/core/src/epicli/data/common/ansible/playbooks/roles/vault/tasks/main.yml
index abb3d12f06..99231be4d0 100644
--- a/core/src/epicli/data/common/ansible/playbooks/roles/vault/tasks/main.yml
+++ b/core/src/epicli/data/common/ansible/playbooks/roles/vault/tasks/main.yml
@@ -34,9 +34,11 @@
     dest: /tmp/vault_helm_chart_values.yaml
   when: vault_helm_chart_values_bool
 
-- name: Install and configure Hashicorp Vault if enabled
+- name: Install and configure Hashicorp Vault if enabled and no cloud service is used
   when:
     - specification.vault_enabled
+    - k8s_as_cloud_service is not defined
+    - not k8s_as_cloud_service
   block:
     - name: Create Vault system group
       group: