diff --git a/python-k8sapp-platform/k8sapp_platform/k8sapp_platform/common/constants.py b/python-k8sapp-platform/k8sapp_platform/k8sapp_platform/common/constants.py
index 97addfb..a1f2725 100644
--- a/python-k8sapp-platform/k8sapp_platform/k8sapp_platform/common/constants.py
+++ b/python-k8sapp-platform/k8sapp_platform/k8sapp_platform/common/constants.py
@@ -13,6 +13,9 @@ HELM_CHART_CEPH_POOLS_AUDIT = 'ceph-pools-audit'
 HELM_CHART_HELM_TOOLKIT = 'helm-toolkit'
 HELM_CHART_CEPH_FS_PROVISIONER = 'cephfs-provisioner'
 HELM_NS_CEPH_FS_PROVISIONER = common.HELM_NS_KUBE_SYSTEM
+FLUXCD_HELMRELEASE_RBD_PROVISIONER = 'rbd-provisioner'
+FLUXCD_HELMRELEASE_CEPH_POOLS_AUDIT = 'ceph-pools-audit'
+FLUXCD_HELMRELEASE_CEPH_FS_PROVISIONER = 'cephfs-provisioner'
 
 HELM_CEPH_FS_PROVISIONER_CLAIM_ROOT = '/pvc-volumes'
 HELM_CHART_CEPH_FS_PROVISIONER_NAME = 'ceph.com/cephfs'
diff --git a/python-k8sapp-platform/k8sapp_platform/k8sapp_platform/helm/ceph_fs_provisioner.py b/python-k8sapp-platform/k8sapp_platform/k8sapp_platform/helm/ceph_fs_provisioner.py
index 87f4c7b..a1b3e16 100644
--- a/python-k8sapp-platform/k8sapp_platform/k8sapp_platform/helm/ceph_fs_provisioner.py
+++ b/python-k8sapp-platform/k8sapp_platform/k8sapp_platform/helm/ceph_fs_provisioner.py
@@ -97,10 +97,11 @@ class K8CephFSProvisioner(object):
         return str(base_name + '-' + name)
 
 
-class CephFSProvisionerHelm(base.BaseHelm):
+class CephFSProvisionerHelm(base.FluxCDBaseHelm):
     """Class to encapsulate helm operations for the cephfs-provisioner chart"""
 
     CHART = app_constants.HELM_CHART_CEPH_FS_PROVISIONER
+    HELM_RELEASE = app_constants.FLUXCD_HELMRELEASE_CEPH_FS_PROVISIONER
     SUPPORTED_NAMESPACES = base.BaseHelm.SUPPORTED_NAMESPACES + \
         [app_constants.HELM_NS_CEPH_FS_PROVISIONER]
     SUPPORTED_APP_NAMESPACES = {
@@ -125,7 +126,7 @@ class CephFSProvisionerHelm(base.BaseHelm):
         # by the user
         if not self._is_enabled(operator.APP, self.CHART,
                                 app_constants.HELM_NS_CEPH_FS_PROVISIONER):
-            operator.helm_release_resource_delete(self.CHART)
+            operator.helm_release_resource_delete(self.HELM_RELEASE)
 
     def get_overrides(self, namespace=None):
 
diff --git a/python-k8sapp-platform/k8sapp_platform/k8sapp_platform/helm/ceph_pools_audit.py b/python-k8sapp-platform/k8sapp_platform/k8sapp_platform/helm/ceph_pools_audit.py
index 530807b..2086f90 100644
--- a/python-k8sapp-platform/k8sapp_platform/k8sapp_platform/helm/ceph_pools_audit.py
+++ b/python-k8sapp-platform/k8sapp_platform/k8sapp_platform/helm/ceph_pools_audit.py
@@ -13,10 +13,11 @@ from sysinv.helm import base
 from sysinv.helm import common
 
 
-class CephPoolsAuditHelm(base.BaseHelm):
+class CephPoolsAuditHelm(base.FluxCDBaseHelm):
     """Class to encapsulate helm operations for the ceph-pools-audit chart"""
 
     CHART = app_constants.HELM_CHART_CEPH_POOLS_AUDIT
+    HELM_RELEASE = app_constants.FLUXCD_HELMRELEASE_CEPH_POOLS_AUDIT
     SUPPORTED_NAMESPACES = base.BaseHelm.SUPPORTED_NAMESPACES + \
         [common.HELM_NS_RBD_PROVISIONER]
     SUPPORTED_APP_NAMESPACES = {
@@ -40,7 +41,7 @@ class CephPoolsAuditHelm(base.BaseHelm):
         # by the user
         if not self._is_enabled(operator.APP, self.CHART,
                                 common.HELM_NS_RBD_PROVISIONER):
-            operator.helm_release_resource_delete(self.CHART)
+            operator.helm_release_resource_delete(self.HELM_RELEASE)
 
     def get_namespaces(self):
         return self.SUPPORTED_NAMESPACES
diff --git a/python-k8sapp-platform/k8sapp_platform/k8sapp_platform/helm/rbd_provisioner.py b/python-k8sapp-platform/k8sapp_platform/k8sapp_platform/helm/rbd_provisioner.py
index 91c6cae..c463770 100644
--- a/python-k8sapp-platform/k8sapp_platform/k8sapp_platform/helm/rbd_provisioner.py
+++ b/python-k8sapp-platform/k8sapp_platform/k8sapp_platform/helm/rbd_provisioner.py
@@ -14,10 +14,11 @@ from sysinv.helm import base
 from sysinv.helm import common
 
 
-class RbdProvisionerHelm(base.BaseHelm):
+class RbdProvisionerHelm(base.FluxCDBaseHelm):
     """Class to encapsulate helm operations for the rbd-provisioner chart"""
 
     CHART = app_constants.HELM_CHART_RBD_PROVISIONER
+    HELM_RELEASE = app_constants.FLUXCD_HELMRELEASE_RBD_PROVISIONER
     SUPPORTED_NAMESPACES = base.BaseHelm.SUPPORTED_NAMESPACES + \
         [common.HELM_NS_RBD_PROVISIONER]
     SUPPORTED_APP_NAMESPACES = {
@@ -42,7 +43,7 @@ class RbdProvisionerHelm(base.BaseHelm):
         # by the user
         if not self._is_enabled(operator.APP, self.CHART,
                                 common.HELM_NS_RBD_PROVISIONER):
-            operator.helm_release_resource_delete(self.CHART)
+            operator.helm_release_resource_delete(self.HELM_RELEASE)
 
     def get_overrides(self, namespace=None):