diff --git a/roles/openstack_helm_infra_ceph_provisioners/defaults/main.yml b/roles/openstack_helm_infra_ceph_provisioners/defaults/main.yml
index 2d745d0..ca5fed9 100644
--- a/roles/openstack_helm_infra_ceph_provisioners/defaults/main.yml
+++ b/roles/openstack_helm_infra_ceph_provisioners/defaults/main.yml
@@ -1,49 +1,38 @@
----
-# .. vim: foldmarker=[[[,]]]:foldmethod=marker
-
-# .. Copyright (C) 2022 VEXXHOST, Inc.
-# .. SPDX-License-Identifier: Apache-2.0
-
-# Default variables
-# =================
-
-# .. contents:: Sections
-#    :local:
-
-
-# .. envvar:: openstack_helm_infra_ceph_provisioners_ceph_mon_group [[[
+# Copyright (c) 2023 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.
+
+openstack_helm_ceph_provisioners_helm_release_name: ceph_provisioners
+openstack_helm_ceph_provisioners_helm_chart_path: "{{ role_path }}/../../charts/ceph_provisioners/"
+openstack_helm_ceph_provisioners_helm_chart_ref: /usr/local/src/ceph_provisioners
+
+openstack_helm_ceph_provisioners_helm_release_namespace: openstack
+openstack_helm_ceph_provisioners_helm_values: {}
+
 # Ansible inventory group containing Ceph monitors.
 openstack_helm_infra_ceph_provisioners_ceph_mon_group: controllers
 
-                                                                   # ]]]
-# .. envvar:: openstack_helm_infra_ceph_provisioners_ceph_monitors [[[
-#
 # IP address list of Ceph monitors
 openstack_helm_infra_ceph_provisioners_ceph_monitors: "{{ _ceph_csi_rbd_helm_info.status['values']['csiConfig'][0]['monitors'] }}"
 
-                                                                   # ]]]
-# .. envvar:: openstack_helm_infra_ceph_provisioners_ceph_fsid [[[
-#
 # Filesystem ID for Ceph cluster
 openstack_helm_infra_ceph_provisioners_ceph_fsid: "{{ _ceph_csi_rbd_helm_info.status['values']['csiConfig'][0]['clusterID'] }}"
 
-                                                                   # ]]]
-# .. envvar:: openstack_helm_infra_ceph_provisioners_ceph_public_network [[[
-#
 # Public network used by Ceph
 openstack_helm_infra_ceph_provisioners_ceph_public_network: "{{ ceph_mon_public_network }}"
 
-                                                                   # ]]]
-# .. envvar:: openstack_helm_infra_ceph_provisioners_ceph_cluster_network [[[
-#
 # Cluster (replication) network used by Ceph
 openstack_helm_infra_ceph_provisioners_ceph_cluster_network: "{{ openstack_helm_infra_ceph_provisioners_ceph_public_network }}"
 
-                                                                   # ]]]
-# .. envvar:: openstack_helm_infra_ceph_provisioners_values [[[
-#
 # Overrides for Helm chart values
 openstack_helm_infra_ceph_provisioners_values: {}
-
-                                                                   # ]]]
diff --git a/roles/openstack_helm_infra_ceph_provisioners/meta/main.yml b/roles/openstack_helm_infra_ceph_provisioners/meta/main.yml
index 973189b..a6c7563 100644
--- a/roles/openstack_helm_infra_ceph_provisioners/meta/main.yml
+++ b/roles/openstack_helm_infra_ceph_provisioners/meta/main.yml
@@ -25,5 +25,11 @@
 
 dependencies:
   - role: defaults
-  - role: atmosphere
+  - role: openstack_helm_endpoints
+    vars:
+      openstack_helm_endpoints_chart: ceph_provisioners
+  - role: upload_helm_chart
+    vars:
+      upload_helm_chart_src: "{{ openstack_helm_ceph_provisioners_helm_chart_path }}"
+      upload_helm_chart_dest: "{{ openstack_helm_ceph_provisioners_helm_chart_ref }}"
   - role: ceph_csi_rbd
diff --git a/roles/openstack_helm_infra_ceph_provisioners/tasks/main.yml b/roles/openstack_helm_infra_ceph_provisioners/tasks/main.yml
index 07c829f..3fa449f 100644
--- a/roles/openstack_helm_infra_ceph_provisioners/tasks/main.yml
+++ b/roles/openstack_helm_infra_ceph_provisioners/tasks/main.yml
@@ -103,35 +103,11 @@
         key: "{{ _openstack_helm_infra_ceph_provisioners_keyring.key }}"
 
 - name: Deploy Helm chart
-  kubernetes.core.k8s:
-    state: present
-    definition:
-      - apiVersion: v1
-        kind: Secret
-        metadata:
-          name: atmosphere-ceph-provisioners
-          namespace: openstack
-        stringData:
-          values.yaml: "{{ _openstack_helm_infra_ceph_provisioners_values | to_nice_yaml }}"
-
-      - apiVersion: helm.toolkit.fluxcd.io/v2beta1
-        kind: HelmRelease
-        metadata:
-          name: ceph-provisioners
-          namespace: openstack
-        spec:
-          interval: 60s
-          chart:
-            spec:
-              chart: ceph-provisioners
-              version: 0.1.8
-              sourceRef:
-                kind: HelmRepository
-                name: openstack-helm-infra
-          install:
-            disableWait: true
-          upgrade:
-            disableWait: true
-          valuesFrom:
-            - kind: Secret
-              name: atmosphere-ceph-provisioners
+  run_once: true
+  kubernetes.core.helm:
+    name: "{{ openstack_helm_ceph_provisioners_helm_release_name }}"
+    chart_ref: "{{ openstack_helm_ceph_provisioners_helm_chart_ref }}"
+    release_namespace: "{{ openstack_helm_ceph_provisioners_helm_release_namespace }}"
+    create_namespace: true
+    kubeconfig: /etc/kubernetes/admin.conf
+    values: "{{ _openstack_helm_ceph_provisioners_helm_values | combine(openstack_helm_ceph_provisioners_helm_values, recursive=True) }}"
diff --git a/roles/openstack_helm_infra_ceph_provisioners/vars/main.yml b/roles/openstack_helm_infra_ceph_provisioners/vars/main.yml
index 157bcb7..8336d66 100644
--- a/roles/openstack_helm_infra_ceph_provisioners/vars/main.yml
+++ b/roles/openstack_helm_infra_ceph_provisioners/vars/main.yml
@@ -1,5 +1,18 @@
-_openstack_helm_infra_ceph_provisioners_values: "{{ __openstack_helm_infra_ceph_provisioners_values | combine(openstack_helm_infra_ceph_provisioners_values, recursive=True) }}"
-__openstack_helm_infra_ceph_provisioners_values:
+# 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.
+
+_openstack_helm_infra_ceph_provisioners_helm_values:
   network:
     public: "{{ openstack_helm_infra_ceph_provisioners_ceph_public_network }}"
     cluster: "{{ openstack_helm_infra_ceph_provisioners_ceph_cluster_network }}"