diff --git a/README.md b/README.md
index c4a4576bfebdf085a64d45d903260e47e64d61e7..9856d4ff9df92fd846bd60ddbbf12c6948d9629c 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,7 @@
 
 The OpenAppStack bootstrap script allows you to easily set up a new OpenAppStack cluster.
 
+
 Please refer to https://openappstack.net/documentation.html for further details,
 and to https://openappstack.net/tutorial.html for a step by step installation tutorial
 how to bootstrap your cluster.
diff --git a/ansible/roles/setup/tasks/main.yml b/ansible/roles/setup/tasks/main.yml
index d288a7adcb09f37b390c025aaebd3ddd9cbef462..8a148c10bcda0ef86d96ed29fe647a3a1bcd7971 100644
--- a/ansible/roles/setup/tasks/main.yml
+++ b/ansible/roles/setup/tasks/main.yml
@@ -213,9 +213,24 @@
   with_items:
     - /oas/config/values/apps/nginx.yaml
 
+- name: Check if there are failed helm deployments
+  tags:
+    - helmfile      
+  command: 'helm ls --failed --short'
+  failed_when: false
+  register: helm_failed_deployments
+  changed_when: false
+
+- name: Remove failed helm deployments
+  tags:
+    - helmfile
+  shell: 'helm ls --failed --short | xargs -L1 helm delete --purge'
+  when: helm_failed_deployments.stdout != ""
+
 - name: Apply helmfiles
   tags:
     - helmfile
   environment:
     - NEXTCLOUD_PASSWORD: "{{ nextcloud_password }}"
   command: '/usr/local/bin/helmfile -b /snap/bin/helm -e oas -f /oas/source/repos/helmfiles/helmfile.d/ apply --suppress-secrets'
+