diff --git a/centos_build_layer.cfg b/centos_build_layer.cfg
deleted file mode 100644
index c581999..0000000
--- a/centos_build_layer.cfg
+++ /dev/null
@@ -1 +0,0 @@
-flock
diff --git a/centos_iso_image.inc b/centos_iso_image.inc
deleted file mode 100644
index e69de29..0000000
diff --git a/centos_pkg_dirs b/centos_pkg_dirs
deleted file mode 100644
index 70e2240..0000000
--- a/centos_pkg_dirs
+++ /dev/null
@@ -1 +0,0 @@
-stx-sdo-helm
diff --git a/stx-sdo-helm/centos/build_srpm.data b/stx-sdo-helm/centos/build_srpm.data
deleted file mode 100644
index 157a923..0000000
--- a/stx-sdo-helm/centos/build_srpm.data
+++ /dev/null
@@ -1,3 +0,0 @@
-SRC_DIR="stx-sdo-helm"
-
-TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/stx-sdo-helm/centos/stx-sdo-helm.spec b/stx-sdo-helm/centos/stx-sdo-helm.spec
deleted file mode 100644
index 95c37b1..0000000
--- a/stx-sdo-helm/centos/stx-sdo-helm.spec
+++ /dev/null
@@ -1,60 +0,0 @@
-%global helm_folder  /usr/lib/helm
-%global armada_folder  /usr/lib/armada
-%global app_folder  /usr/lib/application
-%global toolkit_version 0.2.19
-%global helmchart_version 0.1.0
-
-Summary: StarlingX SDO Application Helm charts
-Name: stx-sdo-helm
-Version: 1.0
-Release: %{tis_patch_ver}%{?_tis_dist}
-License: Apache-2.0
-Group: base
-Packager: Intel
-URL: unknown
-
-Source0: %{name}-%{version}.tar.gz
-
-BuildArch: noarch
-
-BuildRequires: helm
-BuildRequires: chartmuseum
-BuildRequires: openstack-helm-infra
-
-%description
-StarlingX SDO Application Helm charts
-
-%prep
-%setup
-
-%build
-# Stage helm-toolkit in the local repo
-cp %{helm_folder}/helm-toolkit-%{toolkit_version}.tgz helm-charts/
-
-# Host a server for the charts
-chartmuseum --debug --port=8879 --context-path='/charts' --storage="local" --storage-local-rootdir="./helm-charts" &
-sleep 2
-helm repo add local http://localhost:8879/charts
-
-# Make the charts. These produce a tgz file
-cd helm-charts
-make sdo
-cd -
-
-# terminate helm server (the last backgrounded task)
-kill %1
-
-%install
-# helm_folder is created by openstack-helm-infra
-install -d -m 755 ${RPM_BUILD_ROOT}%{app_folder}
-install -p -D -m 755 files/metadata.yaml ${RPM_BUILD_ROOT}%{app_folder}
-install -d -m 755 ${RPM_BUILD_ROOT}%{helm_folder}
-install -p -D -m 755 helm-charts/*.tgz ${RPM_BUILD_ROOT}%{helm_folder}
-install -d -m 755 ${RPM_BUILD_ROOT}%{armada_folder}
-install -p -D -m 755 manifests/*.yaml ${RPM_BUILD_ROOT}%{armada_folder}
-
-%files
-%defattr(-,root,root,-)
-%{helm_folder}/*
-%{armada_folder}/*
-%{app_folder}/*
diff --git a/stx-sdo-helm/debian/deb_folder/control b/stx-sdo-helm/debian/deb_folder/control
index d6e608f..ae0e090 100644
--- a/stx-sdo-helm/debian/deb_folder/control
+++ b/stx-sdo-helm/debian/deb_folder/control
@@ -5,8 +5,7 @@ Maintainer: StarlingX Developers <starlingx-discuss@lists.starlingx.io>
 Build-Depends: debhelper-compat (= 13),
  chartmuseum,
  helm,
- openstack-helm-infra,
- procps
+ procps,
 Standards-Version: 4.1.2
 Homepage: https://www.starlingx.io
 
diff --git a/stx-sdo-helm/debian/deb_folder/rules b/stx-sdo-helm/debian/deb_folder/rules
index 0a074af..47348da 100755
--- a/stx-sdo-helm/debian/deb_folder/rules
+++ b/stx-sdo-helm/debian/deb_folder/rules
@@ -4,37 +4,26 @@
 
 export ROOT = debian/tmp
 export APP_FOLDER = $(ROOT)/usr/lib/application
-export ARMADA_FOLDER = $(ROOT)/usr/lib/armada
 export HELM_FOLDER = $(ROOT)/usr/lib/helm
-export TOOLKIT_VERSION = 0.2.19
 
 
 %:
 	dh $@
 
 override_dh_auto_build:
-
-	# Stage helm-toolkit in the local repo
-	cp /usr/lib/helm/helm-toolkit-$(TOOLKIT_VERSION).tgz helm-charts/
-
 	# Host a server for the charts
 	chartmuseum --debug --port=8879 --context-path='/charts' --storage="local" --storage-local-rootdir="./helm-charts" &
 	sleep 2
 	helm repo add local http://localhost:8879/charts
-
 	# Create the TGZ file.
 	cd helm-charts && make
-
 	# Terminate the helm chart server.
 	pkill chartmuseum
 
 override_dh_auto_install:
-
 	# helm_folder is created by openstack-helm-infra
 	install -d -m 755 $(APP_FOLDER)
 	install -p -D -m 755 files/metadata.yaml $(APP_FOLDER)
 	install -d -m 755 $(HELM_FOLDER)
 	install -p -D -m 755 helm-charts/*.tgz $(HELM_FOLDER)
-	install -d -m 755 $(ARMADA_FOLDER)
-	install -p -D -m 755 manifests/*.yaml $(ARMADA_FOLDER)
 
diff --git a/stx-sdo-helm/debian/deb_folder/stx-sdo-helm.install b/stx-sdo-helm/debian/deb_folder/stx-sdo-helm.install
index 937608f..facedda 100644
--- a/stx-sdo-helm/debian/deb_folder/stx-sdo-helm.install
+++ b/stx-sdo-helm/debian/deb_folder/stx-sdo-helm.install
@@ -1,3 +1,2 @@
 usr/lib/helm/* /usr/lib/helm
-usr/lib/armada/* /usr/lib/armada
 usr/lib/application/* /usr/lib/application