diff --git a/centos_iso_image.inc b/centos_iso_image.inc
index 1ec8f04..3f4c479 100644
--- a/centos_iso_image.inc
+++ b/centos_iso_image.inc
@@ -1,2 +1 @@
 stx-nginx-ingress-controller-helm
-stx-nginx-ingress-controller-helm-fluxcd
diff --git a/python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/helm/ingress_nginx.py b/python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/helm/ingress_nginx.py
index 9af9b1d..30a6676 100644
--- a/python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/helm/ingress_nginx.py
+++ b/python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/helm/ingress_nginx.py
@@ -38,7 +38,8 @@ class IngressNginxHelm(base.BaseHelm):
                             ip_family
                         ]
                     }
-                }
+                },
+                'fullnameOverride': 'ic-nginx-ingress-ingress-nginx'
             }
         }
 
diff --git a/python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/setup.cfg b/python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/setup.cfg
index 5027460..4eabf26 100644
--- a/python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/setup.cfg
+++ b/python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/setup.cfg
@@ -30,7 +30,7 @@ setup-hooks =
 
 [entry_points]
 systemconfig.helm_applications =
-    inginx-ingress-controller = systemconfig.helm_plugins.nginx_ingress_controller
+    nginx-ingress-controller = systemconfig.helm_plugins.nginx_ingress_controller
 
 systemconfig.helm_plugins.nginx_ingress_controller =
     001_ingress-nginx = k8sapp_nginx_ingress_controller.helm.ingress_nginx:IngressNginxHelm
diff --git a/stx-nginx-ingress-controller-helm/centos/stx-nginx-ingress-controller-helm.spec b/stx-nginx-ingress-controller-helm/centos/stx-nginx-ingress-controller-helm.spec
index 2f6d6c4..1693ed5 100644
--- a/stx-nginx-ingress-controller-helm/centos/stx-nginx-ingress-controller-helm.spec
+++ b/stx-nginx-ingress-controller-helm/centos/stx-nginx-ingress-controller-helm.spec
@@ -13,7 +13,8 @@
 %global helm_folder /usr/lib/helm
 %global toolkit_version 0.1.0
 
-Summary: StarlingX Nginx Ingress Controller Application Armada Helm Charts
+Summary: StarlingX Nginx Ingress Controller Application FluxCD Helm Charts
+#StarlingX Nginx Ingress Controller Application Armada Helm Charts
 Name: stx-nginx-ingress-controller-helm
 Version: 1.1
 Release: %{tis_patch_ver}%{?_tis_dist}
@@ -37,10 +38,10 @@ Source7: kustomization.yaml
 Source8: base_helmrepository.yaml
 Source9: base_kustomization.yaml
 Source10: base_namespace.yaml
-Source11: nginx-ingress_helmrelease.yaml
-Source12: nginx-ingress_kustomization.yaml
-Source13: nginx-ingress_nginx-ingress-static-overrides.yaml
-Source14: nginx-ingress_nginx-ingress-system-overrides.yaml
+Source11: ingress-nginx_helmrelease.yaml
+Source12: ingress-nginx_kustomization.yaml
+Source13: ingress-nginx_ingress-nginx-static-overrides.yaml
+Source14: ingress-nginx_ingress-nginx-system-overrides.yaml
 
 BuildArch: noarch
 
@@ -53,14 +54,6 @@ BuildRequires: python-k8sapp-nginx-ingress-controller
 BuildRequires: python-k8sapp-nginx-ingress-controller-wheels
 
 %description
-StarlingX Nginx Ingress Controller Application Armada Helm Charts
-
-%package fluxcd
-Summary: StarlingX Nginx Ingress Controller Application FluxCD Helm Charts
-Group: base
-License: Apache-2.0
-
-%description fluxcd
 StarlingX Nginx Ingress Controller Application FluxCD Helm Charts
 
 %prep
@@ -99,8 +92,7 @@ kill %1
 
 # Create a chart tarball compliant with sysinv kube-app.py
 %define app_staging %{_builddir}/staging
