diff --git a/centos_iso_image.inc b/centos_iso_image.inc
index 0f31907..b6438ac 100644
--- a/centos_iso_image.inc
+++ b/centos_iso_image.inc
@@ -1,2 +1 @@
 stx-snmp-helm
-stx-snmp-helm-fluxcd
diff --git a/stx-snmp-helm/centos/stx-snmp-helm.spec b/stx-snmp-helm/centos/stx-snmp-helm.spec
index b1c7f1f..6cbeb8a 100644
--- a/stx-snmp-helm/centos/stx-snmp-helm.spec
+++ b/stx-snmp-helm/centos/stx-snmp-helm.spec
@@ -31,14 +31,6 @@ BuildRequires: python-k8sapp-snmp-wheels
 %description
 StarlingX SNMP Helm Charts
 
-%package fluxcd
-Summary: StarlingX SNMP FluxCD Helm Charts
-Group: base
-License: Apache-2.0
-
-%description fluxcd
-StarlingX SNMP FluxCD Helm Charts
-
 %prep
 %setup -n helm-charts-snmp-0-1-0-1.0.0
 
@@ -46,14 +38,11 @@ StarlingX SNMP FluxCD Helm Charts
 
 cd helm-charts
 make
-
-# switch back to source root
 cd -
 
 # Create a chart tarball compliant with sysinv kube-app.py
 %define app_staging %{_builddir}/staging
 %define app_tarball %{app_name}-%{version}-%{tis_patch_ver}.tgz
-%define app_tarball_fluxcd %{app_name}-fluxcd-%{version}-%{tis_patch_ver}.tgz
 
 # Setup staging
 mkdir -p %{app_staging}
