diff --git a/playbooks/cleanup.yml b/playbooks/cleanup.yml
new file mode 100644
index 0000000..49031d4
--- /dev/null
+++ b/playbooks/cleanup.yml
@@ -0,0 +1,35 @@
+# Copyright (c) 2022 VEXXHOST, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+- name: Clean-up legacy RabbitMQ cluster
+  hosts: controllers[0]
+  become: true
+  gather_facts: false
+  tasks:
+    - name: Delete the Helm release
+      kubernetes.core.helm:
+        name: rabbitmq
+        namespace: openstack
+        kubeconfig: /etc/kubernetes/admin.conf
+        state: absent
+        wait: true
+
+    - name: Delete the PVCs
+      kubernetes.core.k8s:
+        state: absent
+        api_version: v1
+        kind: PersistentVolumeClaim
+        namespace: openstack
+        name: "rabbitmq-data-rabbitmq-rabbitmq-{{ item }}"
+      loop: "{{ range(0, 3) | list }}"
\ No newline at end of file
diff --git a/playbooks/openstack.yml b/playbooks/openstack.yml
index aff12a8..18a0aa7 100644
--- a/playbooks/openstack.yml
+++ b/playbooks/openstack.yml
@@ -64,9 +64,9 @@
       tags:
         - openstack-helm-infra-memcached
 
-    - role: openstack_helm_infra_rabbitmq
+    - role: rabbitmq_operator
       tags:
-        - openstack-helm-infra-rabbitmq
+        - rabbitmq-operator
 
     - role: openstack_helm_keystone
       tags:
diff --git a/playbooks/site.yml b/playbooks/site.yml
index 2966d48..f1eaefb 100644
--- a/playbooks/site.yml
+++ b/playbooks/site.yml
@@ -15,3 +15,4 @@
 - import_playbook: vexxhost.atmosphere.ceph
 - import_playbook: vexxhost.atmosphere.kubernetes
 - import_playbook: vexxhost.atmosphere.openstack
+- import_playbook: vexxhost.atmosphere.cleanup
\ No newline at end of file