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_helm.inc b/centos_helm.inc
deleted file mode 100644
index 05f06c8..0000000
--- a/centos_helm.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-# Packages used by build-helm-charts.sh
-stx-monitor-helm
diff --git a/centos_pkg_dirs b/centos_pkg_dirs
deleted file mode 100644
index 6894369..0000000
--- a/centos_pkg_dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-monitor-helm
-monitor-helm-elastic
-stx-monitor-helm
diff --git a/centos_pkg_dirs_containers b/centos_pkg_dirs_containers
deleted file mode 100644
index 8f9266d..0000000
--- a/centos_pkg_dirs_containers
+++ /dev/null
@@ -1 +0,0 @@
-stx-monitor-helm
diff --git a/centos_tarball-dl.lst b/centos_tarball-dl.lst
deleted file mode 100644
index 732664d..0000000
--- a/centos_tarball-dl.lst
+++ /dev/null
@@ -1,2 +0,0 @@
-helm-charts-92b6289ae93816717a8453cfe62bad51cbdb8ad0.tar.gz#helm-charts#https://github.com/helm/charts/archive/92b6289ae93816717a8453cfe62bad51cbdb8ad0.tar.gz#http##
-helm-charts-elastic-945017287598479ba8653d9baf3ff26f7fe31e50.tar.gz#helm-charts-elastic#https://github.com/elastic/helm-charts/archive/945017287598479ba8653d9baf3ff26f7fe31e50.tar.gz#http##
diff --git a/monitor-helm-elastic/centos/build_srpm.data b/monitor-helm-elastic/centos/build_srpm.data
deleted file mode 100644
index 679925b..0000000
--- a/monitor-helm-elastic/centos/build_srpm.data
+++ /dev/null
@@ -1,8 +0,0 @@
-TAR_NAME=helm-charts-elastic
-SHA=945017287598479ba8653d9baf3ff26f7fe31e50
-VERSION=1.0.0
-TAR="$TAR_NAME-$SHA.tar.gz"
-
-COPY_LIST="${CGCS_BASE}/downloads/$TAR $PKG_BASE/files/* "
-
-TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/monitor-helm-elastic/centos/monitor-helm-elastic.spec b/monitor-helm-elastic/centos/monitor-helm-elastic.spec
deleted file mode 100644
index 3fc5ab2..0000000
--- a/monitor-helm-elastic/centos/monitor-helm-elastic.spec
+++ /dev/null
@@ -1,80 +0,0 @@
-%global sha 945017287598479ba8653d9baf3ff26f7fe31e50
-%global helm_folder  /usr/lib/helm
-%global helmchart_version 0.1.0
-%global _default_patch_flags --no-backup-if-mismatch --prefix=/tmp/junk
-
-Summary: Monitor-Helm-Elastic charts
-Name: monitor-helm-elastic
-Version: 1.0
-Release: %{tis_patch_ver}%{?_tis_dist}
-License: Apache-2.0
-Group: base
-Packager: Wind River <info@windriver.com>
-URL: https://github.com/elastic/helm-charts/
-
-Source0: helm-charts-elastic-%{sha}.tar.gz
-Source1: repositories.yaml
-Source2: index.yaml
-
-BuildArch:     noarch
-
-Patch01: 0001-add-makefile.patch
-Patch02: 0002-use-oss-image.patch
-Patch03: 0003-set-initial-masters-to-master-0.patch
-Patch04: 0004-Update-Elastic-Apps-to-7.6.0-Releases.patch
-Patch05: 0005-readiness-probe-enhancements.patch
-Patch06: 0006-Metricbeat-nodeSelector-and-tolerations-config.patch
-Patch07: 0007-Add-command-and-args-parameters-to-beats-and-logstash.patch
-Patch08: 0008-Add-updateStrategy-parameter-to-beats-config.patch
-Patch10: 0010-Fix-esConfig-checksum-annotation.patch
-Patch11: 0011-Fix-Elasticsearch-readiness-probe-http-endpoint.patch
-Patch12: 0012-Add-logstash-ingress.patch
-
-BuildRequires: helm
-BuildRequires: chartmuseum
-
-%description
-Monitor Helm elasticsearch charts
-
-%prep
-%setup -n %(tar tf %SOURCE0 | head -1)
-%patch01 -p1
-%patch02 -p1
-%patch03 -p1
-%patch04 -p1
-%patch05 -p1
-%patch06 -p1
-%patch07 -p1
-%patch08 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-
-%build
-# Host a server for the charts
-chartmuseum --debug --port=8879 --context-path='/charts' --storage="local" --storage-local-rootdir="." &
-sleep 2
-helm repo add local http://localhost:8879/charts
-
-# Create the tgz files
-rm elasticsearch/Makefile
-rm kibana/Makefile
-rm filebeat/Makefile
-rm metricbeat/Makefile
-rm logstash/Makefile
-make elasticsearch
-make kibana
-make filebeat
-make metricbeat
-make logstash
-
-# terminate helm server (the last backgrounded task)
-kill %1
-
-%install
-install -d -m 755 ${RPM_BUILD_ROOT}%{helm_folder}
-install -p -D -m 755 *.tgz ${RPM_BUILD_ROOT}%{helm_folder}
-
-%files
-%defattr(-,root,root,-)
-%{helm_folder}/*
diff --git a/monitor-helm/centos/build_srpm.data b/monitor-helm/centos/build_srpm.data
deleted file mode 100644
index 8fe6d1d..0000000
--- a/monitor-helm/centos/build_srpm.data
+++ /dev/null
@@ -1,8 +0,0 @@
-TAR_NAME=helm-charts
-SHA=92b6289ae93816717a8453cfe62bad51cbdb8ad0
-VERSION=1.0.0
-TAR="$TAR_NAME-$SHA.tar.gz"
-
-COPY_LIST="${CGCS_BASE}/downloads/$TAR $PKG_BASE/files/* "
-
-TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/monitor-helm/centos/monitor-helm.spec b/monitor-helm/centos/monitor-helm.spec
deleted file mode 100644
index 269a941..0000000
--- a/monitor-helm/centos/monitor-helm.spec
+++ /dev/null
@@ -1,88 +0,0 @@
-%global sha 92b6289ae93816717a8453cfe62bad51cbdb8ad0
-%global helm_folder  /usr/lib/helm
-%global helmchart_version 0.1.0
-%global _default_patch_flags --no-backup-if-mismatch --prefix=/tmp/junk
-
-Summary: Monitor-Helm charts
-Name: monitor-helm
-Version: 1.0
-Release: %{tis_patch_ver}%{?_tis_dist}
-License: Apache-2.0
-Group: base
-Packager: Wind River <info@windriver.com>
-URL: https://github.com/helm/charts/
-
-Source0: helm-charts-%{sha}.tar.gz
-Source1: repositories.yaml
-Source2: index.yaml
-
-BuildArch:     noarch
-
-Patch01: 0001-Add-Makefile-for-helm-charts.patch
-Patch02: 0002-kibana-workaround-checksum-for-configmap.yaml.patch
-Patch03: 0003-helm-chart-changes-for-stx-monitor.patch
-Patch04: 0004-ipv6-helm-chart-changes.patch
-Patch05: 0005-decouple-config.patch
-Patch06: 0006-add-system-info.patch
-Patch07: 0007-three-masters.patch
-Patch08: 0008-Update-stx-monitor-for-kubernetes-API-1.16.patch
-Patch09: 0009-add-curator-as-of-2019-10-10.patch
-Patch10: 0010-Update-kube-state-metrics-1.8.0-to-commit-09daf19.patch
-Patch11: 0011-update-init-container-env-to-include-node-name.patch
-Patch12: 0012-Add-imagePullSecrets.patch
-Patch13: 0013-removed-unused-images.patch
-Patch14: 0014-Add-rbac-replicasets-to-apps-apigroup-commit-1717e2d.patch
-Patch15: 0015-script-flexibility.patch
-Patch16: 0016-use-main-container-image-for-initcontainer.patch
-Patch17: 0017-stable-nginx-ingress-allow-nodePort-for-tcp-udp-serv.patch
-Patch18: 0018-Update-nginx-ingress-chart-for-Helm-v3.patch
-
-BuildRequires: helm
-BuildRequires: chartmuseum
-
-%description
-Monitor Helm charts
-
-%prep
-%setup -n %(tar tf %SOURCE0 | head -1)
-%patch01 -p1
-%patch02 -p1
-%patch03 -p1
-%patch04 -p1
-%patch05 -p1
-%patch06 -p1
-%patch07 -p1
-%patch08 -p1
-%patch09 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-
-%build
-# Host a server for the charts
-chartmuseum --debug --port=8879 --context-path='/charts' --storage="local" --storage-local-rootdir="." &
-sleep 2
-helm repo add local http://localhost:8879/charts
-
-# Create the tgz files
-cd stable
-make kube-state-metrics
-make nginx-ingress
-make elasticsearch-curator
-
-# terminate helm server (the last backgrounded task)
-kill %1
-
-%install
-install -d -m 755 ${RPM_BUILD_ROOT}%{helm_folder}
-install -p -D -m 755 stable/*.tgz ${RPM_BUILD_ROOT}%{helm_folder}
-
-%files
-%defattr(-,root,root,-)
-%{helm_folder}/*
diff --git a/stx-monitor-helm/centos/build_srpm.data b/stx-monitor-helm/centos/build_srpm.data
deleted file mode 100644
index d7da56b..0000000
--- a/stx-monitor-helm/centos/build_srpm.data
+++ /dev/null
@@ -1,6 +0,0 @@
-SRC_DIR="stx-monitor-helm"
-# This version is used as a component of the stx-monitor application
-# version. Any change to this version must also be reflected in the
-# SUPPORTED_VERSIONS list in sysinv/helm/monitor_version_check.py
-#
-TIS_PATCH_VER=PKG_GITREVCOUNT
diff --git a/stx-monitor-helm/centos/stx-monitor-helm.spec b/stx-monitor-helm/centos/stx-monitor-helm.spec
deleted file mode 100644
index 681adf1..0000000
--- a/stx-monitor-helm/centos/stx-monitor-helm.spec
+++ /dev/null
@@ -1,36 +0,0 @@
-%global armada_folder  /usr/lib/armada
-%global app_folder  /usr/lib/application
-
-Summary: StarlingX Monitor Application Armada Helm Charts
-Name: stx-monitor-helm
-Version: 1.0
-Release: %{tis_patch_ver}%{?_tis_dist}
-License: Apache-2.0
-Group: base
-Packager: Wind River <info@windriver.com>
-URL: unknown
-
-Source0: %{name}-%{version}.tar.gz
-
-BuildArch: noarch
-BuildRequires: monitor-helm
-BuildRequires: monitor-helm-elastic
-Requires: monitor-helm
-Requires: monitor-helm-elastic
-
-%description
-StarlingX Monitor Application Armada Helm Charts
-
-%prep
-%setup
-
-%install
-install -d -m 755 ${RPM_BUILD_ROOT}%{armada_folder}
-install -p -D -m 755 manifests/*.yaml ${RPM_BUILD_ROOT}%{armada_folder}
-install -d -m 755 ${RPM_BUILD_ROOT}%{app_folder}
-install -p -D -m 755 files/metadata.yaml ${RPM_BUILD_ROOT}%{app_folder}
-
-%files
-%defattr(-,root,root,-)
-%{armada_folder}/*
-%{app_folder}/*