@@ -61,9 +50,9 @@ cp files/metadata.yaml %{app_staging}
 cp manifests/*.yaml %{app_staging}
 mkdir -p %{app_staging}/charts
 cp helm-charts/*.tgz %{app_staging}/charts
+cd %{app_staging}
 
 # Populate metadata
-cd %{app_staging}
 sed -i 's/@APP_NAME@/%{app_name}/g' %{app_staging}/metadata.yaml
 sed -i 's/@APP_VERSION@/%{version}-%{tis_patch_ver}/g' %{app_staging}/metadata.yaml
 sed -i 's/@HELM_REPO@/%{helm_repo}/g' %{app_staging}/metadata.yaml
@@ -72,27 +61,9 @@ sed -i 's/@HELM_REPO@/%{helm_repo}/g' %{app_staging}/metadata.yaml
 mkdir -p %{app_staging}/plugins
 cp /plugins/%{app_name}/*.whl %{app_staging}/plugins
 
-# calculate checksum of all files in app_staging
-find . -type f ! -name '*.md5' -print0 | xargs -0 md5sum > checksum.md5
 # package it up
-tar -zcf %{_builddir}/%{app_tarball} -C %{app_staging}/ .
-
-# switch back to source root
-cd -
-
-# Prepare app_staging for fluxcd package
-rm -f %{app_staging}/snmp_manifest.yaml
-
-cp -R fluxcd-manifests %{app_staging}/
-
-# calculate checksum of all files in app_staging
-cd %{app_staging}
 find . -type f ! -name '*.md5' -print0 | xargs -0 md5sum > checksum.md5
-# package fluxcd app
-tar -zcf %{_builddir}/%{app_tarball_fluxcd} -C %{app_staging}/ .
-
-# switch back to source root
-cd -
+tar -zcf %{_builddir}/%{app_tarball} -C %{app_staging}/ .
 
 # Cleanup staging
 rm -fr %{app_staging}
@@ -100,9 +71,7 @@ rm -fr %{app_staging}
 %install
 install -d -m 755 %{buildroot}/%{app_folder}
 install -p -D -m 755 %{_builddir}/%{app_tarball} %{buildroot}/%{app_folder}
-install -p -D -m 755 %{_builddir}/%{app_tarball_fluxcd} %{buildroot}/%{app_folder}
 
 %files
 %defattr(-,root,root,-)
-%{app_folder}/%{app_tarball}
-%{app_folder}/%{app_tarball_fluxcd}
+%{app_folder}/*
diff --git a/stx-snmp-helm/stx-snmp-helm/fluxcd-manifests/base/helmrepository.yaml b/stx-snmp-helm/stx-snmp-helm/fluxcd-manifests/base/helmrepository.yaml
deleted file mode 100644
index 4c4adfe..0000000
--- a/stx-snmp-helm/stx-snmp-helm/fluxcd-manifests/base/helmrepository.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Copyright (c) 2022 Wind River Systems, Inc.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-apiVersion: source.toolkit.fluxcd.io/v1beta1
-kind: HelmRepository
-metadata:
-  name: stx-platform
-spec:
-  url: http://192.168.206.1:8080/helm_charts/stx-platform
-  interval: 60m
diff --git a/stx-snmp-helm/stx-snmp-helm/fluxcd-manifests/base/kustomization.yaml b/stx-snmp-helm/stx-snmp-helm/fluxcd-manifests/base/kustomization.yaml
deleted file mode 100644
index c0f37cd..0000000
--- a/stx-snmp-helm/stx-snmp-helm/fluxcd-manifests/base/kustomization.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Copyright (c) 2022 Wind River Systems, Inc.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-resources:
-  - helmrepository.yaml
diff --git a/stx-snmp-helm/stx-snmp-helm/fluxcd-manifests/base/namespace.yaml b/stx-snmp-helm/stx-snmp-helm/fluxcd-manifests/base/namespace.yaml
deleted file mode 100644
index 6726614..0000000
--- a/stx-snmp-helm/stx-snmp-helm/fluxcd-manifests/base/namespace.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Copyright (c) 2022 Wind River Systems, Inc.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: kube-system
diff --git a/stx-snmp-helm/stx-snmp-helm/fluxcd-manifests/kustomization.yaml b/stx-snmp-helm/stx-snmp-helm/fluxcd-manifests/kustomization.yaml
deleted file mode 100644
index 17a8e54..0000000
--- a/stx-snmp-helm/stx-snmp-helm/fluxcd-manifests/kustomization.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Copyright (c) 2022 Wind River Systems, Inc.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-namespace: kube-system
-resources:
-  - base
-  - snmp
diff --git a/stx-snmp-helm/stx-snmp-helm/fluxcd-manifests/snmp/helmrelease.yaml b/stx-snmp-helm/stx-snmp-helm/fluxcd-manifests/snmp/helmrelease.yaml
deleted file mode 100644
index d4eb411..0000000
--- a/stx-snmp-helm/stx-snmp-helm/fluxcd-manifests/snmp/helmrelease.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Copyright (c) 2022 Wind River Systems, Inc.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-apiVersion: "helm.toolkit.fluxcd.io/v2beta1"
-kind: HelmRelease
-metadata:
-  name: snmp
-  labels:
-    chart_group: snmp
-spec:
-  releaseName: ns-snmp
-  chart:
-    spec:
-      chart: snmp
-      version: 1.0.0
-      sourceRef:
-        kind: HelmRepository
-        name: stx-platform
-  interval: 5m
-  timeout: 30m
-  test:
-    enable: false
-  install:
-    disableHooks: false
-  upgrade:
-    disableHooks: false
-  valuesFrom:
-    - kind: Secret
-      name: snmp-static-overrides
-      valuesKey: snmp-static-overrides.yaml
-    - kind: Secret
-      name: snmp-system-overrides
-      valuesKey: snmp-system-overrides.yaml
diff --git a/stx-snmp-helm/stx-snmp-helm/fluxcd-manifests/snmp/kustomization.yaml b/stx-snmp-helm/stx-snmp-helm/fluxcd-manifests/snmp/kustomization.yaml
deleted file mode 100644
index 293b18d..0000000
--- a/stx-snmp-helm/stx-snmp-helm/fluxcd-manifests/snmp/kustomization.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Copyright (c) 2022 Wind River Systems, Inc.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-namespace: kube-system
-resources:
-  - helmrelease.yaml
-secretGenerator:
-  - name: snmp-static-overrides
-    files:
-      - snmp-static-overrides.yaml
-  - name: snmp-system-overrides
-    files:
-      - snmp-system-overrides.yaml
-generatorOptions:
-  disableNameSuffixHash: true
diff --git a/stx-snmp-helm/stx-snmp-helm/fluxcd-manifests/snmp/snmp-static-overrides.yaml b/stx-snmp-helm/stx-snmp-helm/fluxcd-manifests/snmp/snmp-static-overrides.yaml
deleted file mode 100644
index 7e93270..0000000
--- a/stx-snmp-helm/stx-snmp-helm/fluxcd-manifests/snmp/snmp-static-overrides.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2022 Wind River Systems, Inc.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
diff --git a/stx-snmp-helm/stx-snmp-helm/fluxcd-manifests/snmp/snmp-system-overrides.yaml b/stx-snmp-helm/stx-snmp-helm/fluxcd-manifests/snmp/snmp-system-overrides.yaml
deleted file mode 100644
index 7e93270..0000000
--- a/stx-snmp-helm/stx-snmp-helm/fluxcd-manifests/snmp/snmp-system-overrides.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2022 Wind River Systems, Inc.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-