diff --git a/roles/openstack_helm_octavia/defaults/main.yml b/roles/openstack_helm_octavia/defaults/main.yml
index f937de8..df77075 100644
--- a/roles/openstack_helm_octavia/defaults/main.yml
+++ b/roles/openstack_helm_octavia/defaults/main.yml
@@ -1,43 +1,32 @@
----
-# .. vim: foldmarker=[[[,]]]:foldmethod=marker
-
-# .. Copyright (C) 2022 VEXXHOST, Inc.
-# .. SPDX-License-Identifier: Apache-2.0
-
-# Default variables
-# =================
-
-# .. contents:: Sections
-#    :local:
-
-
-# .. envvar:: openstack_helm_octavia_values [[[
+# Copyright (c) 2023 VEXXHOST, Inc.
 #
-# Overrides for Helm chart values
-openstack_helm_octavia_values: {}
-
-                                                                   # ]]]
-# .. envvar:: openstack_helm_octavia_ingress_annotations [[[
+# 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
 #
-# Ingress annotations
+#      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_octavia_helm_release_name: octavia
+openstack_helm_octavia_helm_chart_path: "{{ role_path }}/../../charts/octavia/"
+openstack_helm_octavia_helm_chart_ref: /usr/local/src/octavia
+
+openstack_helm_octavia_helm_release_namespace: openstack
+openstack_helm_octavia_helm_values: {}
+
+# List of annotations to apply to the Ingress
 openstack_helm_octavia_ingress_annotations: {}
 
-                                                                   # ]]]
-# .. envvar:: openstack_helm_octavia_heartbeat_key [[[
-#
 # Heartbeat key
 openstack_helm_octavia_heartbeat_key: "{{ undef(hint='You must specify a Octavia heartbeat key') }}"
 
-                                                                   # ]]]
-# .. envvar:: openstack_helm_octavia_management_subnet_cidr [[[
-#
 # Octavia management subnet (CIDR)
 openstack_helm_octavia_management_subnet_cidr: "172.24.0.0/22"
 
-                                                                   # ]]]
-# .. envvar:: openstack_helm_octavia_amphora_image_url [[[
-#
 # Octavia amphora image url
 openstack_helm_octavia_amphora_image_url: "https://tarballs.opendev.org/openstack/octavia/test-images/test-only-amphora-x64-haproxy-ubuntu-focal.qcow2"
-
-                                                                   # ]]]
diff --git a/roles/openstack_helm_octavia/meta/main.yml b/roles/openstack_helm_octavia/meta/main.yml
index 3c75a6c..34709ee 100644
--- a/roles/openstack_helm_octavia/meta/main.yml
+++ b/roles/openstack_helm_octavia/meta/main.yml
@@ -24,5 +24,12 @@
 
 dependencies:
   - role: defaults
+  - role: openstack_helm_endpoints
+    vars:
+      openstack_helm_endpoints_chart: octavia
+  - role: upload_helm_chart
+    vars:
+      upload_helm_chart_src: "{{ openstack_helm_octavia_helm_chart_path }}"
+      upload_helm_chart_dest: "{{ openstack_helm_octavia_helm_chart_ref }}"
   - role: openstacksdk
   - role: openstack_cli
diff --git a/roles/openstack_helm_octavia/tasks/main.yml b/roles/openstack_helm_octavia/tasks/main.yml
index 1acbe44..6f3a2a7 100644
--- a/roles/openstack_helm_octavia/tasks/main.yml
+++ b/roles/openstack_helm_octavia/tasks/main.yml
@@ -12,11 +12,27 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-- name: Generate OpenStack-Helm endpoints
-  ansible.builtin.include_role:
-    name: openstack_helm_endpoints
-  vars:
-    openstack_helm_endpoints_chart: octavia
+- name: Uninstall the legacy HelmRelease
+  run_once: true
+  block:
+    - name: Suspend the existing HelmRelease
+      kubernetes.core.k8s:
+        state: patched
+        api_version: helm.toolkit.fluxcd.io/v2beta1
+        kind: HelmRelease
+        name: "{{ openstack_helm_octavia_helm_release_name }}"
+        namespace: "{{ openstack_helm_octavia_helm_release_namespace }}"
+        definition:
+          spec:
+            suspend: true
+
+    - name: Remove the existing HelmRelease
+      kubernetes.core.k8s:
+        state: absent
+        api_version: helm.toolkit.fluxcd.io/v2beta1
+        kind: HelmRelease
+        name: "{{ openstack_helm_octavia_helm_release_name }}"
+        namespace: "{{ openstack_helm_octavia_helm_release_namespace }}"
 
 - name: Create management network
   openstack.cloud.network:
@@ -200,38 +216,14 @@
     ram: -1
 
 - name: Deploy Helm chart
-  kubernetes.core.k8s:
-    state: present
-    definition:
-      - apiVersion: v1
-        kind: Secret
-        metadata:
-          name: atmosphere-octavia
-          namespace: openstack
-        stringData:
-          values.yaml: "{{ _openstack_helm_octavia_values | combine(openstack_helm_octavia_values, recursive=True) | to_nice_yaml }}"
-
-      - apiVersion: helm.toolkit.fluxcd.io/v2beta1
-        kind: HelmRelease
-        metadata:
-          name: octavia
-          namespace: openstack
-        spec:
-          interval: 60s
-          chart:
-            spec:
-              chart: octavia
-              version: 0.2.5
-              sourceRef:
-                kind: HelmRepository
-                name: openstack-helm
-          install:
-            disableWait: true
-          upgrade:
-            disableWait: true
-          valuesFrom:
-            - kind: Secret
-              name: atmosphere-octavia
+  run_once: true
+  kubernetes.core.helm:
+    name: "{{ openstack_helm_octavia_helm_release_name }}"
+    chart_ref: "{{ openstack_helm_octavia_helm_chart_ref }}"
+    release_namespace: "{{ openstack_helm_octavia_helm_release_namespace }}"
+    create_namespace: true
+    kubeconfig: /etc/kubernetes/admin.conf
+    values: "{{ _openstack_helm_octavia_helm_values | combine(openstack_helm_octavia_helm_values, recursive=True) }}"
 
 - name: Create Ingress
   ansible.builtin.include_role:
diff --git a/roles/openstack_helm_octavia/vars/main.yml b/roles/openstack_helm_octavia/vars/main.yml
index e8ca175..629898f 100644
--- a/roles/openstack_helm_octavia/vars/main.yml
+++ b/roles/openstack_helm_octavia/vars/main.yml
@@ -12,7 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-_openstack_helm_octavia_values:
+_openstack_helm_octavia_helm_values:
   endpoints: "{{ openstack_helm_endpoints }}"
   images:
     tags: "{{ atmosphere_images | vexxhost.atmosphere.openstack_helm_image_tags('octavia') }}"