diff --git a/debian_iso_image.inc b/debian_iso_image.inc
index 9461315..6afa365 100644
--- a/debian_iso_image.inc
+++ b/debian_iso_image.inc
@@ -1 +1,2 @@
+#stx-security-profiles-operator-helm
 stx-security-profiles-operator-helm
diff --git a/debian_pkg_dirs b/debian_pkg_dirs
index 19eef52..22f5ca1 100644
--- a/debian_pkg_dirs
+++ b/debian_pkg_dirs
@@ -1,2 +1,2 @@
-python-k8sapp-security-profiles-operator
+python3-k8sapp-security-profiles-operator
 stx-security-profiles-operator-helm
diff --git a/python-k8sapp-security-profiles-operator/debian/deb_folder/python3-k8sapp-security-profiles-operator-wheels.install b/python-k8sapp-security-profiles-operator/debian/deb_folder/python3-k8sapp-security-profiles-operator-wheels.install
deleted file mode 100644
index f5af673..0000000
--- a/python-k8sapp-security-profiles-operator/debian/deb_folder/python3-k8sapp-security-profiles-operator-wheels.install
+++ /dev/null
@@ -1 +0,0 @@
-plugins/security-profiles-operator/*.whl
diff --git a/python-k8sapp-security-profiles-operator/debian/deb_folder/python3-k8sapp-security-profiles-operator.install b/python-k8sapp-security-profiles-operator/debian/deb_folder/python3-k8sapp-security-profiles-operator.install
deleted file mode 100644
index f2934c1..0000000
--- a/python-k8sapp-security-profiles-operator/debian/deb_folder/python3-k8sapp-security-profiles-operator.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/python3/dist-packages/k8sapp_security_profiles_operator-1.0.0.egg-info/*
-usr/lib/python3/dist-packages/k8sapp_security_profiles_operator/*
diff --git a/python-k8sapp-security-profiles-operator/debian/deb_folder/rules b/python-k8sapp-security-profiles-operator/debian/deb_folder/rules
deleted file mode 100755
index 4a2501b..0000000
--- a/python-k8sapp-security-profiles-operator/debian/deb_folder/rules
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/make -f
-#export DH_VERBOSE = 1
-
-export APP_NAME=security-profiles-operator
-export PBR_VERSION=1.0.0
-export PYBUILD_NAME=k8sapp_security_profiles_operator
-export ROOT=$(CURDIR)/debian/tmp
-export SKIP_PIP_INSTALL=1
-
-%:
-	dh $@ --with=python3 --buildsystem=pybuild
-
-override_dh_auto_build:
-	python3 setup.py build
-
-override_dh_auto_install:
-	python3 setup.py install --install-layout=deb --skip-build --root $(ROOT)
-	python3 setup.py bdist_wheel \
-		--universal \
-		-d $(ROOT)/plugins/$(APP_NAME)
-
-ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
-override_dh_auto_test:
-	# (tbogue) FIXME
-	PYTHONDIR=$(CURDIR) stestr run || true
-endif
diff --git a/python-k8sapp-security-profiles-operator/debian/deb_folder/changelog b/python3-k8sapp-security-profiles-operator/debian/deb_folder/changelog
similarity index 100%
rename from python-k8sapp-security-profiles-operator/debian/deb_folder/changelog
rename to python3-k8sapp-security-profiles-operator/debian/deb_folder/changelog
diff --git a/python-k8sapp-security-profiles-operator/debian/deb_folder/control b/python3-k8sapp-security-profiles-operator/debian/deb_folder/control
similarity index 100%
rename from python-k8sapp-security-profiles-operator/debian/deb_folder/control
rename to python3-k8sapp-security-profiles-operator/debian/deb_folder/control
diff --git a/python-k8sapp-security-profiles-operator/debian/deb_folder/copyright b/python3-k8sapp-security-profiles-operator/debian/deb_folder/copyright
similarity index 100%
rename from python-k8sapp-security-profiles-operator/debian/deb_folder/copyright
rename to python3-k8sapp-security-profiles-operator/debian/deb_folder/copyright
diff --git a/python3-k8sapp-security-profiles-operator/debian/deb_folder/python3-k8sapp-security-profiles-operator-wheels.install b/python3-k8sapp-security-profiles-operator/debian/deb_folder/python3-k8sapp-security-profiles-operator-wheels.install
new file mode 100644
index 0000000..19a9e4c
--- /dev/null
+++ b/python3-k8sapp-security-profiles-operator/debian/deb_folder/python3-k8sapp-security-profiles-operator-wheels.install
@@ -0,0 +1 @@
+plugins/*.whl
diff --git a/python3-k8sapp-security-profiles-operator/debian/deb_folder/python3-k8sapp-security-profiles-operator.install b/python3-k8sapp-security-profiles-operator/debian/deb_folder/python3-k8sapp-security-profiles-operator.install
new file mode 100644
index 0000000..91d1d9d
--- /dev/null
+++ b/python3-k8sapp-security-profiles-operator/debian/deb_folder/python3-k8sapp-security-profiles-operator.install
@@ -0,0 +1 @@
+usr/lib/python3/dist-packages/k8sapp_*
diff --git a/python3-k8sapp-security-profiles-operator/debian/deb_folder/rules b/python3-k8sapp-security-profiles-operator/debian/deb_folder/rules
new file mode 100755
index 0000000..c1cea78
--- /dev/null
+++ b/python3-k8sapp-security-profiles-operator/debian/deb_folder/rules
@@ -0,0 +1,33 @@
+#!/usr/bin/make -f
+#export DH_VERBOSE = 1
+
+export APP_NAME = security-profiles-operator
+export PYBUILD_NAME = k8sapp_security_profiles_operator
+
+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-security-profiles-operator/debian/deb_folder/source/format b/python3-k8sapp-security-profiles-operator/debian/deb_folder/source/format
similarity index 100%
rename from python-k8sapp-security-profiles-operator/debian/deb_folder/source/format
rename to python3-k8sapp-security-profiles-operator/debian/deb_folder/source/format
diff --git a/python-k8sapp-security-profiles-operator/debian/meta_data.yaml b/python3-k8sapp-security-profiles-operator/debian/meta_data.yaml
similarity index 51%
rename from python-k8sapp-security-profiles-operator/debian/meta_data.yaml
rename to python3-k8sapp-security-profiles-operator/debian/meta_data.yaml
index 7613706..9cbea0a 100644
--- a/python-k8sapp-security-profiles-operator/debian/meta_data.yaml
+++ b/python3-k8sapp-security-profiles-operator/debian/meta_data.yaml
@@ -4,4 +4,6 @@ debver: 1.0-1
 src_path: k8sapp_security_profiles_operator
 revision:
   dist: $STX_DIST
-  PKG_GITREVCOUNT: true
+  GITREVCOUNT:
+    SRC_DIR: ${MY_REPO}/stx/app-security-profiles-operator
+    BASE_SRCREV: 76d1915efa382c4b731e0e1921f737aef81d9916
diff --git a/python-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/.gitignore b/python3-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/.gitignore
similarity index 100%
rename from python-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/.gitignore
rename to python3-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/.gitignore
diff --git a/python-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/.stestr.conf b/python3-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/.stestr.conf
similarity index 100%
rename from python-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/.stestr.conf
rename to python3-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/.stestr.conf
diff --git a/python-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/LICENSE b/python3-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/LICENSE
similarity index 100%
rename from python-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/LICENSE
rename to python3-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/LICENSE
diff --git a/python-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/README.rst b/python3-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/README.rst
similarity index 100%
rename from python-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/README.rst
rename to python3-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/README.rst
diff --git a/python-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/k8sapp_security_profiles_operator/__init__.py b/python3-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/k8sapp_security_profiles_operator/__init__.py
similarity index 100%
rename from python-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/k8sapp_security_profiles_operator/__init__.py
rename to python3-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/k8sapp_security_profiles_operator/__init__.py
diff --git a/python-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/k8sapp_security_profiles_operator/common/__init__.py b/python3-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/k8sapp_security_profiles_operator/common/__init__.py
similarity index 100%
rename from python-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/k8sapp_security_profiles_operator/common/__init__.py
rename to python3-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/k8sapp_security_profiles_operator/common/__init__.py
diff --git a/python-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/k8sapp_security_profiles_operator/common/constants.py b/python3-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/k8sapp_security_profiles_operator/common/constants.py
similarity index 100%
rename from python-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/k8sapp_security_profiles_operator/common/constants.py
rename to python3-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/k8sapp_security_profiles_operator/common/constants.py
diff --git a/python-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/k8sapp_security_profiles_operator/helm/__init__.py b/python3-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/k8sapp_security_profiles_operator/helm/__init__.py
similarity index 100%
rename from python-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/k8sapp_security_profiles_operator/helm/__init__.py
rename to python3-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/k8sapp_security_profiles_operator/helm/__init__.py
diff --git a/python-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/k8sapp_security_profiles_operator/helm/security_profiles_operator.py b/python3-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/k8sapp_security_profiles_operator/helm/security_profiles_operator.py
similarity index 100%
rename from python-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/k8sapp_security_profiles_operator/helm/security_profiles_operator.py
rename to python3-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/k8sapp_security_profiles_operator/helm/security_profiles_operator.py
diff --git a/python-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/k8sapp_security_profiles_operator/lifecycle/__init__.py b/python3-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/k8sapp_security_profiles_operator/lifecycle/__init__.py
similarity index 100%
rename from python-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/k8sapp_security_profiles_operator/lifecycle/__init__.py
rename to python3-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/k8sapp_security_profiles_operator/lifecycle/__init__.py
diff --git a/python-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/k8sapp_security_profiles_operator/lifecycle/lifecycle_security_profiles_operator.py b/python3-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/k8sapp_security_profiles_operator/lifecycle/lifecycle_security_profiles_operator.py
similarity index 100%
rename from python-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/k8sapp_security_profiles_operator/lifecycle/lifecycle_security_profiles_operator.py
rename to python3-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/k8sapp_security_profiles_operator/lifecycle/lifecycle_security_profiles_operator.py
diff --git a/python-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/k8sapp_security_profiles_operator/tests/__init__.py b/python3-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/k8sapp_security_profiles_operator/tests/__init__.py
similarity index 100%
rename from python-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/k8sapp_security_profiles_operator/tests/__init__.py
rename to python3-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/k8sapp_security_profiles_operator/tests/__init__.py
diff --git a/python-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/k8sapp_security_profiles_operator/tests/test_plugins.py b/python3-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/k8sapp_security_profiles_operator/tests/test_plugins.py
similarity index 100%
rename from python-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/k8sapp_security_profiles_operator/tests/test_plugins.py
rename to python3-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/k8sapp_security_profiles_operator/tests/test_plugins.py
diff --git a/python-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/k8sapp_security_profiles_operator/tests/test_security_profiles_operator.py b/python3-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/k8sapp_security_profiles_operator/tests/test_security_profiles_operator.py
similarity index 100%
rename from python-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/k8sapp_security_profiles_operator/tests/test_security_profiles_operator.py
rename to python3-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/k8sapp_security_profiles_operator/tests/test_security_profiles_operator.py
diff --git a/python-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/pylint.rc b/python3-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/pylint.rc
similarity index 100%
rename from python-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/pylint.rc
rename to python3-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/pylint.rc
diff --git a/python-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/requirements.txt b/python3-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/requirements.txt
similarity index 100%
rename from python-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/requirements.txt
rename to python3-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/requirements.txt
diff --git a/python-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/setup.cfg b/python3-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/setup.cfg
similarity index 99%
rename from python-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/setup.cfg
rename to python3-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/setup.cfg
index 76328a9..133a51c 100644
--- a/python-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/setup.cfg
+++ b/python3-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/setup.cfg
@@ -38,5 +38,5 @@ systemconfig.helm_plugins.security_profiles_operator =
 systemconfig.app_lifecycle =
     security-profiles-operator = k8sapp_security_profiles_operator.lifecycle.lifecycle_security_profiles_operator:SecurityProfilesOperatorAppLifecycleOperator
 
-[wheel]
+[bdist_wheel]
 universal = 1
diff --git a/python-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/setup.py b/python3-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/setup.py
similarity index 100%
rename from python-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/setup.py
rename to python3-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/setup.py
diff --git a/python-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/test-requirements.txt b/python3-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/test-requirements.txt
similarity index 100%
rename from python-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/test-requirements.txt
rename to python3-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/test-requirements.txt
diff --git a/python-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/tox.ini b/python3-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/tox.ini
similarity index 100%
rename from python-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/tox.ini
rename to python3-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/tox.ini
diff --git a/python-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/upper-constraints.txt b/python3-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/upper-constraints.txt
similarity index 100%
rename from python-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/upper-constraints.txt
rename to python3-k8sapp-security-profiles-operator/k8sapp_security_profiles_operator/upper-constraints.txt
diff --git a/stx-security-profiles-operator-helm/debian/deb_folder/rules b/stx-security-profiles-operator-helm/debian/deb_folder/rules
index b13a2d3..354754a 100755
--- a/stx-security-profiles-operator-helm/debian/deb_folder/rules
+++ b/stx-security-profiles-operator-helm/debian/deb_folder/rules
@@ -62,7 +62,7 @@ override_dh_auto_build:
 
 	# Copy the plugins: installed in the buildroot
 	mkdir -p $(STAGING)/plugins
-	cp /plugins/$(APP_NAME)/*.whl $(STAGING)/plugins
+	cp /plugins/*.whl $(STAGING)/plugins
 
 	# Generate checksum file and package the tarball
 	cd $(STAGING) && find . -type f ! -name '*.md5' -print0 | xargs -0 md5sum > checksum.md5
diff --git a/stx-security-profiles-operator-helm/debian/meta_data.yaml b/stx-security-profiles-operator-helm/debian/meta_data.yaml
index 5ae7982..bb8d21e 100644
--- a/stx-security-profiles-operator-helm/debian/meta_data.yaml
+++ b/stx-security-profiles-operator-helm/debian/meta_data.yaml
@@ -9,4 +9,6 @@ dl_files:
     md5sum: 3a24e30d9cf7995ebcf3c036a836ce89
 revision:
   dist: $STX_DIST
-  PKG_GITREVCOUNT: true
+  GITREVCOUNT:
+    SRC_DIR: ${MY_REPO}/stx/app-security-profiles-operator
+    BASE_SRCREV: 76d1915efa382c4b731e0e1921f737aef81d9916