diff --git a/core/src/epicli/data/common/ansible/playbooks/roles/upgrade/tasks/kubernetes/reconfigure-rabbitmq-app.yml b/core/src/epicli/data/common/ansible/playbooks/roles/upgrade/tasks/kubernetes/reconfigure-rabbitmq-app.yml
index 17cc3d10a9..cb6fe298c2 100644
--- a/core/src/epicli/data/common/ansible/playbooks/roles/upgrade/tasks/kubernetes/reconfigure-rabbitmq-app.yml
+++ b/core/src/epicli/data/common/ansible/playbooks/roles/upgrade/tasks/kubernetes/reconfigure-rabbitmq-app.yml
@@ -1,5 +1,32 @@
 ---
 - name: k8s/master | Patch rabbitmq's statefulset
   include_tasks: utils/patch-statefulset.yml
-  vars:
-    image_regexp: 'rabbitmq:.*'
+- name: Delete rabbitmq pods after patching
+  block:
+    - name: after-patching | Get rabbitmq namespace
+      environment:
+        KUBECONFIG: &KUBECONFIG /etc/kubernetes/admin.conf
+      shell: |-
+        kubectl get statefulsets.apps --all-namespaces -o=jsonpath='{range .items[*]}{.metadata.namespace}{"\t"}{.spec.template.spec.containers[].image}{"\n"}{end}'|
+        awk '/rabbitmq/ {print $1}'
+      changed_when: false
+      register: rabbit_mq_namespace
+      args:
+        executable: /bin/bash
+    - name: after-patching | Get rabbitmq pod names
+      environment:
+        KUBECONFIG: *KUBECONFIG
+      command: kubectl get pod -n {{ rabbit_mq_namespace.stdout }} -o=jsonpath='{range .items[*]}{.metadata.name}{"\n"}'
+      changed_when: false
+      register: rabbit_mq_pod_names
+      when:
+        - not rabbit_mq_namespace.stdout == ""
+    - name: after-patching | Delete rabbitmq pods
+      environment:
+        KUBECONFIG: *KUBECONFIG
+      command: kubectl delete pod --namespace {{ rabbit_mq_namespace.stdout }} {{ item }}
+      changed_when: false
+      loop: "{{ rabbit_mq_pod_names.stdout_lines }}"
+      when:
+        - not rabbit_mq_namespace.stdout == ""
+        - not rabbit_mq_pod_names.stdout == ""