diff --git a/roles/ceph_csi_rbd/defaults/main.yml b/roles/ceph_csi_rbd/defaults/main.yml
index 708d3a1..c64ad8f 100644
--- a/roles/ceph_csi_rbd/defaults/main.yml
+++ b/roles/ceph_csi_rbd/defaults/main.yml
@@ -12,7 +12,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-ceph_csi_rbd_ceph_fsid: "{{ ceph_mon_fsid }}"
 ceph_csi_rbd_mons_group: controllers
 ceph_csi_rbd_id: kube
 ceph_csi_rbd_user: "client.{{ ceph_csi_rbd_id }}"
diff --git a/roles/ceph_csi_rbd/tasks/main.yml b/roles/ceph_csi_rbd/tasks/main.yml
index f992364..6db53e0 100644
--- a/roles/ceph_csi_rbd/tasks/main.yml
+++ b/roles/ceph_csi_rbd/tasks/main.yml
@@ -22,12 +22,13 @@
 - name: Generate fact with list of Ceph monitors
   run_once: true
   ansible.builtin.set_fact:
+    ceph_csi_rbd_ceph_fsid: "{{ _ceph_mon_dump.stdout | from_json | community.general.json_query('fsid') }}"
     ceph_monitors: "{{ _ceph_mon_dump.stdout | from_json | community.general.json_query('mons[*].addr') | map('regex_replace', '(.*):(.*)', '\\1') }}"
 
 - name: Create Ceph pool
   delegate_to: "{{ groups[ceph_csi_rbd_mons_group][0] }}"
   run_once: true
-  vexxhost.atmosphere.ceph_pool:
+  vexxhost.ceph.pool:
     name: "{{ ceph_csi_rbd_pool }}"
     rule_name: "{{ ceph_csi_rbd_rule_name | default(omit) }}"
     application: rbd
@@ -36,7 +37,7 @@
 - name: Create user {{ ceph_csi_rbd_user }}
   delegate_to: "{{ groups[ceph_csi_rbd_mons_group][0] }}"
   run_once: true
-  vexxhost.atmosphere.ceph_key:
+  vexxhost.ceph.key:
     name: "{{ ceph_csi_rbd_user }}"
     caps:
       mon: profile rbd
@@ -46,7 +47,7 @@
 - name: Retrieve keyring for {{ ceph_csi_rbd_user }}
   delegate_to: "{{ groups[ceph_csi_rbd_mons_group][0] }}"
   run_once: true
-  vexxhost.atmosphere.ceph_key:
+  vexxhost.ceph.key:
     name: "{{ ceph_csi_rbd_user }}"
     state: info
     output_format: json
