diff --git a/stx-platform-helm/centos/build_srpm.data b/stx-platform-helm/centos/build_srpm.data
index 510045e..88352da 100644
--- a/stx-platform-helm/centos/build_srpm.data
+++ b/stx-platform-helm/centos/build_srpm.data
@@ -1,8 +1,7 @@
 SRC_DIR="stx-platform-helm"
 
 COPY_LIST_TO_TAR="\
-$PKG_BASE/../../../helm-charts/node-feature-discovery \
-$PKG_BASE/../../../helm-charts/rbd-provisioner  \
-$PKG_BASE/../../../helm-charts/ceph-pools-audit"
+    $STX_BASE/helm-charts/node-feature-discovery/node-feature-discovery/helm-charts \
+"
 
 TIS_PATCH_VER=7
diff --git a/stx-platform-helm/centos/stx-platform-helm.spec b/stx-platform-helm/centos/stx-platform-helm.spec
index 7e1b8b9..1774a3d 100644
--- a/stx-platform-helm/centos/stx-platform-helm.spec
+++ b/stx-platform-helm/centos/stx-platform-helm.spec
@@ -52,7 +52,7 @@ cp files/repositories.yaml %{helm_home}/repository/repositories.yaml
 cp files/index.yaml %{helm_home}/repository/local/index.yaml
 
 # Stage helm-toolkit in the local repo
-cp  %{helm_folder}/helm-toolkit-%{toolkit_version}.tgz .
+cp  %{helm_folder}/helm-toolkit-%{toolkit_version}.tgz helm-charts/
 
 # Host a server for the charts
 helm serve --repo-path . &
@@ -60,9 +60,11 @@ helm repo rm local
 helm repo add local http://localhost:8879/charts
 
 # Make the charts. These produce a tgz file
+cd helm-charts
 make rbd-provisioner
 make ceph-pools-audit
 make node-feature-discovery 
+cd -
 
 # Terminate helm server (the last backgrounded task)
 kill %1
@@ -76,7 +78,7 @@ mkdir -p %{app_staging}
 cp files/metadata.yaml %{app_staging}
 cp manifests/manifest.yaml %{app_staging}
 mkdir -p %{app_staging}/charts
-cp *.tgz %{app_staging}/charts
+cp helm-charts/*.tgz %{app_staging}/charts
 cd %{app_staging}
 
 # Populate metadata
@@ -95,7 +97,7 @@ rm -fr %{app_staging}
 install -d -m 755 %{buildroot}/%{app_folder}
 install -p -D -m 755 %{_builddir}/%{app_tarball} %{buildroot}/%{app_folder}
 install -d -m 755 ${RPM_BUILD_ROOT}/opt/extracharts
-install -p -D -m 755 node-feature-discovery-*.tgz ${RPM_BUILD_ROOT}/opt/extracharts
+install -p -D -m 755 helm-charts/node-feature-discovery-*.tgz ${RPM_BUILD_ROOT}/opt/extracharts
 
 %files
 %defattr(-,root,root,-)
diff --git a/stx-platform-helm/stx-platform-helm/Makefile b/stx-platform-helm/stx-platform-helm/helm-charts/Makefile
similarity index 100%
rename from stx-platform-helm/stx-platform-helm/Makefile
rename to stx-platform-helm/stx-platform-helm/helm-charts/Makefile