diff --git a/.zuul.yaml b/.zuul.yaml
index 9e15dbd3..1f85c9e4 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -30,11 +30,11 @@
       - starlingx/update
       - starlingx/utilities
     files:
-        - python-k8sapp-openstack/k8sapp_openstack/*
+        - python3-k8sapp-openstack/k8sapp_openstack/*
     vars:
         tox_envlist: py36
         python_version: 3.6
-        tox_extra_args: -c python-k8sapp-openstack/k8sapp_openstack/tox.ini
+        tox_extra_args: -c python3-k8sapp-openstack/k8sapp_openstack/tox.ini
 - job:
     name: k8sapp-openstack-tox-py39
     parent: tox-py39
@@ -47,11 +47,11 @@
       - starlingx/update
       - starlingx/utilities
     files:
-        - python-k8sapp-openstack/k8sapp_openstack/*
+        - python3-k8sapp-openstack/k8sapp_openstack/*
     vars:
         tox_envlist: py39
         python_version: 3.9
-        tox_extra_args: -c python-k8sapp-openstack/k8sapp_openstack/tox.ini
+        tox_extra_args: -c python3-k8sapp-openstack/k8sapp_openstack/tox.ini
 - job:
     name: stx-openstack-armada-app-upload-git-mirror
     parent: upload-git-mirror
@@ -76,10 +76,10 @@
       - starlingx/update
       - starlingx/utilities
     files:
-      - python-k8sapp-openstack/*
+      - python3-k8sapp-openstack/*
     vars:
       tox_envlist: pylint
-      tox_extra_args: -c python-k8sapp-openstack/k8sapp_openstack/tox.ini
+      tox_extra_args: -c python3-k8sapp-openstack/k8sapp_openstack/tox.ini
 
 - job:
     name: k8sapp-openstack-tox-pep8
@@ -93,10 +93,10 @@
       - starlingx/update
       - starlingx/utilities
     files:
-      - python-k8sapp-openstack/*
+      - python3-k8sapp-openstack/*
     vars:
       tox_envlist: pep8
-      tox_extra_args: -c python-k8sapp-openstack/k8sapp_openstack/tox.ini
+      tox_extra_args: -c python3-k8sapp-openstack/k8sapp_openstack/tox.ini
 
 - secret:
     name: stx-openstack-armada-app-github-secret
diff --git a/centos_build_layer.cfg b/centos_build_layer.cfg
deleted file mode 100644
index c581999f..00000000
--- 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 26d41a6c..00000000
--- a/centos_helm.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-# Packages used by build-helm-charts.sh
-stx-openstack-helm-fluxcd
diff --git a/centos_pkg_dirs b/centos_pkg_dirs
deleted file mode 100644
index b78e96f3..00000000
--- a/centos_pkg_dirs
+++ /dev/null
@@ -1,5 +0,0 @@
-openstack-helm
-openstack-helm-infra
-stx-openstack-helm
-stx-openstack-helm-fluxcd
-python-k8sapp-openstack
diff --git a/centos_pkg_dirs_containers b/centos_pkg_dirs_containers
deleted file mode 100644
index 857a5c27..00000000
--- a/centos_pkg_dirs_containers
+++ /dev/null
@@ -1,4 +0,0 @@
-openstack-helm
-openstack-helm-infra
-stx-openstack-helm
-stx-openstack-helm-fluxcd
diff --git a/centos_tarball-dl.lst b/centos_tarball-dl.lst
deleted file mode 100644
index ab95f687..00000000
--- a/centos_tarball-dl.lst
+++ /dev/null
@@ -1,2 +0,0 @@
-openstack-helm-7803000a545687ec40b0ddc41d46a6b377dea45f.tar.gz#openstack-helm#https://github.com/openstack/openstack-helm/archive/7803000a545687ec40b0ddc41d46a6b377dea45f.tar.gz#http##
-openstack-helm-infra-8351fdd0f1228717342c2accc96977b0cdc36dc3.tar.gz#openstack-helm-infra#https://github.com/openstack/openstack-helm-infra/archive/8351fdd0f1228717342c2accc96977b0cdc36dc3.tar.gz#http##
diff --git a/debian_pkg_dirs b/debian_pkg_dirs
index d1a9b0c4..24746786 100644
--- a/debian_pkg_dirs
+++ b/debian_pkg_dirs
@@ -1,5 +1,5 @@
 openstack-helm
 openstack-helm-infra
-python-k8sapp-openstack
+python3-k8sapp-openstack
 stx-openstack-helm
 stx-openstack-helm-fluxcd
diff --git a/openstack-helm-infra/centos/build_srpm.data b/openstack-helm-infra/centos/build_srpm.data
deleted file mode 100644
index 8ab77c9a..00000000
--- a/openstack-helm-infra/centos/build_srpm.data
+++ /dev/null
@@ -1,8 +0,0 @@
-TAR_NAME=openstack-helm-infra
-SHA=8351fdd0f1228717342c2accc96977b0cdc36dc3
-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/openstack-helm-infra/centos/openstack-helm-infra.spec b/openstack-helm-infra/centos/openstack-helm-infra.spec
deleted file mode 100644
index 09ded074..00000000
--- a/openstack-helm-infra/centos/openstack-helm-infra.spec
+++ /dev/null
@@ -1,91 +0,0 @@
-%global sha 8351fdd0f1228717342c2accc96977b0cdc36dc3
-%global helm_folder  /usr/lib/helm
-
-Summary: Openstack-Helm-Infra charts
-Name: openstack-helm-infra
-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/openstack/openstack-helm-infra
-
-Source0: %{name}-%{sha}.tar.gz
-Source1: repositories.yaml
-
-BuildArch:     noarch
-
-Patch01: 0001-Add-imagePullSecrets-in-service-account.patch
-Patch03: 0003-Partial-revert-of-31e3469d28858d7b5eb6355e88b6f49fd6.patch
-Patch04: 0004-Fix-pod-restarts-on-all-workers-when-worker-added-re.patch
-Patch05: 0005-Add-io_thread_pool-for-rabbitmq.patch
-Patch06: 0006-Enable-override-of-rabbitmq-probe-parameters.patch
-Patch09: 0009-Enable-override-of-mariadb-server-probe-parameters.patch
-Patch11: 0011-Add-mariadb-database-config-override-to-support-ipv6.patch
-Patch12: 0012-enable-Values.conf.database.config_override-for-mari.patch
-Patch13: 0013-Allow-set-public-endpoint-url-for-all-openstack-types.patch
-Patch17: 0017-Enable-taint-toleration-for-Openstack-services.patch
-Patch18: 0018-Add-GaleraDB-Secure-Replica-Traffic.patch
-Patch19: 0019-Add-force_boot-command-to-rabbit-start-template.patch
-Patch20: 0020-Fix-tls-in-openstack-helm-infra.patch
-Patch21: 0021-Remove-mariadb-tls.patch
-Patch22: 0022-Remove-rabbitmq-tls.patch
-Patch23: 0023-Update-RabbitMQ-probes.patch
-Patch24: 0024-Update-openstack-Ingress-for-networking-api-v1.patch
-Patch25: 0025-Update-templates-syntax-for-fluxcd-helm-v3.patch
-
-BuildRequires: helm
-BuildRequires: chartmuseum
-
-%description
-Openstack Helm Infra charts
-
-%prep
-%setup -n openstack-helm-infra
-%patch01 -p1
-%patch03 -p1
-%patch04 -p1
-%patch05 -p1
-%patch06 -p1
-%patch09 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
-%patch25 -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
-
-# Make the charts. These produce tgz files
-make helm-toolkit
-make gnocchi
-make ingress
-make libvirt
-make mariadb
-make memcached
-make openvswitch
-make rabbitmq
-make ceph-rgw
-
-# 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
-%dir %attr(0755,root,root) %{helm_folder}
-%defattr(-,root,root,-)
-%{helm_folder}/*
diff --git a/openstack-helm/centos/build_srpm.data b/openstack-helm/centos/build_srpm.data
deleted file mode 100644
index 05a384aa..00000000
--- a/openstack-helm/centos/build_srpm.data
+++ /dev/null
@@ -1,8 +0,0 @@
-TAR_NAME=openstack-helm
-SHA=7803000a545687ec40b0ddc41d46a6b377dea45f
-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/openstack-helm/centos/openstack-helm.spec b/openstack-helm/centos/openstack-helm.spec
deleted file mode 100644
index 199b6fe2..00000000
--- a/openstack-helm/centos/openstack-helm.spec
+++ /dev/null
@@ -1,110 +0,0 @@
-%global sha 7803000a545687ec40b0ddc41d46a6b377dea45f
-%global helm_folder  /usr/lib/helm
-%global toolkit_version 0.2.19
-%global helmchart_version 0.1.0
-%global _default_patch_flags --no-backup-if-mismatch --prefix=/tmp/junk
-
-Summary: Openstack-Helm charts
-Name: openstack-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/openstack/openstack-helm
-
-Source0: %{name}-%{sha}.tar.gz
-Source1: repositories.yaml
-Source2: index.yaml
-
-BuildArch:     noarch
-
-Patch01: 0001-Remove-stale-Apache2-service-pids-when-a-POD-starts.patch
-Patch02: 0002-Nova-console-ip-address-search-optionality.patch
-Patch03: 0003-Nova-chart-Support-ephemeral-pool-creation.patch
-Patch04: 0004-Support-ingress-creation-for-keystone-admin-endpoint.patch
-Patch05: 0005-Allow-set-public-endpoint-url-for-keystone-endpoints.patch
-Patch06: 0006-Wrong-usage-of-rbd_store_chunk_size.patch
-Patch07: 0007-Add-stx_admin-account.patch
-Patch09: 0009-Add-flavor-extra-spec-hw-pci_irq_affinity_mask.patch
-Patch10: 0010-Enable-taint-toleration-for-Openstack-services.patch
-Patch11: 0011-Fix-nova-compute-ssh-init-to-execute-as-runAsUser.patch
-Patch12: 0012-Replace-deprecated-Nova-VNC-configurations.patch
-Patch13: 0013-Remove-TLS-from-openstack-services.patch
-Patch14: 0014-Remove-mariadb-and-rabbit-tls.patch
-Patch15: 0015-Decrease-terminationGracePeriodSeconds-on-glance-api.patch
-Patch16: 0016-Update-RBAC-authorization-api-to-v1.patch
-Patch17: 0017-Fixing-cinder-helm-release-hooks-weights-helmv3.patch
-Patch18: 0018-Fixing-placement-helm-release-hooks.patch
-Patch19: 0019-Fixing-nova-helm-release-hooks-and-weights.patch
-Patch20: 0020-Fixing-keystone-helm-release-hooks-and-weights.patch
-
-BuildRequires: helm
-BuildRequires: openstack-helm-infra
-BuildRequires: chartmuseum
-Requires: openstack-helm-infra
-
-%description
-Openstack Helm charts
-
-%prep
-%setup -n openstack-helm
-%patch01 -p1
-%patch02 -p1
-%patch03 -p1
-%patch04 -p1
-%patch05 -p1
-%patch06 -p1
-%patch07 -p1
-%patch09 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-
-%build
-# Stage helm-toolkit in the local repo
-cp %{helm_folder}/helm-toolkit-%{toolkit_version}.tgz .
-
-# 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
-
-# Make the charts. These produce a tgz file
-make aodh
-make barbican
-make ceilometer
-make cinder
-make glance
-make heat
-make horizon
-make ironic
-make keystone
-make magnum
-make neutron
-make nova
-make placement
-
-# terminate helm server (the last backgrounded task)
-kill %1
-
-# Remove the helm-toolkit tarball
-rm helm-toolkit-%{toolkit_version}.tgz
-
-%install
-# helm_folder is created by openstack-helm-infra
-install -d -m 755 ${RPM_BUILD_ROOT}%{helm_folder}
-install -p -D -m 755 *.tgz ${RPM_BUILD_ROOT}%{helm_folder}
-
-%files
-#helm_folder is owned by openstack-helm-infra
-%defattr(-,root,root,-)
-%{helm_folder}/*
diff --git a/python-k8sapp-openstack/centos/build_srpm.data b/python-k8sapp-openstack/centos/build_srpm.data
deleted file mode 100644
index f4d2c658..00000000
--- a/python-k8sapp-openstack/centos/build_srpm.data
+++ /dev/null
@@ -1,9 +0,0 @@
-SRC_DIR="k8sapp_openstack"
-
-# Bump the version by the previous version value prior to decoupling as this
-# will align the GITREVCOUNT value to increment the version by one. Remove this
-# (i.e. reset to 0) on then next major version changes when TIS_BASE_SRCREV
-# changes. This version should align with the version of the helm charts in
-# stx-openstack-helm
-TIS_BASE_SRCREV=8d3452a5e864339101590e542c24c375bb3808fb
-TIS_PATCH_VER=GITREVCOUNT+20
diff --git a/python-k8sapp-openstack/centos/python-k8sapp-openstack.spec b/python-k8sapp-openstack/centos/python-k8sapp-openstack.spec
deleted file mode 100644
index 5ee0a119..00000000
--- a/python-k8sapp-openstack/centos/python-k8sapp-openstack.spec
+++ /dev/null
@@ -1,56 +0,0 @@
-%global pypi_name k8sapp-openstack
-%global sname k8sapp_openstack
-
-Name:           python-%{pypi_name}
-Version:        1.0
-Release:        %{tis_patch_ver}%{?_tis_dist}
-Summary:        StarlingX sysinv extensions: Openstack K8S app
-
-License:        Apache-2.0
-Source0:        %{name}-%{version}.tar.gz
-
-BuildArch:      noarch
-
-BuildRequires: python-setuptools
-BuildRequires: python-pbr
-BuildRequires: python2-pip
-BuildRequires: python2-wheel
-
-%description
-StarlingX sysinv extensions: Openstack K8S app
-
-%prep
-%setup
-# Remove bundled egg-info
-rm -rf %{pypi_name}.egg-info
-
-%build
-export PBR_VERSION=%{version}
-%{__python2} setup.py build
-
-%py2_build_wheel
-
-%install
-export PBR_VERSION=%{version}.%{tis_patch_ver}
-export SKIP_PIP_INSTALL=1
-%{__python2} setup.py install --skip-build --root %{buildroot}
-mkdir -p ${RPM_BUILD_ROOT}/plugins
-install -m 644 dist/*.whl ${RPM_BUILD_ROOT}/plugins/
-
-%files
-%{python2_sitelib}/%{sname}
-%{python2_sitelib}/%{sname}-*.egg-info
-
-%package wheels
-Summary: %{name} wheels
-
-%description wheels
-Contains python wheels for %{name}
-
-%files wheels
-/plugins/*
-
-
-%changelog
-* Wed Sep 20 2019 Robert Church <robert.church@windriver.com>
-- Initial version
diff --git a/python-k8sapp-openstack/debian/deb_folder/python3-k8sapp-openstack.install b/python-k8sapp-openstack/debian/deb_folder/python3-k8sapp-openstack.install
deleted file mode 100644
index e8bdd3aa..00000000
--- a/python-k8sapp-openstack/debian/deb_folder/python3-k8sapp-openstack.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/python3/dist-packages/k8sapp_openstack-1.0.0.egg-info/*
-usr/lib/python3/dist-packages/k8sapp_openstack/*
diff --git a/python-k8sapp-openstack/debian/deb_folder/rules b/python-k8sapp-openstack/debian/deb_folder/rules
deleted file mode 100755
index 8b48dca9..00000000
--- a/python-k8sapp-openstack/debian/deb_folder/rules
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/make -f
-# export DH_VERBOSE = 1
-
-export APP_NAME=k8sapp-openstack
-export PBR_VERSION=1.0.0
-export PYBUILD_NAME=k8sapp-openstack
-export SKIP_PIP_INSTALL=1
-export ROOT=debian/tmp
-
-%:
-	dh $@ --with=python3 --buildsystem=pybuild
-
-override_dh_auto_install:
-	python3 setup.py install --install-layout=deb --root $(ROOT)
-	python3 setup.py bdist_wheel \
-		--universal \
-		-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
diff --git a/python-k8sapp-openstack/debian/deb_folder/changelog b/python3-k8sapp-openstack/debian/deb_folder/changelog
similarity index 100%
rename from python-k8sapp-openstack/debian/deb_folder/changelog
rename to python3-k8sapp-openstack/debian/deb_folder/changelog
diff --git a/python-k8sapp-openstack/debian/deb_folder/control b/python3-k8sapp-openstack/debian/deb_folder/control
similarity index 100%
rename from python-k8sapp-openstack/debian/deb_folder/control
rename to python3-k8sapp-openstack/debian/deb_folder/control
diff --git a/python-k8sapp-openstack/debian/deb_folder/copyright b/python3-k8sapp-openstack/debian/deb_folder/copyright
similarity index 100%
rename from python-k8sapp-openstack/debian/deb_folder/copyright
rename to python3-k8sapp-openstack/debian/deb_folder/copyright
diff --git a/python-k8sapp-openstack/debian/deb_folder/python3-k8sapp-openstack-wheels.install b/python3-k8sapp-openstack/debian/deb_folder/python3-k8sapp-openstack-wheels.install
similarity index 100%
rename from python-k8sapp-openstack/debian/deb_folder/python3-k8sapp-openstack-wheels.install
rename to python3-k8sapp-openstack/debian/deb_folder/python3-k8sapp-openstack-wheels.install
diff --git a/python3-k8sapp-openstack/debian/deb_folder/python3-k8sapp-openstack.install b/python3-k8sapp-openstack/debian/deb_folder/python3-k8sapp-openstack.install
new file mode 100644
index 00000000..91d1d9d1
--- /dev/null
+++ b/python3-k8sapp-openstack/debian/deb_folder/python3-k8sapp-openstack.install
@@ -0,0 +1 @@
+usr/lib/python3/dist-packages/k8sapp_*
diff --git a/python3-k8sapp-openstack/debian/deb_folder/rules b/python3-k8sapp-openstack/debian/deb_folder/rules
new file mode 100755
index 00000000..e0da7010
--- /dev/null
+++ b/python3-k8sapp-openstack/debian/deb_folder/rules
@@ -0,0 +1,33 @@
+#!/usr/bin/make -f
+# export DH_VERBOSE = 1
+
+export APP_NAME = k8sapp-openstack
+export PYBUILD_NAME = k8sapp-openstack
+
+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 ROOT = $(CURDIR)/debian/tmp
+export SKIP_PIP_INSTALL = 1
+
+%:
+	dh $@ --with=python3 --buildsystem=pybuild
+
+override_dh_auto_install:
+	env | sort
+
+	python3 setup.py install \
+	    --install-layout=deb \
+		--root $(ROOT)
+
+	python3 setup.py bdist_wheel \
+		--universal \
+		-d $(ROOT)/plugins
+
+override_dh_python3:
+	dh_python3 --shebang=/usr/bin/python3
+
+override_dh_auto_test:
+	PYTHONDIR=$(CURDIR) stestr run
diff --git a/python-k8sapp-openstack/debian/deb_folder/source/format b/python3-k8sapp-openstack/debian/deb_folder/source/format
similarity index 100%
rename from python-k8sapp-openstack/debian/deb_folder/source/format
rename to python3-k8sapp-openstack/debian/deb_folder/source/format
diff --git a/python-k8sapp-openstack/debian/meta_data.yaml b/python3-k8sapp-openstack/debian/meta_data.yaml
similarity index 100%
rename from python-k8sapp-openstack/debian/meta_data.yaml
rename to python3-k8sapp-openstack/debian/meta_data.yaml
diff --git a/python-k8sapp-openstack/k8sapp_openstack/.gitignore b/python3-k8sapp-openstack/k8sapp_openstack/.gitignore
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/.gitignore
rename to python3-k8sapp-openstack/k8sapp_openstack/.gitignore
diff --git a/python-k8sapp-openstack/k8sapp_openstack/.stestr.conf b/python3-k8sapp-openstack/k8sapp_openstack/.stestr.conf
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/.stestr.conf
rename to python3-k8sapp-openstack/k8sapp_openstack/.stestr.conf
diff --git a/python-k8sapp-openstack/k8sapp_openstack/LICENSE b/python3-k8sapp-openstack/k8sapp_openstack/LICENSE
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/LICENSE
rename to python3-k8sapp-openstack/k8sapp_openstack/LICENSE
diff --git a/python-k8sapp-openstack/k8sapp_openstack/README.rst b/python3-k8sapp-openstack/k8sapp_openstack/README.rst
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/README.rst
rename to python3-k8sapp-openstack/k8sapp_openstack/README.rst
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/__init__.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/__init__.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/__init__.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/__init__.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/armada/__init__.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/armada/__init__.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/armada/__init__.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/armada/__init__.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/armada/manifest_openstack.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/armada/manifest_openstack.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/armada/manifest_openstack.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/armada/manifest_openstack.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/common/__init__.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/common/__init__.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/common/__init__.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/common/__init__.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/common/constants.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/common/constants.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/common/constants.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/common/constants.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/__init__.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/__init__.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/__init__.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/__init__.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/aodh.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/aodh.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/aodh.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/aodh.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/barbican.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/barbican.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/barbican.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/barbican.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/ceilometer.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/ceilometer.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/ceilometer.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/ceilometer.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/cinder.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/cinder.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/cinder.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/cinder.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/dcdbsync.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/dcdbsync.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/dcdbsync.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/dcdbsync.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/fm_rest_api.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/fm_rest_api.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/fm_rest_api.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/fm_rest_api.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/garbd.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/garbd.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/garbd.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/garbd.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/glance.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/glance.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/glance.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/glance.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/gnocchi.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/gnocchi.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/gnocchi.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/gnocchi.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/heat.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/heat.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/heat.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/heat.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/helm_toolkit.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/helm_toolkit.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/helm_toolkit.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/helm_toolkit.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/horizon.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/horizon.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/horizon.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/horizon.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/ingress.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/ingress.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/ingress.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/ingress.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/ironic.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/ironic.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/ironic.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/ironic.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/keystone.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/keystone.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/keystone.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/keystone.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/keystone_api_proxy.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/keystone_api_proxy.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/keystone_api_proxy.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/keystone_api_proxy.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/libvirt.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/libvirt.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/libvirt.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/libvirt.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/magnum.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/magnum.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/magnum.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/magnum.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/mariadb.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/mariadb.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/mariadb.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/mariadb.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/memcached.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/memcached.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/memcached.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/memcached.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/neutron.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/neutron.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/neutron.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/neutron.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/nginx_ports_control.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/nginx_ports_control.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/nginx_ports_control.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/nginx_ports_control.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/nova.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/nova.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/nova.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/nova.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/nova_api_proxy.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/nova_api_proxy.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/nova_api_proxy.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/nova_api_proxy.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/openstack.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/openstack.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/openstack.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/openstack.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/openvswitch.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/openvswitch.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/openvswitch.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/openvswitch.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/pci_irq_affinity_agent.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/pci_irq_affinity_agent.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/pci_irq_affinity_agent.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/pci_irq_affinity_agent.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/placement.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/placement.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/placement.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/placement.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/psp_rolebinding.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/psp_rolebinding.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/psp_rolebinding.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/psp_rolebinding.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/rabbitmq.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/rabbitmq.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/rabbitmq.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/rabbitmq.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/swift.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/swift.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/swift.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/swift.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/kustomize/__init__.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/kustomize/__init__.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/kustomize/__init__.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/kustomize/__init__.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/kustomize/kustomize_openstack.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/kustomize/kustomize_openstack.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/kustomize/kustomize_openstack.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/kustomize/kustomize_openstack.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/lifecycle/__init__.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/lifecycle/__init__.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/lifecycle/__init__.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/lifecycle/__init__.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/lifecycle/lifecycle_openstack.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/lifecycle/lifecycle_openstack.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/lifecycle/lifecycle_openstack.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/lifecycle/lifecycle_openstack.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/__init__.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/__init__.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/__init__.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/__init__.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/__init__.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/__init__.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/__init__.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/__init__.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_aodh.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_aodh.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_aodh.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_aodh.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_barbican.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_barbican.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_barbican.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_barbican.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_ceilometer.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_ceilometer.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_ceilometer.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_ceilometer.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_cinder.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_cinder.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_cinder.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_cinder.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_fm_rest_api.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_fm_rest_api.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_fm_rest_api.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_fm_rest_api.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_glance.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_glance.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_glance.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_glance.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_gnocchi.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_gnocchi.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_gnocchi.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_gnocchi.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_heat.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_heat.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_heat.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_heat.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_horizon.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_horizon.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_horizon.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_horizon.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_ironic.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_ironic.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_ironic.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_ironic.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_keystone.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_keystone.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_keystone.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_keystone.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_keystone_api_proxy.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_keystone_api_proxy.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_keystone_api_proxy.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_keystone_api_proxy.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_neutron.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_neutron.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_neutron.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_neutron.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_nova.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_nova.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_nova.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_nova.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_nova_api_proxy.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_nova_api_proxy.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_nova_api_proxy.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_nova_api_proxy.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_placement.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_placement.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_placement.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_placement.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/lifecycle/__init__.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/lifecycle/__init__.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/lifecycle/__init__.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/lifecycle/__init__.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/lifecycle/test_lifecycle_openstack.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/lifecycle/test_lifecycle_openstack.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/lifecycle/test_lifecycle_openstack.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/lifecycle/test_lifecycle_openstack.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/test_nova_api_proxy.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/test_nova_api_proxy.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/test_nova_api_proxy.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/test_nova_api_proxy.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/test_plugins.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/test_plugins.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/test_plugins.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/test_plugins.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/utils/__init__.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/utils/__init__.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/utils/__init__.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/utils/__init__.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/utils/test_utils.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/utils/test_utils.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/utils/test_utils.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/utils/test_utils.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/utils.py b/python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/utils.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/utils.py
rename to python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/utils.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/pylint.rc b/python3-k8sapp-openstack/k8sapp_openstack/pylint.rc
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/pylint.rc
rename to python3-k8sapp-openstack/k8sapp_openstack/pylint.rc
diff --git a/python-k8sapp-openstack/k8sapp_openstack/requirements.txt b/python3-k8sapp-openstack/k8sapp_openstack/requirements.txt
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/requirements.txt
rename to python3-k8sapp-openstack/k8sapp_openstack/requirements.txt
diff --git a/python-k8sapp-openstack/k8sapp_openstack/setup.cfg b/python3-k8sapp-openstack/k8sapp_openstack/setup.cfg
similarity index 99%
rename from python-k8sapp-openstack/k8sapp_openstack/setup.cfg
rename to python3-k8sapp-openstack/k8sapp_openstack/setup.cfg
index 02db63ec..c22d9468 100644
--- a/python-k8sapp-openstack/k8sapp_openstack/setup.cfg
+++ b/python3-k8sapp-openstack/k8sapp_openstack/setup.cfg
@@ -72,5 +72,5 @@ systemconfig.armada.manifest_ops =
 systemconfig.app_lifecycle =
     openstack = k8sapp_openstack.lifecycle.lifecycle_openstack:OpenstackAppLifecycleOperator
 
-[wheel]
+[bdist_wheel]
 universal = 1
diff --git a/python-k8sapp-openstack/k8sapp_openstack/setup.py b/python3-k8sapp-openstack/k8sapp_openstack/setup.py
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/setup.py
rename to python3-k8sapp-openstack/k8sapp_openstack/setup.py
diff --git a/python-k8sapp-openstack/k8sapp_openstack/test-requirements.txt b/python3-k8sapp-openstack/k8sapp_openstack/test-requirements.txt
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/test-requirements.txt
rename to python3-k8sapp-openstack/k8sapp_openstack/test-requirements.txt
diff --git a/python-k8sapp-openstack/k8sapp_openstack/tox.ini b/python3-k8sapp-openstack/k8sapp_openstack/tox.ini
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/tox.ini
rename to python3-k8sapp-openstack/k8sapp_openstack/tox.ini
diff --git a/python-k8sapp-openstack/k8sapp_openstack/upper-constraints.txt b/python3-k8sapp-openstack/k8sapp_openstack/upper-constraints.txt
similarity index 100%
rename from python-k8sapp-openstack/k8sapp_openstack/upper-constraints.txt
rename to python3-k8sapp-openstack/k8sapp_openstack/upper-constraints.txt
diff --git a/stx-openstack-helm-fluxcd/centos/build_srpm.data b/stx-openstack-helm-fluxcd/centos/build_srpm.data
deleted file mode 100644
index 929b864e..00000000
--- a/stx-openstack-helm-fluxcd/centos/build_srpm.data
+++ /dev/null
@@ -1,13 +0,0 @@
-SRC_DIR="stx-openstack-helm-fluxcd"
-COPY_LIST_TO_TAR="\
-    $STX_BASE/helm-charts/fm-rest-api/fm-rest-api/helm-charts \
-    $STX_BASE/helm-charts/psp-rolebinding/psp-rolebinding/helm-charts \
-"
-
-# Bump the version by the previous version value prior to decoupling as this
-# will align the GITREVCOUNT value to increment the version by one. Remove this
-# (i.e. reset to 0) on then next major version changes when TIS_BASE_SRCREV
-# changes. This version should align with the version of the helm charts in
-# python-k8sapp-openstack
-TIS_BASE_SRCREV=8d3452a5e864339101590e542c24c375bb3808fb
-TIS_PATCH_VER=GITREVCOUNT+20
diff --git a/stx-openstack-helm-fluxcd/centos/stx-openstack-helm-fluxcd.spec b/stx-openstack-helm-fluxcd/centos/stx-openstack-helm-fluxcd.spec
deleted file mode 100644
index 982fde3a..00000000
--- a/stx-openstack-helm-fluxcd/centos/stx-openstack-helm-fluxcd.spec
+++ /dev/null
@@ -1,74 +0,0 @@
-%global helm_folder  /usr/lib/helm
-%global fluxcd_folder  /usr/lib/fluxcd
-%global app_folder  /usr/lib/application
-%global toolkit_version 0.2.19
-%global helmchart_version 0.1.0
-
-Summary: StarlingX Openstack Application Helm charts
-Name: stx-openstack-helm-fluxcd
-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: helm
-BuildRequires: openstack-helm-infra
-BuildRequires: chartmuseum
-Requires: openstack-helm-infra
-Requires: openstack-helm
-Requires: python-k8sapp-openstack-wheels
-
-%description
-StarlingX Openstack 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 nova-api-proxy
-make pci-irq-affinity-agent
-make garbd
-make keystone-api-proxy
-make fm-rest-api
-make nginx-ports-control
-make dcdbsync
-make psp-rolebinding
-cd -
-
-# terminate helm server (the last backgrounded task)
-kill %1
-
-# remove helm-toolkit. This will be packaged with openstack-helm-infra
-rm  ./helm-charts/helm-toolkit-%{toolkit_version}.tgz
-
-%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}%{fluxcd_folder}
-cp -R manifests/* ${RPM_BUILD_ROOT}%{fluxcd_folder}
-
-%files
-#helm_folder is owned by openstack-helm-infra
-%defattr(-,root,root,-)
-%{helm_folder}/*
-%{fluxcd_folder}/*
-%{app_folder}/*
diff --git a/stx-openstack-helm/centos/build_srpm.data b/stx-openstack-helm/centos/build_srpm.data
deleted file mode 100644
index a8725320..00000000
--- a/stx-openstack-helm/centos/build_srpm.data
+++ /dev/null
@@ -1,13 +0,0 @@
-SRC_DIR="stx-openstack-helm"
-COPY_LIST_TO_TAR="\
-    $STX_BASE/helm-charts/fm-rest-api/fm-rest-api/helm-charts \
-    $STX_BASE/helm-charts/psp-rolebinding/psp-rolebinding/helm-charts \
-"
-
-# Bump the version by the previous version value prior to decoupling as this
-# will align the GITREVCOUNT value to increment the version by one. Remove this
-# (i.e. reset to 0) on then next major version changes when TIS_BASE_SRCREV
-# changes. This version should align with the version of the helm charts in
-# python-k8sapp-openstack
-TIS_BASE_SRCREV=8d3452a5e864339101590e542c24c375bb3808fb
-TIS_PATCH_VER=GITREVCOUNT+20
diff --git a/stx-openstack-helm/centos/stx-openstack-helm.spec b/stx-openstack-helm/centos/stx-openstack-helm.spec
deleted file mode 100644
index 230aa21e..00000000
--- a/stx-openstack-helm/centos/stx-openstack-helm.spec
+++ /dev/null
@@ -1,74 +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 Openstack Application Helm charts
-Name: stx-openstack-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: helm
-BuildRequires: openstack-helm-infra
-BuildRequires: chartmuseum
-Requires: openstack-helm-infra
-Requires: openstack-helm
-Requires: python-k8sapp-openstack-wheels
-
-%description
-StarlingX Openstack 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 nova-api-proxy
-make pci-irq-affinity-agent
-make garbd
-make keystone-api-proxy
-make fm-rest-api
-make nginx-ports-control
-make dcdbsync
-make psp-rolebinding
-cd -
-
-# terminate helm server (the last backgrounded task)
-kill %1
-
-# remove helm-toolkit. This will be packaged with openstack-helm-infra
-rm  ./helm-charts/helm-toolkit-%{toolkit_version}.tgz
-
-%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
-#helm_folder is owned by openstack-helm-infra
-%defattr(-,root,root,-)
-%{helm_folder}/*
-%{armada_folder}/*
-%{app_folder}/*