diff --git a/roles/ceph_mgr/README.md b/roles/ceph_mgr/README.md
deleted file mode 100644
index ccc483a..0000000
--- a/roles/ceph_mgr/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# `ceph_mgr`
diff --git a/roles/ceph_mgr/meta/main.yml b/roles/ceph_mgr/meta/main.yml
deleted file mode 100644
index cec72d8..0000000
--- a/roles/ceph_mgr/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 Ceph manager
-  license: Apache-2.0
-  min_ansible_version: 5.5.0
-  standalone: false
-  platforms:
-    - name: Ubuntu
-      versions:
-        - focal
-
-dependencies:
-  - role: defaults
diff --git a/roles/ceph_mgr/tasks/main.yml b/roles/ceph_mgr/tasks/main.yml
deleted file mode 100644
index 9ee70ee..0000000
--- a/roles/ceph_mgr/tasks/main.yml
+++ /dev/null
@@ -1,50 +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: Install packages
-  ansible.builtin.apt:
-    name: ["ceph-mgr"]
-    install_recommends: false
-
-- name: Create manager folder
-  ansible.builtin.file:
-    path: "/var/lib/ceph/mgr/ceph-{{ inventory_hostname_short }}"
-    state: directory
-    owner: ceph
-    group: ceph
-    mode: "0700"
-
-- name: Create Ceph manager keyring
-  vexxhost.atmosphere.ceph_key:
-    name: "mgr.{{ inventory_hostname_short }}"
-    dest: "/var/lib/ceph/mgr/ceph-{{ inventory_hostname_short }}/keyring"
-    caps:
-      mon: allow profile mgr
-      osd: allow *
-      mds: allow *
-    owner: ceph
-    group: ceph
-
-- name: Ensure permissions are fixed
-  ansible.builtin.file:
-    path: "/var/lib/ceph/mon/ceph-{{ inventory_hostname_short }}"
-    owner: ceph
-    group: ceph
-    recurse: true
-
-- name: Enable and start service
-  ansible.builtin.service:
-    name: "ceph-mgr@{{ inventory_hostname_short }}"
-    state: started
-    enabled: true
diff --git a/roles/ceph_mon/README.md b/roles/ceph_mon/README.md
deleted file mode 100644
index d742bc2..0000000
--- a/roles/ceph_mon/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# `ceph_mon`
diff --git a/roles/ceph_mon/defaults/main.yml b/roles/ceph_mon/defaults/main.yml
deleted file mode 100644
index 86c1717..0000000
--- a/roles/ceph_mon/defaults/main.yml
+++ /dev/null
@@ -1,25 +0,0 @@
----
-# .. vim: foldmarker=[[[,]]]:foldmethod=marker
-
-# .. Copyright (C) 2022 VEXXHOST, Inc.
-# .. SPDX-License-Identifier: Apache-2.0
-
-# Default variables
-# =================
-
-# .. contents:: Sections
-#    :local:
-
-
-# .. envvar:: ceph_mon_group [[[
-#
-# Name of Ansible group that contains all Ceph monitors
-ceph_mon_group: controllers
-
-                                                                   # ]]]
-# .. envvar:: ceph_mon_cluster_network [[[
-#
-# Cluster (replication) network used by Ceph
-ceph_mon_cluster_network: "{{ ceph_mon_public_network }}"
-
-                                                                   # ]]]
diff --git a/roles/ceph_mon/meta/main.yml b/roles/ceph_mon/meta/main.yml
deleted file mode 100644
index d59c2bc..0000000
--- a/roles/ceph_mon/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 Ceph monitor
-  license: Apache-2.0
-  min_ansible_version: 5.5.0
-  standalone: false
-  platforms:
-    - name: Ubuntu
-      versions:
-        - focal
-
-dependencies:
-  - role: defaults
diff --git a/roles/ceph_mon/tasks/bootstrap-ceph.yml b/roles/ceph_mon/tasks/bootstrap-ceph.yml
deleted file mode 100644
index dc19f62..0000000
--- a/roles/ceph_mon/tasks/bootstrap-ceph.yml
+++ /dev/null
@@ -1,111 +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.
-
-# TODO(mnaser): Move to using vexxhost.atmosphere.ceph_key
-- name: Create monitor keyring
-  ansible.builtin.command:
-    ceph-authtool --gen-key --create-keyring
-                  --name mon.
-                  --cap mon 'allow *'
-                  /tmp/ceph.mon.keyring
-  args:
-    creates: /tmp/ceph.mon.keyring
-  when:
-    - inventory_hostname == groups[ceph_mon_group][0]
-
-# TODO(mnaser): Move to using vexxhost.atmosphere.ceph_key
-- name: Create admin keyring
-  ansible.builtin.command:
-    ceph-authtool --gen-key --create-keyring
-                  --name client.admin
-                  --cap mon 'allow *'
-                  --cap osd 'allow *'
-                  --cap mds 'allow *'
-                  --cap mgr 'allow *'
-                  /etc/ceph/ceph.client.admin.keyring
-  args:
-    creates: /etc/ceph/ceph.client.admin.keyring
-  when:
-    - inventory_hostname == groups[ceph_mon_group][0]
-
-# TODO(mnaser): Move to using vexxhost.atmosphere.ceph_key
-- name: Create bootstrap-osd keyring
-  ansible.builtin.command:
-    ceph-authtool --gen-key --create-keyring
-                  --name client.bootstrap-osd
-                  --cap mon 'profile bootstrap-osd'
-                  --cap mgr 'allow r'
-                  /var/lib/ceph/bootstrap-osd/ceph.keyring
-  args:
-    creates: /var/lib/ceph/bootstrap-osd/ceph.keyring
-  when:
-    - inventory_hostname == groups[ceph_mon_group][0]
-
-# TODO(mnaser): Move to using vexxhost.atmosphere.ceph_key
-- name: Add admin keyring to monitor
-  changed_when: true
-  ansible.builtin.command:
-    ceph-authtool --import-keyring /etc/ceph/ceph.client.admin.keyring
-                  /tmp/ceph.mon.keyring
-  when:
-    - inventory_hostname == groups[ceph_mon_group][0]
-
-# TODO(mnaser): Move to using vexxhost.atmosphere.ceph_key
-- name: Add bootstrap-osd keyring to monitor
-  changed_when: true
-  ansible.builtin.command:
-    ceph-authtool --import-keyring /var/lib/ceph/bootstrap-osd/ceph.keyring
-                  /tmp/ceph.mon.keyring
-  when:
-    - inventory_hostname == groups[ceph_mon_group][0]
-
-- name: Create monmap
-  ansible.builtin.command:
-    monmaptool --create
-               --fsid {{ ceph_mon_fsid }}
-               --add {{ inventory_hostname_short }} {{ ceph_mon_ip_address }}
-               /tmp/monmap
-  args:
-    creates: /tmp/monmap
-  when:
-    - inventory_hostname == groups[ceph_mon_group][0]
-
-- name: Create monitor folder
-  ansible.builtin.file:
-    path: "/var/lib/ceph/mon/ceph-{{ inventory_hostname_short }}"
-    state: directory
-    owner: ceph
-    group: ceph
-    mode: "0700"
-  when:
-    - inventory_hostname == groups[ceph_mon_group][0]
-
-- name: Configure mon initial members
-  community.general.ini_file:
-    path: /etc/ceph/ceph.conf
-    section: global
-    option: mon initial members
-    value: "{{ inventory_hostname_short }}"
-    owner: ceph
-    group: ceph
-    mode: "0640"
-
-- name: Start monitor
-  ansible.builtin.include_tasks: start-monitor.yml
-  when:
-    - inventory_hostname == groups[ceph_mon_group][0]
-
-- name: Set bootstrap node
-  ansible.builtin.set_fact:
-    _ceph_mon_bootstrap_node: "{{ groups[ceph_mon_group][0] }}"
diff --git a/roles/ceph_mon/tasks/main.yml b/roles/ceph_mon/tasks/main.yml
deleted file mode 100644
index 5ce89e2..0000000
--- a/roles/ceph_mon/tasks/main.yml
+++ /dev/null
@@ -1,92 +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: Install packages
-  ansible.builtin.apt:
-    name: ["ceph-mon"]
-    install_recommends: false
-
-- name: Set ceph monitor ip address
-  ansible.builtin.set_fact:
-    ceph_mon_ip_address: "{{ ansible_all_ipv4_addresses | ansible.netcommon.ipaddr(ceph_mon_public_network) | first }}"
-
-- name: Generate basic configuration file
-  community.general.ini_file:
-    path: /etc/ceph/ceph.conf
-    section: global
-    option: "{{ item.option }}"
-    value: "{{ item.value }}"
-    owner: ceph
-    group: ceph
-    mode: "0640"
-  loop:
-    - option: fsid
-      value: "{{ ceph_mon_fsid }}"
-    - option: mon host
-      value: "{{ groups[ceph_mon_group] | map('extract', hostvars, ['ceph_mon_ip_address']) | join(',') }}"
-    - option: public network
-      value: "{{ ceph_mon_public_network }}"
-    - option: cluster network
-      value: "{{ ceph_mon_cluster_network }}"
-
-- name: Check if any node is bootstrapped
-  ansible.builtin.stat:
-    path: "/var/lib/ceph/mon/ceph-{{ hostvars[item]['inventory_hostname_short'] }}/store.db"
-  register: _ceph_mon_stat
-  loop: "{{ groups[ceph_mon_group] }}"
-  delegate_to: "{{ item }}"
-
-- name: Select pre-existing bootstrap node if exists
-  ansible.builtin.set_fact:
-    _ceph_mon_bootstrap_node: "{{ _ceph_mon_stat.results | selectattr('stat.exists', 'equalto', true) | map(attribute='item') | first }}"
-  when:
-    - _ceph_mon_stat.results | selectattr('stat.exists', 'equalto', true) | length > 0
-
-- name: Bootstrap cluster
-  ansible.builtin.include_tasks: bootstrap-ceph.yml
-  when:
-    - _ceph_mon_stat.results | selectattr('stat.exists', 'equalto', true) | length == 0
-
-- name: Grab admin keyring
-  delegate_to: "{{ _ceph_mon_bootstrap_node }}"
-  ansible.builtin.slurp:
-    src: /etc/ceph/ceph.client.admin.keyring
-  register: _ceph_mon_admin_keyring
-  when: inventory_hostname != _ceph_mon_bootstrap_node
-
-- name: Upload client.admin keyring
-  ansible.builtin.copy:
-    content: "{{ _ceph_mon_admin_keyring['content'] | b64decode }}"
-    dest: /etc/ceph/ceph.client.admin.keyring
-    mode: "0600"
-  when: inventory_hostname != _ceph_mon_bootstrap_node
-
-- name: Get monitor keyring
-  ansible.builtin.command: ceph auth get mon. -o /tmp/ceph.mon.keyring
-  changed_when: false
-  when: inventory_hostname != _ceph_mon_bootstrap_node
-
-- name: Get monmap keyring
-  ansible.builtin.command: ceph mon getmap -o /tmp/monmap
-  changed_when: false
-  when: inventory_hostname != _ceph_mon_bootstrap_node
-
-- name: Start monitor
-  ansible.builtin.include_tasks: start-monitor.yml
-  when: inventory_hostname != _ceph_mon_bootstrap_node
-
-- name: Enable "msgr2"
-  ansible.builtin.command: ceph mon enable-msgr2
-  changed_when: false
-  when: inventory_hostname == _ceph_mon_bootstrap_node
diff --git a/roles/ceph_mon/tasks/start-monitor.yml b/roles/ceph_mon/tasks/start-monitor.yml
deleted file mode 100644
index 308d44b..0000000
--- a/roles/ceph_mon/tasks/start-monitor.yml
+++ /dev/null
@@ -1,46 +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: Create monitor filesystem
-  ansible.builtin.shell: |
-    ceph-mon --mkfs -i {{ inventory_hostname_short }} --monmap /tmp/monmap --keyring /tmp/ceph.mon.keyring
-  args:
-    creates: "/var/lib/ceph/mon/ceph-{{ inventory_hostname_short }}/store.db"
-
-- name: Ensure permissions are fixed
-  ansible.builtin.file:
-    path: "/var/lib/ceph/mon/ceph-{{ inventory_hostname_short }}"
-    owner: ceph
-    group: ceph
-    recurse: true
-
-# NOTE(mnaser): https://bugs.launchpad.net/ubuntu/+source/ceph/+bug/1917414/comments/30
-- name: Workaround for aarch64 systems
-  community.general.ini_file:
-    path: /lib/systemd/system/ceph-mon@.service
-    section: Service
-    option: MemoryDenyWriteExecute
-    value: false
-    owner: ceph
-    group: ceph
-    mode: "0644"
-  register: _ceph_aarch64_fix
-  when: ansible_architecture == 'aarch64'
-
-- name: Enable and start service
-  ansible.builtin.service:
-    name: "ceph-mon@{{ inventory_hostname_short }}"
-    state: started
-    enabled: true
-    daemon_reload: "{{ _ceph_aarch64_fix.changed }}"
diff --git a/roles/ceph_osd/README.md b/roles/ceph_osd/README.md
deleted file mode 100644
index e725e9e..0000000
--- a/roles/ceph_osd/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# `ceph_osd`
diff --git a/roles/ceph_osd/defaults/main.yml b/roles/ceph_osd/defaults/main.yml
deleted file mode 100644
index 9671346..0000000
--- a/roles/ceph_osd/defaults/main.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-# .. vim: foldmarker=[[[,]]]:foldmethod=marker
-
-# .. Copyright (C) 2022 VEXXHOST, Inc.
-# .. SPDX-License-Identifier: Apache-2.0
-
-# Default variables
-# =================
-
-# .. contents:: Sections
-#    :local:
-
-
-# .. envvar:: ceph_osd_mons_group [[[
-#
-# Name of Ansible group that contains all Ceph monitors
-ceph_osd_mons_group: controllers
-
-                                                                   # ]]]
diff --git a/roles/ceph_osd/meta/main.yml b/roles/ceph_osd/meta/main.yml
deleted file mode 100644
index bd74938..0000000
--- a/roles/ceph_osd/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 Ceph OSD
-  license: Apache-2.0
-  min_ansible_version: 5.5.0
-  standalone: false
-  platforms:
-    - name: Ubuntu
-      versions:
-        - focal
-
-dependencies:
-  - role: defaults
diff --git a/roles/ceph_osd/tasks/main.yml b/roles/ceph_osd/tasks/main.yml
deleted file mode 100644
index 989424d..0000000
--- a/roles/ceph_osd/tasks/main.yml
+++ /dev/null
@@ -1,104 +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: Install packages
-  ansible.builtin.apt:
-    name: ["udev", "ceph-osd"]
-    install_recommends: false
-
-- name: Grab ceph fsid from monitors
-  delegate_to: "{{ groups[ceph_osd_mons_group][0] }}"
-  register: _ceph_fsid
-  changed_when: false
-  ansible.builtin.command: ceph fsid
-
-- name: Collect "ceph mon dump" output from a monitor
-  delegate_to: "{{ groups[ceph_osd_mons_group][0] }}"
-  run_once: true
-  ansible.builtin.command: ceph mon dump -f json
-  changed_when: false
-  register: _ceph_mon_dump
-
-- name: Generate fact with list of Ceph monitors
-  run_once: true
-  ansible.builtin.set_fact:
-    ceph_monitors: "{{ _ceph_mon_dump.stdout | from_json | community.general.json_query('mons[*].addr') | map('regex_replace', '(.*):(.*)', '\\1') }}"
-
-- name: Generate basic configuration file
-  community.general.ini_file:
-    path: /etc/ceph/ceph.conf
-    section: global
-    option: "{{ item.option }}"
-    value: "{{ item.value }}"
-    owner: ceph
-    group: ceph
-    mode: "0640"
-  loop:
-    - option: fsid
-      value: "{{ _ceph_fsid.stdout | trim }}"
-    - option: mon host
-      value: "{{ ceph_monitors | join(',') }}"
-
-- name: Grab bootstrap-osd from monitors
-  delegate_to: "{{ groups[ceph_osd_mons_group][0] }}"
-  register: _ceph_bootstrap_osd_keyring
-  changed_when: false
-  ansible.builtin.command: ceph auth get client.bootstrap-osd
-
-- name: Install bootstrap-osd keyring
-  ansible.builtin.copy:
-    content: "{{ _ceph_bootstrap_osd_keyring.stdout }}\n"
-    dest: /var/lib/ceph/bootstrap-osd/ceph.keyring
-    owner: ceph
-    group: ceph
-    mode: "0640"
-
-- name: Workaround to allow usage of loop devices
-  ansible.builtin.replace:
-    path: /usr/lib/python3/dist-packages/ceph_volume/util/disk.py
-    regexp: "'mpath']"
-    replace: "'mpath', 'loop']"
-    owner: ceph
-    group: ceph
-    mode: "0640"
-  when: molecule | default(false)
-
-# NOTE(mnaser): https://bugs.launchpad.net/ubuntu/+source/ceph/+bug/1917414/comments/30
-- name: Workaround for aarch64 systems
-  community.general.ini_file:
-    path: /lib/systemd/system/ceph-osd@.service
-    section: Service
-    option: MemoryDenyWriteExecute
-    value: false
-    owner: ceph
-    group: ceph
-    mode: "0644"
-  register: _ceph_aarch64_fix
-  when: ansible_architecture == 'aarch64'
-
-- name: Reload systemd
-  ansible.builtin.service:
-    daemon_reload: "{{ _ceph_aarch64_fix.changed }}"
-
-- name: Get which devices don't contain osds
-  register: _ceph_osd_check
-  failed_when: false
-  changed_when: false
-  ansible.builtin.command: /usr/sbin/ceph-volume lvm list {{ item }}
-  loop: "{{ ceph_osd_devices }}"
-
-- name: Create osds for volumes which are not setup
-  changed_when: true
-  ansible.builtin.command: /usr/sbin/ceph-volume lvm create --data {{ item }}
-  loop: "{{ _ceph_osd_check.results | selectattr('rc', 'equalto', 1) | map(attribute='item') }}"
diff --git a/roles/ceph_provisioners/tasks/main.yml b/roles/ceph_provisioners/tasks/main.yml
index 057b75a..775ab28 100644
--- a/roles/ceph_provisioners/tasks/main.yml
+++ b/roles/ceph_provisioners/tasks/main.yml
@@ -77,7 +77,7 @@
 
 - name: Retrieve client.admin keyring
   delegate_to: "{{ groups[ceph_provisioners_ceph_mon_group][0] }}"
