diff --git a/roles/cert_manager/tasks/main.yml b/roles/cert_manager/tasks/main.yml
index e6516ab..c9c0901 100644
--- a/roles/cert_manager/tasks/main.yml
+++ b/roles/cert_manager/tasks/main.yml
@@ -12,50 +12,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-- name: Deploy Helm chart
-  kubernetes.core.k8s:
-    state: present
-    definition:
-      - apiVersion: helm.toolkit.fluxcd.io/v2beta1
-        kind: HelmRelease
-        metadata:
-          name: cert-manager
-          namespace: cert-manager
-        spec:
-          interval: 60s
-          chart:
-            spec:
-              chart: cert-manager
-              version: v1.7.1
-              sourceRef:
-                kind: HelmRepository
-                name: jetstack
-          install:
-            crds: CreateReplace
-          upgrade:
-            crds: CreateReplace
-          values:
-            installCRDs: true
-            volumes:
-              - name: etc-ssl-certs
-                hostPath:
-                  path: /etc/ssl/certs
-            volumeMounts:
-              - name: etc-ssl-certs
-                mountPath: /etc/ssl/certs
-                readOnly: true
-            nodeSelector:
-              openstack-control-plane: enabled
-            webhook:
-              nodeSelector:
-                openstack-control-plane: enabled
-            cainjector:
-              nodeSelector:
-                openstack-control-plane: enabled
-            startupapicheck:
-              nodeSelector:
-                openstack-control-plane: enabled
-
 - name: Create Issuer
   kubernetes.core.k8s:
     state: present
diff --git a/roles/rabbitmq/meta/main.yml b/roles/rabbitmq/meta/main.yml
index f3d8797..ac177b0 100644
--- a/roles/rabbitmq/meta/main.yml
+++ b/roles/rabbitmq/meta/main.yml
@@ -24,4 +24,4 @@
         - focal
 
 dependencies:
-  - role: rabbitmq_operator
+  - role: atmosphere
diff --git a/roles/rabbitmq_operator/README.md b/roles/rabbitmq_operator/README.md
deleted file mode 100644
index 20ba0d8..0000000
--- a/roles/rabbitmq_operator/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# `rabbitmq_operator`
diff --git a/roles/rabbitmq_operator/meta/main.yml b/roles/rabbitmq_operator/meta/main.yml
deleted file mode 100644
index e57b0da..0000000
--- a/roles/rabbitmq_operator/meta/main.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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.
-
-galaxy_info:
-  author: VEXXHOST, Inc.
-  description: Ansible role for RabbitMQ operator
-  license: Apache-2.0
-  min_ansible_version: 5.5.0
-  standalone: false
-  platforms:
-    - name: Ubuntu
-      versions:
-        - focal
-
-dependencies:
-  - role: atmosphere
diff --git a/roles/rabbitmq_operator/tasks/main.yml b/roles/rabbitmq_operator/tasks/main.yml
deleted file mode 100644
index 2ba1c90..0000000
--- a/roles/rabbitmq_operator/tasks/main.yml
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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: Deploy Helm chart
-  kubernetes.core.k8s:
-    state: present
-    definition:
-      - apiVersion: helm.toolkit.fluxcd.io/v2beta1
-        kind: HelmRelease
-        metadata:
-          name: rabbitmq-cluster-operator
-          namespace: openstack
-        spec:
-          interval: 60s
-          chart:
-            spec:
-              chart: rabbitmq-cluster-operator
-              version: 2.5.2
-              sourceRef:
-                kind: HelmRepository
-                name: bitnami
-          install:
-            crds: CreateReplace
-          upgrade:
-            crds: CreateReplace
-          values:
-            rabbitmqImage:
-              repository: library/rabbitmq
-              tag: 3.10.2-management
-            credentialUpdaterImage:
-              repository: rabbitmqoperator/default-user-credential-updater
-              tag: 1.0.2
-            clusterOperator:
-              image:
-                repository: rabbitmqoperator/cluster-operator
-                tag: 1.13.1
-              fullnameOverride: rabbitmq-cluster-operator
-              nodeSelector:
-                openstack-control-plane: enabled
-            msgTopologyOperator:
-              image:
-                repository: rabbitmqoperator/messaging-topology-operator
-                tag: 1.6.0
-              fullnameOverride: rabbitmq-messaging-topology-operator
-              nodeSelector:
-                openstack-control-plane: enabled
-            useCertManager: true