diff --git a/.zuul.yaml b/.zuul.yaml
index 643d27e..3df6b7a 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -33,9 +33,9 @@
       - starlingx/utilities
       - starlingx/root
     files:
-      - python-k8sapp-platform/*
+      - python3-k8sapp-platform/*
     vars:
-      tox_extra_args: -c python-k8sapp-platform/k8sapp_platform/tox.ini
+      tox_extra_args: -c python3-k8sapp-platform/k8sapp_platform/tox.ini
       tox_constraints_file: '{{ ansible_user_dir }}/src/opendev.org/starlingx/root/build-tools/requirements/debian/upper-constraints.txt'
 
 - job:
@@ -45,10 +45,10 @@
       Run flake8 test for k8sapp_platform
     nodeset: debian-bullseye
     files:
-      - python-k8sapp-platform/*
+      - python3-k8sapp-platform/*
     vars:
       tox_envlist: flake8
-      tox_extra_args: -c python-k8sapp-platform/k8sapp_platform/tox.ini
+      tox_extra_args: -c python3-k8sapp-platform/k8sapp_platform/tox.ini
 
 - job:
     name: k8sapp-platform-tox-pylint
@@ -63,10 +63,10 @@
       - starlingx/utilities
       - starlingx/root
     files:
-      - python-k8sapp-platform/*
+      - python3-k8sapp-platform/*
     vars:
       tox_envlist: pylint
-      tox_extra_args: -c python-k8sapp-platform/k8sapp_platform/tox.ini
+      tox_extra_args: -c python3-k8sapp-platform/k8sapp_platform/tox.ini
       tox_constraints_file: '{{ ansible_user_dir }}/src/opendev.org/starlingx/root/build-tools/requirements/debian/upper-constraints.txt'
 
 - job:
@@ -76,10 +76,10 @@
       Run bandit test for k8sapp_platform
     nodeset: debian-bullseye
     files:
-      - python-k8sapp-platform/*
+      - python3-k8sapp-platform/*
     vars:
       tox_envlist: bandit
-      tox_extra_args: -c python-k8sapp-platform/k8sapp_platform/tox.ini
+      tox_extra_args: -c python3-k8sapp-platform/k8sapp_platform/tox.ini
 
 - job:
     name: stx-platform-armada-app-upload-git-mirror
diff --git a/debian_pkg_dirs b/debian_pkg_dirs
index cdd78ad..dceef59 100644
--- a/debian_pkg_dirs
+++ b/debian_pkg_dirs
@@ -1,3 +1,3 @@
-python-k8sapp-platform
+platform-helm
+python3-k8sapp-platform
 stx-platform-helm
-platform-helm
\ No newline at end of file
diff --git a/python-k8sapp-platform/debian/deb_folder/python3-k8sapp-platform-wheels.install b/python-k8sapp-platform/debian/deb_folder/python3-k8sapp-platform-wheels.install
deleted file mode 100644
index a3ad79d..0000000
--- a/python-k8sapp-platform/debian/deb_folder/python3-k8sapp-platform-wheels.install
+++ /dev/null
@@ -1 +0,0 @@
-plugins/platform-integ-apps/*.whl
diff --git a/python-k8sapp-platform/debian/deb_folder/python3-k8sapp-platform.install b/python-k8sapp-platform/debian/deb_folder/python3-k8sapp-platform.install
deleted file mode 100644
index 58bf9a2..0000000
--- a/python-k8sapp-platform/debian/deb_folder/python3-k8sapp-platform.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/python3/dist-packages/k8sapp_platform-*.egg-info/*
-usr/lib/python3/dist-packages/k8sapp_platform/*
diff --git a/python-k8sapp-platform/debian/deb_folder/changelog b/python3-k8sapp-platform/debian/deb_folder/changelog
similarity index 100%
rename from python-k8sapp-platform/debian/deb_folder/changelog
rename to python3-k8sapp-platform/debian/deb_folder/changelog
diff --git a/python-k8sapp-platform/debian/deb_folder/control b/python3-k8sapp-platform/debian/deb_folder/control
similarity index 100%
rename from python-k8sapp-platform/debian/deb_folder/control
rename to python3-k8sapp-platform/debian/deb_folder/control
diff --git a/python-k8sapp-platform/debian/deb_folder/copyright b/python3-k8sapp-platform/debian/deb_folder/copyright
similarity index 100%
rename from python-k8sapp-platform/debian/deb_folder/copyright
rename to python3-k8sapp-platform/debian/deb_folder/copyright
diff --git a/python3-k8sapp-platform/debian/deb_folder/python3-k8sapp-platform-wheels.install b/python3-k8sapp-platform/debian/deb_folder/python3-k8sapp-platform-wheels.install
new file mode 100644
index 0000000..19a9e4c
--- /dev/null
+++ b/python3-k8sapp-platform/debian/deb_folder/python3-k8sapp-platform-wheels.install
@@ -0,0 +1 @@
+plugins/*.whl
diff --git a/python3-k8sapp-platform/debian/deb_folder/python3-k8sapp-platform.install b/python3-k8sapp-platform/debian/deb_folder/python3-k8sapp-platform.install
new file mode 100644
index 0000000..91d1d9d
--- /dev/null
+++ b/python3-k8sapp-platform/debian/deb_folder/python3-k8sapp-platform.install
@@ -0,0 +1 @@
+usr/lib/python3/dist-packages/k8sapp_*
diff --git a/python-k8sapp-platform/debian/deb_folder/rules b/python3-k8sapp-platform/debian/deb_folder/rules
similarity index 55%
rename from python-k8sapp-platform/debian/deb_folder/rules
rename to python3-k8sapp-platform/debian/deb_folder/rules
index a912e34..8fc01a7 100755
--- a/python-k8sapp-platform/debian/deb_folder/rules
+++ b/python3-k8sapp-platform/debian/deb_folder/rules
@@ -1,31 +1,33 @@
 #!/usr/bin/make -f
 # export DH_VERBOSE = 1
 
-export APP_NAME=platform-integ-apps
+export APP_NAME = platform-integ-apps
+export PYBUILD_NAME = k8sapp-platform
 
 export DEB_VERSION = $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
 export MAJOR = $(shell echo $(DEB_VERSION) | cut -f 1 -d '-')
 export MINOR_PATCH = $(shell echo $(DEB_VERSION) | cut -f 4 -d '.')
-export PBR_VERSION=$(MAJOR).$(MINOR_PATCH)
+export PBR_VERSION = $(MAJOR).$(MINOR_PATCH)
 
-export PYBUILD_NAME=k8sapp-platform
-export SKIP_PIP_INSTALL=1
-export ROOT=debian/tmp
+export ROOT = $(CURDIR)/debian/tmp
+export SKIP_PIP_INSTALL = 1
 
 %:
 	dh $@ --with=python3 --buildsystem=pybuild
 
 override_dh_auto_install:
-	python3 setup.py install --install-layout=deb --root $(ROOT)
+	env | sort
+
+	python3 setup.py install \
+	    --install-layout=deb \
+		--root $(ROOT)
+
 	python3 setup.py bdist_wheel \
 		--universal \
-		-d $(ROOT)/plugins/$(APP_NAME)
+		-d $(ROOT)/plugins
 
 override_dh_python3:
 	dh_python3 --shebang=/usr/bin/python3
 
-ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 override_dh_auto_test:
-	# (tbogue) FIXME
-	PYTHONDIR=$(CURDIR) stestr run || true
-endif
+	PYTHONDIR=$(CURDIR) stestr run
diff --git a/python-k8sapp-platform/debian/deb_folder/source/format b/python3-k8sapp-platform/debian/deb_folder/source/format
similarity index 100%
rename from python-k8sapp-platform/debian/deb_folder/source/format
rename to python3-k8sapp-platform/debian/deb_folder/source/format
diff --git a/python-k8sapp-platform/debian/meta_data.yaml b/python3-k8sapp-platform/debian/meta_data.yaml
similarity index 74%
rename from python-k8sapp-platform/debian/meta_data.yaml
rename to python3-k8sapp-platform/debian/meta_data.yaml
index 0922688..70da051 100644
--- a/python-k8sapp-platform/debian/meta_data.yaml
+++ b/python3-k8sapp-platform/debian/meta_data.yaml
@@ -5,5 +5,5 @@ src_path: k8sapp_platform
 revision:
   dist: $STX_DIST
   GITREVCOUNT:
-    BASE_SRCREV: c608f2aaa92064b712e7076e4141a162b78fe995
     SRC_DIR: ${MY_REPO}/stx/platform-armada-app
+    BASE_SRCREV: 301e310b67f608c309a34c7431848f680e2ea827
diff --git a/python-k8sapp-platform/k8sapp_platform/.gitignore b/python3-k8sapp-platform/k8sapp_platform/.gitignore
similarity index 100%
rename from python-k8sapp-platform/k8sapp_platform/.gitignore
rename to python3-k8sapp-platform/k8sapp_platform/.gitignore
diff --git a/python-k8sapp-platform/k8sapp_platform/.stestr.conf b/python3-k8sapp-platform/k8sapp_platform/.stestr.conf
similarity index 100%
rename from python-k8sapp-platform/k8sapp_platform/.stestr.conf
rename to python3-k8sapp-platform/k8sapp_platform/.stestr.conf
diff --git a/python-k8sapp-platform/k8sapp_platform/LICENSE b/python3-k8sapp-platform/k8sapp_platform/LICENSE
similarity index 100%
rename from python-k8sapp-platform/k8sapp_platform/LICENSE
rename to python3-k8sapp-platform/k8sapp_platform/LICENSE
diff --git a/python-k8sapp-platform/k8sapp_platform/README.rst b/python3-k8sapp-platform/k8sapp_platform/README.rst
similarity index 100%
rename from python-k8sapp-platform/k8sapp_platform/README.rst
rename to python3-k8sapp-platform/k8sapp_platform/README.rst
diff --git a/python-k8sapp-platform/k8sapp_platform/k8sapp_platform/__init__.py b/python3-k8sapp-platform/k8sapp_platform/k8sapp_platform/__init__.py
similarity index 100%
rename from python-k8sapp-platform/k8sapp_platform/k8sapp_platform/__init__.py
rename to python3-k8sapp-platform/k8sapp_platform/k8sapp_platform/__init__.py
diff --git a/python-k8sapp-platform/k8sapp_platform/k8sapp_platform/common/__init__.py b/python3-k8sapp-platform/k8sapp_platform/k8sapp_platform/common/__init__.py
similarity index 100%
rename from python-k8sapp-platform/k8sapp_platform/k8sapp_platform/common/__init__.py
rename to python3-k8sapp-platform/k8sapp_platform/k8sapp_platform/common/__init__.py
diff --git a/python-k8sapp-platform/k8sapp_platform/k8sapp_platform/common/constants.py b/python3-k8sapp-platform/k8sapp_platform/k8sapp_platform/common/constants.py
similarity index 100%
rename from python-k8sapp-platform/k8sapp_platform/k8sapp_platform/common/constants.py
rename to python3-k8sapp-platform/k8sapp_platform/k8sapp_platform/common/constants.py
diff --git a/python-k8sapp-platform/k8sapp_platform/k8sapp_platform/helm/__init__.py b/python3-k8sapp-platform/k8sapp_platform/k8sapp_platform/helm/__init__.py
similarity index 100%
rename from python-k8sapp-platform/k8sapp_platform/k8sapp_platform/helm/__init__.py
rename to python3-k8sapp-platform/k8sapp_platform/k8sapp_platform/helm/__init__.py
diff --git a/python-k8sapp-platform/k8sapp_platform/k8sapp_platform/helm/ceph_fs_provisioner.py b/python3-k8sapp-platform/k8sapp_platform/k8sapp_platform/helm/ceph_fs_provisioner.py
similarity index 100%
rename from python-k8sapp-platform/k8sapp_platform/k8sapp_platform/helm/ceph_fs_provisioner.py
rename to python3-k8sapp-platform/k8sapp_platform/k8sapp_platform/helm/ceph_fs_provisioner.py
diff --git a/python-k8sapp-platform/k8sapp_platform/k8sapp_platform/helm/ceph_pools_audit.py b/python3-k8sapp-platform/k8sapp_platform/k8sapp_platform/helm/ceph_pools_audit.py
similarity index 100%
rename from python-k8sapp-platform/k8sapp_platform/k8sapp_platform/helm/ceph_pools_audit.py
rename to python3-k8sapp-platform/k8sapp_platform/k8sapp_platform/helm/ceph_pools_audit.py
diff --git a/python-k8sapp-platform/k8sapp_platform/k8sapp_platform/helm/rbd_provisioner.py b/python3-k8sapp-platform/k8sapp_platform/k8sapp_platform/helm/rbd_provisioner.py
similarity index 100%
rename from python-k8sapp-platform/k8sapp_platform/k8sapp_platform/helm/rbd_provisioner.py
rename to python3-k8sapp-platform/k8sapp_platform/k8sapp_platform/helm/rbd_provisioner.py
diff --git a/python-k8sapp-platform/k8sapp_platform/k8sapp_platform/kustomize/__init__.py b/python3-k8sapp-platform/k8sapp_platform/k8sapp_platform/kustomize/__init__.py
similarity index 100%
rename from python-k8sapp-platform/k8sapp_platform/k8sapp_platform/kustomize/__init__.py
rename to python3-k8sapp-platform/k8sapp_platform/k8sapp_platform/kustomize/__init__.py
diff --git a/python-k8sapp-platform/k8sapp_platform/k8sapp_platform/kustomize/kustomize_platform.py b/python3-k8sapp-platform/k8sapp_platform/k8sapp_platform/kustomize/kustomize_platform.py
similarity index 100%
rename from python-k8sapp-platform/k8sapp_platform/k8sapp_platform/kustomize/kustomize_platform.py
rename to python3-k8sapp-platform/k8sapp_platform/k8sapp_platform/kustomize/kustomize_platform.py
diff --git a/python-k8sapp-platform/k8sapp_platform/k8sapp_platform/lifecycle/__init__.py b/python3-k8sapp-platform/k8sapp_platform/k8sapp_platform/lifecycle/__init__.py
similarity index 100%
rename from python-k8sapp-platform/k8sapp_platform/k8sapp_platform/lifecycle/__init__.py
rename to python3-k8sapp-platform/k8sapp_platform/k8sapp_platform/lifecycle/__init__.py
diff --git a/python-k8sapp-platform/k8sapp_platform/k8sapp_platform/lifecycle/lifecycle_platform.py b/python3-k8sapp-platform/k8sapp_platform/k8sapp_platform/lifecycle/lifecycle_platform.py
similarity index 100%
rename from python-k8sapp-platform/k8sapp_platform/k8sapp_platform/lifecycle/lifecycle_platform.py
rename to python3-k8sapp-platform/k8sapp_platform/k8sapp_platform/lifecycle/lifecycle_platform.py
diff --git a/python-k8sapp-platform/k8sapp_platform/k8sapp_platform/tests/__init__.py b/python3-k8sapp-platform/k8sapp_platform/k8sapp_platform/tests/__init__.py
similarity index 100%
rename from python-k8sapp-platform/k8sapp_platform/k8sapp_platform/tests/__init__.py
rename to python3-k8sapp-platform/k8sapp_platform/k8sapp_platform/tests/__init__.py
diff --git a/python-k8sapp-platform/k8sapp_platform/k8sapp_platform/tests/test_plugins.py b/python3-k8sapp-platform/k8sapp_platform/k8sapp_platform/tests/test_plugins.py
similarity index 100%
rename from python-k8sapp-platform/k8sapp_platform/k8sapp_platform/tests/test_plugins.py
rename to python3-k8sapp-platform/k8sapp_platform/k8sapp_platform/tests/test_plugins.py
diff --git a/python-k8sapp-platform/k8sapp_platform/pylint.rc b/python3-k8sapp-platform/k8sapp_platform/pylint.rc
similarity index 100%
rename from python-k8sapp-platform/k8sapp_platform/pylint.rc
rename to python3-k8sapp-platform/k8sapp_platform/pylint.rc
diff --git a/python-k8sapp-platform/k8sapp_platform/requirements.txt b/python3-k8sapp-platform/k8sapp_platform/requirements.txt
similarity index 100%
rename from python-k8sapp-platform/k8sapp_platform/requirements.txt
rename to python3-k8sapp-platform/k8sapp_platform/requirements.txt
diff --git a/python-k8sapp-platform/k8sapp_platform/setup.cfg b/python3-k8sapp-platform/k8sapp_platform/setup.cfg
similarity index 99%
rename from python-k8sapp-platform/k8sapp_platform/setup.cfg
rename to python3-k8sapp-platform/k8sapp_platform/setup.cfg
index 71304dd..08b4796 100644
--- a/python-k8sapp-platform/k8sapp_platform/setup.cfg
+++ b/python3-k8sapp-platform/k8sapp_platform/setup.cfg
@@ -41,5 +41,5 @@ systemconfig.fluxcd.kustomize_ops =
 systemconfig.app_lifecycle =
     platform-integ-apps = k8sapp_platform.lifecycle.lifecycle_platform:PlatformAppLifecycleOperator
 
-[wheel]
+[bdist_wheel]
 universal = 1
diff --git a/python-k8sapp-platform/k8sapp_platform/setup.py b/python3-k8sapp-platform/k8sapp_platform/setup.py
similarity index 100%
rename from python-k8sapp-platform/k8sapp_platform/setup.py
rename to python3-k8sapp-platform/k8sapp_platform/setup.py
diff --git a/python-k8sapp-platform/k8sapp_platform/test-requirements.txt b/python3-k8sapp-platform/k8sapp_platform/test-requirements.txt
similarity index 100%
rename from python-k8sapp-platform/k8sapp_platform/test-requirements.txt
rename to python3-k8sapp-platform/k8sapp_platform/test-requirements.txt
diff --git a/python-k8sapp-platform/k8sapp_platform/tox.ini b/python3-k8sapp-platform/k8sapp_platform/tox.ini
similarity index 100%
rename from python-k8sapp-platform/k8sapp_platform/tox.ini
rename to python3-k8sapp-platform/k8sapp_platform/tox.ini
diff --git a/python-k8sapp-platform/k8sapp_platform/upper-constraints.txt b/python3-k8sapp-platform/k8sapp_platform/upper-constraints.txt
similarity index 100%
rename from python-k8sapp-platform/k8sapp_platform/upper-constraints.txt
rename to python3-k8sapp-platform/k8sapp_platform/upper-constraints.txt
diff --git a/stx-platform-helm/debian/deb_folder/rules b/stx-platform-helm/debian/deb_folder/rules
index a12e6c8..5a8d547 100755
--- a/stx-platform-helm/debian/deb_folder/rules
+++ b/stx-platform-helm/debian/deb_folder/rules
@@ -39,7 +39,7 @@ override_dh_auto_build:
 
 	# Copy the plugins: installed in the buildroot
 	mkdir -p $(STAGING_FLUXCD)/plugins
-	cp /plugins/$(APP_NAME)/*.whl $(STAGING_FLUXCD)/plugins
+	cp /plugins/*.whl $(STAGING_FLUXCD)/plugins
 
 	# Create the app package.
 	cd $(STAGING_FLUXCD) && find . -type f ! -name '*.md5' -print0 | xargs -0 md5sum > checksum.md5
diff --git a/stx-platform-helm/debian/meta_data.yaml b/stx-platform-helm/debian/meta_data.yaml
index 1cf881d..dc330af 100644
--- a/stx-platform-helm/debian/meta_data.yaml
+++ b/stx-platform-helm/debian/meta_data.yaml
@@ -7,5 +7,5 @@ src_files:
 revision:
   dist: $STX_DIST
   GITREVCOUNT:
-    BASE_SRCREV: c608f2aaa92064b712e7076e4141a162b78fe995
     SRC_DIR: ${MY_REPO}/stx/platform-armada-app
+    BASE_SRCREV: 301e310b67f608c309a34c7431848f680e2ea827