-  vexxhost.atmosphere.ceph_key:
+  vexxhost.ceph.key:
     name: client.admin
     state: info
     output_format: json
diff --git a/roles/ceph_repository/README.md b/roles/ceph_repository/README.md
deleted file mode 100644
index 6e54014..0000000
--- a/roles/ceph_repository/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# `ceph_repository`
diff --git a/roles/ceph_repository/defaults/main.yml b/roles/ceph_repository/defaults/main.yml
deleted file mode 100644
index 63c9290..0000000
--- a/roles/ceph_repository/defaults/main.yml
+++ /dev/null
@@ -1,31 +0,0 @@
----
-# .. vim: foldmarker=[[[,]]]:foldmethod=marker
-
-# .. Copyright (C) 2022 VEXXHOST, Inc.
-# .. SPDX-License-Identifier: Apache-2.0
-
-# Default variables
-# =================
-
-# .. contents:: Sections
-#    :local:
-
-
-# .. envvar:: ceph_repository_apt_key [[[
-#
-# Ceph APT repository GPG key
-ceph_repository_apt_key: "https://download.ceph.com/keys/release.asc"
-
-                                                                   # ]]]
-# .. envvar:: ceph_repository_url [[[
-#
-# Ceph APT repository URL
-ceph_repository_url: https://download.ceph.com/debian-pacific/
-
-                                                                   # ]]]
-# .. envvar:: ceph_repository_version [[[
-#
-# Ceph version to pin package manager to
-ceph_repository_version: 16.2.9
-
-                                                                   # ]]]
diff --git a/roles/ceph_repository/meta/main.yml b/roles/ceph_repository/meta/main.yml
deleted file mode 100644
index 2e86618..0000000
--- a/roles/ceph_repository/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 Ceph repository
-  license: Apache-2.0
-  min_ansible_version: 5.5.0
-  standalone: false
-  platforms:
-    - name: Ubuntu
-      versions:
-        - focal
-
-dependencies:
-  - role: defaults
diff --git a/roles/ceph_repository/tasks/main.yml b/roles/ceph_repository/tasks/main.yml
deleted file mode 100644
index e3d184e..0000000
--- a/roles/ceph_repository/tasks/main.yml
+++ /dev/null
@@ -1,34 +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: Install packages
-  ansible.builtin.apt:
-    name: ["gnupg"]
-    install_recommends: false
-
-- name: Add apt key
-  ansible.builtin.apt_key:
-    url: "{{ ceph_repository_apt_key }}"
-    state: present
-
-- name: Configure version pinning
-  ansible.builtin.template:
-    src: apt-preferences.j2
-    dest: /etc/apt/preferences.d/ceph
-    mode: "0644"
-
-- name: Add apt repository
-  ansible.builtin.apt_repository:
-    repo: "deb {{ ceph_repository_url }} {{ ansible_distribution_release }} main"
-    state: present
diff --git a/roles/ceph_repository/templates/apt-preferences.j2 b/roles/ceph_repository/templates/apt-preferences.j2
deleted file mode 100644
index c197476..0000000
--- a/roles/ceph_repository/templates/apt-preferences.j2
+++ /dev/null
@@ -1,11 +0,0 @@
-Package: ceph-mon
-Pin: version {{ ceph_repository_version }}-*
-Pin-Priority: 1000
-
-Package: ceph-mgr
-Pin: version {{ ceph_repository_version }}-*
-Pin-Priority: 1000
-
-Package: ceph-osd
-Pin: version {{ ceph_repository_version }}-*
-Pin-Priority: 1000
diff --git a/roles/rook_ceph_cluster/tasks/main.yml b/roles/rook_ceph_cluster/tasks/main.yml
index a2ba898..0c8232a 100644
--- a/roles/rook_ceph_cluster/tasks/main.yml
+++ b/roles/rook_ceph_cluster/tasks/main.yml
@@ -22,7 +22,7 @@
 - name: Retrieve keyring for client.admin
   run_once: true
   delegate_to: "{{ groups[rook_ceph_cluster_mon_group][0] }}"
-  vexxhost.atmosphere.ceph_key:
+  vexxhost.ceph.key:
     name: client.admin
     state: info
     output_format: json
@@ -31,7 +31,7 @@
 - name: Retrieve keyring for monitors
   run_once: true
   delegate_to: "{{ groups[rook_ceph_cluster_mon_group][0] }}"
-  vexxhost.atmosphere.ceph_key:
+  vexxhost.ceph.key:
     name: mon.
     state: info
     output_format: json