-%define app_tarball_armada %{app_name}-%{version}-%{tis_patch_ver}.tgz
-%define app_tarball_fluxcd %{app_name}-fluxcd-%{version}-%{tis_patch_ver}.tgz
+%define app_tarball_fluxcd %{app_name}-%{version}-%{tis_patch_ver}.tgz
 
 # Setup staging
 mkdir -p %{app_staging}
@@ -121,10 +113,6 @@ 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
 
-# package armada
-find . -type f ! -name '*.md5' -print0 | xargs -0 md5sum > checksum.md5
-tar -zcf %{_builddir}/%{app_tarball_armada} -C %{app_staging}/ .
-
 # package fluxcd
 rm -f %{app_staging}/nginx_ingress_controller_manifest.yaml
 rm -f %{app_staging}/charts/*.tgz
@@ -134,7 +122,7 @@ fluxcd_dest=%{app_staging}/fluxcd-manifests
 mkdir -p $fluxcd_dest
 cp %{SOURCE7} %{app_staging}/fluxcd-manifests
 cd %{_sourcedir}
-directories="base nginx-ingress"
+directories="base ingress-nginx"
 for dir in $directories;
 do
   mkdir -p $dir
@@ -154,13 +142,8 @@ rm -fr %{app_staging}
 
 %install
 install -d -m 755 %{buildroot}/%{app_folder}
-install -p -D -m 755 %{_builddir}/%{app_tarball_armada} %{buildroot}/%{app_folder}
 install -p -D -m 755 %{_builddir}/%{app_tarball_fluxcd} %{buildroot}/%{app_folder}
 
 %files
 %defattr(-,root,root,-)
-%{app_folder}/%{app_tarball_armada}
-
-%files fluxcd
-%defattr(-,root,root,-)
 %{app_folder}/%{app_tarball_fluxcd}
diff --git a/stx-nginx-ingress-controller-helm/stx-nginx-ingress-controller-helm/fluxcd-manifests/nginx-ingress_helmrelease.yaml b/stx-nginx-ingress-controller-helm/stx-nginx-ingress-controller-helm/fluxcd-manifests/ingress-nginx_helmrelease.yaml
similarity index 64%
rename from stx-nginx-ingress-controller-helm/stx-nginx-ingress-controller-helm/fluxcd-manifests/nginx-ingress_helmrelease.yaml
rename to stx-nginx-ingress-controller-helm/stx-nginx-ingress-controller-helm/fluxcd-manifests/ingress-nginx_helmrelease.yaml
index b1388c4..41f3b57 100644
--- a/stx-nginx-ingress-controller-helm/stx-nginx-ingress-controller-helm/fluxcd-manifests/nginx-ingress_helmrelease.yaml
+++ b/stx-nginx-ingress-controller-helm/stx-nginx-ingress-controller-helm/fluxcd-manifests/ingress-nginx_helmrelease.yaml
@@ -7,11 +7,11 @@
 apiVersion: "helm.toolkit.fluxcd.io/v2beta1"
 kind: HelmRelease
 metadata:
-  name: nginx-ingress
+  name: ingress-nginx
   labels:
-    chart_group: nginx-ingress
+    chart_group: ingress-nginx
 spec:
-  releaseName: ic-nginx-ingress
+  releaseName: ic-ingress-nginx
   chart:
     spec:
       chart: ingress-nginx
@@ -29,8 +29,8 @@ spec:
     disableHooks: false
   valuesFrom:
     - kind: Secret
-      name: nginx-ingress-static-overrides
-      valuesKey: nginx-ingress-static-overrides.yaml
+      name: ingress-nginx-static-overrides
+      valuesKey: ingress-nginx-static-overrides.yaml
     - kind: Secret
-      name: nginx-ingress-system-overrides
-      valuesKey: nginx-ingress-system-overrides.yaml
+      name: ingress-nginx-system-overrides
+      valuesKey: ingress-nginx-system-overrides.yaml
diff --git a/stx-nginx-ingress-controller-helm/stx-nginx-ingress-controller-helm/fluxcd-manifests/nginx-ingress_nginx-ingress-static-overrides.yaml b/stx-nginx-ingress-controller-helm/stx-nginx-ingress-controller-helm/fluxcd-manifests/ingress-nginx_ingress-nginx-static-overrides.yaml
similarity index 100%
rename from stx-nginx-ingress-controller-helm/stx-nginx-ingress-controller-helm/fluxcd-manifests/nginx-ingress_nginx-ingress-static-overrides.yaml
rename to stx-nginx-ingress-controller-helm/stx-nginx-ingress-controller-helm/fluxcd-manifests/ingress-nginx_ingress-nginx-static-overrides.yaml
diff --git a/stx-nginx-ingress-controller-helm/stx-nginx-ingress-controller-helm/fluxcd-manifests/nginx-ingress_nginx-ingress-system-overrides.yaml b/stx-nginx-ingress-controller-helm/stx-nginx-ingress-controller-helm/fluxcd-manifests/ingress-nginx_ingress-nginx-system-overrides.yaml
similarity index 100%
rename from stx-nginx-ingress-controller-helm/stx-nginx-ingress-controller-helm/fluxcd-manifests/nginx-ingress_nginx-ingress-system-overrides.yaml
rename to stx-nginx-ingress-controller-helm/stx-nginx-ingress-controller-helm/fluxcd-manifests/ingress-nginx_ingress-nginx-system-overrides.yaml
diff --git a/stx-nginx-ingress-controller-helm/stx-nginx-ingress-controller-helm/fluxcd-manifests/nginx-ingress_kustomization.yaml b/stx-nginx-ingress-controller-helm/stx-nginx-ingress-controller-helm/fluxcd-manifests/ingress-nginx_kustomization.yaml
similarity index 57%
rename from stx-nginx-ingress-controller-helm/stx-nginx-ingress-controller-helm/fluxcd-manifests/nginx-ingress_kustomization.yaml
rename to stx-nginx-ingress-controller-helm/stx-nginx-ingress-controller-helm/fluxcd-manifests/ingress-nginx_kustomization.yaml
index 1a57922..96e17b4 100644
--- a/stx-nginx-ingress-controller-helm/stx-nginx-ingress-controller-helm/fluxcd-manifests/nginx-ingress_kustomization.yaml
+++ b/stx-nginx-ingress-controller-helm/stx-nginx-ingress-controller-helm/fluxcd-manifests/ingress-nginx_kustomization.yaml
@@ -8,11 +8,11 @@ namespace: kube-system
 resources:
   - helmrelease.yaml
 secretGenerator:
-  - name: nginx-ingress-static-overrides
+  - name: ingress-nginx-static-overrides
     files:
-      - nginx-ingress-static-overrides.yaml
-  - name: nginx-ingress-system-overrides
+      - ingress-nginx-static-overrides.yaml
+  - name: ingress-nginx-system-overrides
     files:
-      - nginx-ingress-system-overrides.yaml
+      - ingress-nginx-system-overrides.yaml
 generatorOptions:
   disableNameSuffixHash: true
diff --git a/stx-nginx-ingress-controller-helm/stx-nginx-ingress-controller-helm/fluxcd-manifests/kustomization.yaml b/stx-nginx-ingress-controller-helm/stx-nginx-ingress-controller-helm/fluxcd-manifests/kustomization.yaml
index 1d865fd..62d7cef 100644
--- a/stx-nginx-ingress-controller-helm/stx-nginx-ingress-controller-helm/fluxcd-manifests/kustomization.yaml
+++ b/stx-nginx-ingress-controller-helm/stx-nginx-ingress-controller-helm/fluxcd-manifests/kustomization.yaml
@@ -9,4 +9,4 @@ kind: Kustomization
 namespace: kube-system
 resources:
   - base
-  - nginx-ingress
+  - ingress-nginx