diff --git a/rpm/dvb/dvb.spec b/rpm/dvb/dvb.spec
index b72c578f..80ae4d56 100644
--- a/rpm/dvb/dvb.spec
+++ b/rpm/dvb/dvb.spec
@@ -1,10 +1,15 @@
+%global debug_package %{nil}
+
+# Define the rootfs macros
+%global rootfs_qm %{_prefix}/lib/qm/rootfs/
+
 Name: qm-mount-bind-dvb
 Version: 0
 Release: 1%{?dist}
 Summary: Drop-in configuration for QM containers to mount bind /dev/dvb
 License: GPL-2.0-only
 URL: https://github.com/containers/qm
-Source0: %{url}/archive/v%{version}.tar.gz
+Source0: %{url}/archive/qm-dvb-%{version}.tar.gz
 
 BuildArch: noarch
 Requires: qm = %{version}-%{release}
@@ -13,17 +18,20 @@ Requires: qm = %{version}-%{release}
 This subpackage installs a drop-in configuration for QM containers to mount bind `/dev/dvb`.
 
 %prep
-%autosetup -Sgit -n qm-%{version}
+%autosetup -Sgit -n qm-dvb-%{version}
 
 %install
 # Create the directory for drop-in configurations
 install -d %{buildroot}%{_sysconfdir}/containers/systemd/qm.container.d
 
 # Install the dvb drop-in configuration file
-install -m 644 %{_builddir}/qm-%{version}/etc/containers/systemd/qm.container.d/qm_dropin_mount_bind_dvb.conf \
+install -m 644 %{_builddir}/qm-video-%{version}/etc/containers/systemd/qm.container.d/qm_dropin_mount_bind_dvb.conf \
     %{buildroot}%{_sysconfdir}/containers/systemd/qm.container.d/qm_dropin_mount_bind_dvb.conf
 
+
 %files
+%license LICENSE
+%doc README.md SECURITY.md
 %{_sysconfdir}/containers/systemd/qm.container.d/qm_dropin_mount_bind_dvb.conf
 
 %changelog
diff --git a/rpm/img_tempdir/img_tempdir.spec b/rpm/img_tempdir/img_tempdir.spec
index 598facb6..5f534045 100644
--- a/rpm/img_tempdir/img_tempdir.spec
+++ b/rpm/img_tempdir/img_tempdir.spec
@@ -4,7 +4,7 @@ Release: 1%{?dist}
 Summary: Drop-in configuration for QM nested containers using img tempdir
 License: GPL-2.0-only
 URL: https://github.com/containers/qm
-Source0: %{url}/archive/v%{version}.tar.gz
+Source0: %{url}/archive/qm-img_tmpdir-%{version}.tar.gz
 BuildArch: noarch
 
 Requires: qm = %{version}-%{release}
@@ -13,11 +13,11 @@ Requires: qm = %{version}-%{release}
 This sub-package installs drop-in configurations for QM nested containers that use img tempdir.
 
 %prep
-%autosetup -Sgit -n qm-%{version}
+%autosetup -Sgit -n qm-img_tmpdir-%{version}
 
 %install
 install -d %{buildroot}%{_sysconfdir}/qm/containers/containers.conf.d
-install -m 644 etc/qm/containers/containers.conf.d/qm_dropin_img_tempdir.conf \
+install -m 644 %{_builddir}/qm-video-%{version}/etc/qm/containers/containers.conf.d/qm_dropin_img_tempdir.conf \
     %{buildroot}%{_sysconfdir}/qm/containers/containers.conf.d/
 
 %files
diff --git a/rpm/input/input.spec b/rpm/input/input.spec
index bebd5d41..4cba5d7d 100644
--- a/rpm/input/input.spec
+++ b/rpm/input/input.spec
@@ -1,10 +1,12 @@
+%global debug_package %{nil}
+
 Name: qm_mount_bind_input
 Version: 0
 Release: 1%{?dist}
 Summary: Drop-in configuration for QM containers to mount bind input devices
 License: GPL-2.0-only
 URL: https://github.com/containers/qm
-Source0: %{url}/archive/v%{version}.tar.gz
+Source0: %{url}/archive/qm-input-%{version}.tar.gz
 BuildArch: noarch
 
 Requires: qm = %{version}-%{release}
@@ -13,14 +15,14 @@ Requires: qm = %{version}-%{release}
 This sub-package installs drop-in configurations for QM containers to mount bind input devices.
 
 %prep
-%autosetup -Sgit -n qm-%{version}
+%autosetup -Sgit -n qm-input-%{version}
 
 %install
 # Create the directory for drop-in configurations
 install -d %{buildroot}%{_sysconfdir}/containers/systemd/qm.container.d
 
-# Install the KVM drop-in configuration file
-install -m 644 %{_builddir}/qm-%{version}/etc/containers/systemd/qm.container.d/qm_dropin_mount_bind_input.conf \
+# Install the input drop-in configuration file
+install -m 644 %{_builddir}/qm-input-%{version}/etc/containers/systemd/qm.container.d/qm_dropin_mount_bind_input.conf \
     %{buildroot}%{_sysconfdir}/containers/systemd/qm.container.d/qm_dropin_mount_bind_input.conf
 
 %files
diff --git a/rpm/radio/radio.spec b/rpm/radio/radio.spec
index b23e87ca..11f4a416 100644
--- a/rpm/radio/radio.spec
+++ b/rpm/radio/radio.spec
@@ -1,10 +1,12 @@
+%global debug_package %{nil}
+
 Name: qm-mount-bind-radio
 Version: 0
 Release: 1%{?dist}
 Summary: Drop-in configuration for QM containers to mount bind /dev/radio
 License: GPL-2.0-only
 URL: https://github.com/containers/qm
-Source0: %{url}/archive/v%{version}.tar.gz
+Source0: %{url}/archive/qm-radio-%{version}.tar.gz
 
 BuildArch: noarch
 Requires: qm = %{version}-%{release}
@@ -13,16 +15,18 @@ Requires: qm = %{version}-%{release}
 This subpackage installs a drop-in configuration for QM containers to mount bind `/dev/radio`.
 
 %prep
-%autosetup -Sgit -n qm-%{version}
+%autosetup -Sgit -n qm-radio-%{version}
 
 %install
 # Create the directory for drop-in configurations
 install -d %{buildroot}%{_sysconfdir}/containers/systemd/qm.container.d
 # Install the KVM drop-in configuration file
-install -m 644 %{_builddir}/qm-%{version}/etc/containers/systemd/qm.container.d/qm_dropin_mount_bind_radio.conf \
+install -m 644 %{_builddir}/qm-radio-%{version}/etc/containers/systemd/qm.container.d/qm_dropin_mount_bind_radio.conf \
     %{buildroot}%{_sysconfdir}/containers/systemd/qm.container.d/qm_dropin_mount_bind_radio.conf
 
 %files
+%license LICENSE
+%doc README.md SECURITY.md
 %{_sysconfdir}/containers/systemd/qm.container.d/qm_dropin_mount_bind_radio.conf
 
 %changelog
diff --git a/rpm/text2speech/text2speech.spec b/rpm/text2speech/text2speech.spec
index 113ce89a..31110adc 100644
--- a/rpm/text2speech/text2speech.spec
+++ b/rpm/text2speech/text2speech.spec
@@ -9,7 +9,7 @@ Release: 1%{?dist}
 Summary: Drop-in configuration for QM containers to mount bind
 License: GPL-2.0-only
 URL: https://github.com/containers/qm
-Source0: %{url}/archive/v%{version}.tar.gz
+Source0: %{url}/archive/qm-text2speech-%{version}.tar.gz
 BuildArch: noarch
 
 # Build requirements
@@ -30,14 +30,14 @@ Requires: espeak
 This subpackage provides a drop-in configuration for the QM environment to enable espeak
 
 %prep
-%autosetup -n qm-%{version}
+%autosetup -n qm-text2speech-%{version}
 
 %build
 
 %install
 
 %post
-dnf --installroot /usr/lib/qm/rootfs/ install espeak -y
+dnf  --setopt=reposdir=/etc/qm/yum.repos.d  --installroot /usr/lib/qm/rootfs/ install espeak -y
 
 %files
 %license LICENSE
diff --git a/rpm/tty7/tty7.spec b/rpm/tty7/tty7.spec
index 89c24368..3b490606 100644
--- a/rpm/tty7/tty7.spec
+++ b/rpm/tty7/tty7.spec
@@ -1,10 +1,12 @@
+%global debug_package %{nil}
+
 Name: qm-mount-bind-tty7
 Version: 0
 Release: 1%{?dist}
 Summary: Drop-in configuration for QM containers to mount bind /dev/tty7
 License: GPL-2.0-only
 URL: https://github.com/containers/qm
-Source0: %{url}/archive/v%{version}.tar.gz
+Source0: %{url}/archive/qm-tty7%{version}.tar.gz
 
 BuildArch: noarch
 Requires: qm = %{version}-%{release}
@@ -15,7 +17,7 @@ This subpackage installs a drop-in configuration for QM containers to mount bind
 This configuration is useful when graphical applications require access to the host’s GUI display server.
 
 %prep
-%autosetup -Sgit -n qm-%{version}
+%autosetup -Sgit -n qm-tty7-%{version}
 
 %build
 # No build required for configuration files
@@ -25,11 +27,14 @@ This configuration is useful when graphical applications require access to the h
 install -d %{buildroot}%{_sysconfdir}/containers/systemd/qm.container.d
 
 # Install the KVM drop-in configuration file
-install -m 644 %{_builddir}/qm-%{version}/etc/containers/systemd/qm.container.d/qm_dropin_mount_bind_tty7.conf \
+install -m 644 %{_builddir}/qm-tty7-%{version}/etc/containers/systemd/qm.container.d/qm_dropin_mount_bind_tty7.conf \
     %{buildroot}%{_sysconfdir}/containers/systemd/qm.container.d/qm_dropin_mount_bind_tty7.conf
 
 %files
+%license LICENSE
+%doc README.md SECURITY.md
 %{_sysconfdir}/containers/systemd/qm.container.d/qm_dropin_mount_bind_tty7.conf
+
 %changelog
 * Fri Jul 21 2023 RH Container Bot <rhcontainerbot@fedoraproject.org>
 - Added drop-in configuration to mount bind /dev/tty7.
diff --git a/rpm/ttyUSB0/ttyUSB0.spec b/rpm/ttyUSB0/ttyUSB0.spec
index 34eda8e5..c2b92520 100644
--- a/rpm/ttyUSB0/ttyUSB0.spec
+++ b/rpm/ttyUSB0/ttyUSB0.spec
@@ -1,10 +1,12 @@
+%global debug_package %{nil}
+
 Name: qm_mount_bind_ttyUSB0
 Version: 0
 Release: 1%{?dist}
 Summary: Drop-in configuration for QM containers to mount bind ttyUSB0
 License: GPL-2.0-only
 URL: https://github.com/containers/qm
-Source0: %{url}/archive/v%{version}.tar.gz
+Source0: %{url}/archive/qm-ttyUSB0%{version}.tar.gz
 BuildArch: noarch
 
 Requires: qm = %{version}-%{release}
@@ -13,14 +15,14 @@ Requires: qm = %{version}-%{release}
 This sub-package installs drop-in configurations for QM containers to mount bind ttyUSB0.
 
 %prep
-%autosetup -Sgit -n qm-%{version}
+%autosetup -Sgit -n qm-ttyUSB0-%{version}
 
 %install
 # Create the directory for drop-in configurations
 install -d %{buildroot}%{_sysconfdir}/containers/systemd/qm.container.d
 
-# Install the KVM drop-in configuration file
-install -m 644 %{_builddir}/qm-%{version}/etc/containers/systemd/qm.container.d/qm_dropin_mount_bind_ttyUSB0.conf %{buildroot}%{_sysconfdir}/containers/systemd/qm.container.d/qm_dropin_mount_bind_ttyUSB0.conf
+# Install the ttyusb0 drop-in configuration file
+install -m 644 %{_builddir}/qm-ttyUSB0-%{version}/etc/containers/systemd/qm.container.d/qm_dropin_mount_bind_ttyUSB0.conf %{buildroot}%{_sysconfdir}/containers/systemd/qm.container.d/qm_dropin_mount_bind_ttyUSB0.conf
 
 %files
 %license LICENSE
diff --git a/subsystems/dvb/Makefile b/subsystems/dvb/Makefile
index dce9ad78..ccf86481 100644
--- a/subsystems/dvb/Makefile
+++ b/subsystems/dvb/Makefile
@@ -1,24 +1,25 @@
-SPECFILE_SUBPACKAGE_DVB=rpm/dvb/dvb.spec
+RPM_TOPDIR ?= $(PWD)/rpmbuild
+VERSION ?= $(shell cat VERSION)
+ROOTDIR ?= $(PWD)
+SPECFILE_SUBPACKAGE_VIDEO ?= ${ROOTDIR}/rpm/dvb/dvb.spec
 
 .PHONY: dist
 dist: ##             - Creates the QM dvb package
 	cd $(ROOTDIR) && tar cvz \
-		--exclude-from=build-aux/exclude_from_tar_gz_subpackage_kvm.txt \
 		--dereference \
 		--transform s/qm/qm-dvb-${VERSION}/ \
 		-f /tmp/qm-dvb-${VERSION}.tar.gz \
 		../qm/README.md \
 		../qm/SECURITY.md \
 		../qm/LICENSE \
-		../qm/ \
 		../qm/etc/containers/systemd/qm.container.d/qm_dropin_mount_bind_dvb.conf
 	cd $(ROOTDIR) && mv /tmp/qm-dvb-${VERSION}.tar.gz ./rpm
 
-.PHONY: rpm
-rpm: dist ##             - Creates a local RPM package, useful for development
-	mkdir -p ${RPM_TOPDIR}/{RPMS,SRPMS,BUILD,SOURCES}
-	tools/version-update -v ${VERSION}
-	cp ./rpm/v${VERSION}.tar.gz ${RPM_TOPDIR}/SOURCES
+.PHONY: dvb
+dvp: dist ##             - Creates a local RPM package, useful for development
+	cd $(ROOTDIR) && mkdir -p ${RPM_TOPDIR}/{RPMS,SRPMS,BUILD,SOURCES}
+	cd $(ROOTDIR) && tools/version-update -v ${VERSION}
+	cd $(ROOTDIR) && cp ./rpm/qm-dvb-${VERSION}.tar.gz ${RPM_TOPDIR}/SOURCES
 	rpmbuild -ba \
 		--define="_topdir ${RPM_TOPDIR}" \
 		--define="version ${VERSION}" \
diff --git a/subsystems/img_tempdir/Makefile b/subsystems/img_tempdir/Makefile
index bff1a218..289a1c7e 100644
--- a/subsystems/img_tempdir/Makefile
+++ b/subsystems/img_tempdir/Makefile
@@ -1,25 +1,26 @@
-SPECFILE_SUBPACKAGE_IMG_TEMPDIR=rpm/img_tempdir/img_tempdir.spec
+RPM_TOPDIR ?= $(PWD)/rpmbuild
+VERSION ?= $(shell cat VERSION)
+ROOTDIR ?= $(PWD)
+SPECFILE_SUBPACKAGE_IMG_TEMPDIR ?= ${ROOTDIR}/rpm/img_tempdir/img_tempdir.spec
 
 .PHONY: dist
 dist: ##             - Creates the QM img_tempdir package
 	cd $(ROOTDIR) && tar cvz \
-		--exclude-from=build-aux/exclude_from_tar_gz_subpackage_kvm.txt \
 		--dereference \
 		--transform s/qm/qm-img_tempdir-${VERSION}/ \
 		-f /tmp/qm-img_tempdir-${VERSION}.tar.gz \
 		../qm/README.md \
 		../qm/SECURITY.md \
 		../qm/LICENSE \
-		../qm/ \
 		../qm/etc/qm/containers/containers.conf.d/qm_dropin_img_tempdir.conf
 	cd $(ROOTDIR) && mv /tmp/qm-img_tempdir-${VERSION}.tar.gz ./rpm
 
-.PHONY: rpm
-rpm: dist ##           - Creates a local RPM package, useful for development
-	mkdir -p ${RPM_TOPDIR}/{RPMS,SRPMS,BUILD,SOURCES}
-	tools/version-update -v ${VERSION}
-	cp ./rpm/v${VERSION}.tar.gz ${RPM_TOPDIR}/SOURCES
-		rpmbuild -ba \
+.PHONY: img_tempdir
+img_tempdir: dist ##           - Creates a local RPM package, useful for development
+	cd $(ROOTDIR) && mkdir -p ${RPM_TOPDIR}/{RPMS,SRPMS,BUILD,SOURCES}
+	cd $(ROOTDIR) && tools/version-update -v ${VERSION}
+	cd $(ROOTDIR) && cp ./rpm/qm-img_tempdir-${VERSION}.tar.gz ${RPM_TOPDIR}/SOURCES
+	rpmbuild -ba \
 		--define="_topdir ${RPM_TOPDIR}" \
 		--define="version ${VERSION}" \
 		${SPECFILE_SUBPACKAGE_IMG_TEMPDIR}
diff --git a/subsystems/input/Makefile b/subsystems/input/Makefile
index 37e7c92d..36b747ca 100644
--- a/subsystems/input/Makefile
+++ b/subsystems/input/Makefile
@@ -1,24 +1,25 @@
-SPECFILE_SUBPACKAGE_INPUT=rpm/input/input.spec
+RPM_TOPDIR ?= $(PWD)/rpmbuild
+VERSION ?= $(shell cat VERSION)
+ROOTDIR ?= $(PWD)
+SPECFILE_SUBPACKAGE_INPUT ?= ${ROOTDIR}/rpm/input/input.spec
 
 .PHONY: dist
 dist: ##             - Creates the QM input package
 	cd $(ROOTDIR) && tar cvz \
-		--exclude-from=build-aux/exclude_from_tar_gz_subpackage_kvm.txt \
 		--dereference \
 		--transform s/qm/qm-input-${VERSION}/ \
 		-f /tmp/qm-input-${VERSION}.tar.gz \
 		../qm/README.md \
 		../qm/SECURITY.md \
 		../qm/LICENSE \
-		../qm/ \
 		../qm/etc/containers/systemd/qm.container.d/qm_dropin_mount_bind_input.conf
 	cd $(ROOTDIR) && mv /tmp/qm-input-${VERSION}.tar.gz ./rpm
 
-.PHONY: rpm
-rpm: dist ##             - Creates a local RPM package, useful for development
-	mkdir -p ${RPM_TOPDIR}/{RPMS,SRPMS,BUILD,SOURCES}
-	tools/version-update -v ${VERSION}
-	cp ./rpm/v${VERSION}.tar.gz ${RPM_TOPDIR}/SOURCES
+.PHONY: input
+input:  dist ##             - Creates a local RPM package, useful for development
+	cd $(ROOTDIR) && mkdir -p ${RPM_TOPDIR}/{RPMS,SRPMS,BUILD,SOURCES}
+	cd $(ROOTDIR) && tools/version-update -v ${VERSION}
+	cd $(ROOTDIR) && cp ./rpm/qm-input-${VERSION}.tar.gz ${RPM_TOPDIR}/SOURCES
 	rpmbuild -ba \
 		--define="_topdir ${RPM_TOPDIR}" \
 		--define="version ${VERSION}" \
diff --git a/subsystems/radio/Makefile b/subsystems/radio/Makefile
index 00d43b4d..8796bfb3 100644
--- a/subsystems/radio/Makefile
+++ b/subsystems/radio/Makefile
@@ -1,25 +1,26 @@
-SPECFILE_SUBPACKAGE_RADIO=rpm/radio/radio.spec
+RPM_TOPDIR ?= $(PWD)/rpmbuild
+VERSION ?= $(shell cat VERSION)
+ROOTDIR ?= $(PWD)
+SPECFILE_SUBPACKAGE_VIDEO ?= ${ROOTDIR}/rpm/radio/radio.spec
 
 .PHONY: dist
 dist: ##             - Creates the QM radio package
 	cd $(ROOTDIR) && tar cvz \
-		--exclude-from=build-aux/exclude_from_tar_gz_subpackage_kvm.txt \
 		--dereference \
 		--transform s/qm/qm-radio-${VERSION}/ \
 		-f /tmp/qm-radio-${VERSION}.tar.gz \
 		../qm/README.md \
 		../qm/SECURITY.md \
 		../qm/LICENSE \
-		../qm/ \
                 ../qm/etc/containers/systemd/qm.container.d/qm_dropin_mount_bind_radio.conf
 	cd $(ROOTDIR) && mv /tmp/qm-radio-${VERSION}.tar.gz ./rpm
 
 
-.PHONY: rpm
-	rpm: dist ##             - Creates a local RPM package, useful for development
-	mkdir -p ${RPM_TOPDIR}/{RPMS,SRPMS,BUILD,SOURCES}
-	tools/version-update -v ${VERSION}
-	cp ./rpm/v${VERSION}.tar.gz ${RPM_TOPDIR}/SOURCES
+.PHONY: radio
+radio: dist ##             - Creates a local RPM package, useful for development
+	cd $(ROOTDIR) && mkdir -p ${RPM_TOPDIR}/{RPMS,SRPMS,BUILD,SOURCES}
+	cd $(ROOTDIR) && tools/version-update -v ${VERSION}
+	cd $(ROOTDIR) && cp ./rpm/qm-radio-${VERSION}.tar.gz ${RPM_TOPDIR}/SOURCES
 	rpmbuild -ba \
 		--define="_topdir ${RPM_TOPDIR}" \
 		--define="version ${VERSION}" \
diff --git a/subsystems/text2speech/Makefile b/subsystems/text2speech/Makefile
index d31fde1c..35b23b92 100644
--- a/subsystems/text2speech/Makefile
+++ b/subsystems/text2speech/Makefile
@@ -1,23 +1,24 @@
-SPECFILE_SUBPACKAGE_TEXT2SPEECH=rpm/text2speech/text2speech.spec
+RPM_TOPDIR ?= $(PWD)/rpmbuild
+VERSION ?= $(shell cat VERSION)
+ROOTDIR ?= $(PWD)
+SPECFILE_SUBPACKAGE_TEXT2SPEECH ?= ${ROOTDIR}/rpm/text2speech/text2speech.spec
 
 .PHONY: dist
 dist: ##             - Creates the QM input package
 	cd $(ROOTDIR) && tar cvz \
-		--exclude-from=build-aux/exclude_from_tar_gz_subpackage_kvm.txt \
 		--dereference \
 		--transform s/qm/qm-text2speech-${VERSION}/ \
 		-f /tmp/qm-text2speech-${VERSION}.tar.gz \
 		../qm/README.md \
 		../qm/SECURITY.md \
 		../qm/LICENSE \
-		../qm/
 	cd $(ROOTDIR) && mv /tmp/qm-text2speech-${VERSION}.tar.gz ./rpm
 
-.PHONY: rpm
-rpm: dist ##            - Creates a local RPM package, useful for development
+.PHONY: qm-text2speech
+qm-text2speech: dist ##            - Creates a local RPM package, useful for development
 	cd $(ROOTDIR) && mkdir -p ${RPM_TOPDIR}/{RPMS,SRPMS,BUILD,SOURCES}
 	cd $(ROOTDIR) && tools/version-update -v ${VERSION}
-	cd $(ROOTDIR) && cp ./rpm/v${VERSION}.tar.gz ${RPM_TOPDIR}/SOURCES
+	cd $(ROOTDIR) && cp ./rpm/qm-text2speech-${VERSION}.tar.gz ${RPM_TOPDIR}/SOURCES
 	cd $(ROOTDIR) && rpmbuild -ba \
 		--define="_topdir ${RPM_TOPDIR}" \
 		--define="version ${VERSION}" \
diff --git a/subsystems/tty7/Makefile b/subsystems/tty7/Makefile
index 472c93e7..7b2b5c06 100644
--- a/subsystems/tty7/Makefile
+++ b/subsystems/tty7/Makefile
@@ -3,22 +3,20 @@ SPECFILE_SUBPACKAGE_TTY7=rpm/tty7/tty7.spec
 .PHONY: dist
 dist: ##             - Creates the QM tty7 package
 	cd $(ROOTDIR) && tar cvz \
-		--exclude-from=build-aux/exclude_from_tar_gz_subpackage_kvm.txt \
 		--dereference \
 		--transform s/qm/qm-tty7-${VERSION}/ \
 		-f /tmp/qm-tty7-${VERSION}.tar.gz \
 		../qm/README.md \
 		../qm/SECURITY.md \
 		../qm/LICENSE \
-		../qm/ \
 		../qm/etc/containers/systemd/qm.container.d/qm_dropin_mount_bind_tty7.conf
 	cd $(ROOTDIR) && mv /tmp/qm-tty7-${VERSION}.tar.gz ./rpm
 
-.PHONY: rpm
-rpm: dist ##             - Creates a local RPM package, useful for development
+.PHONY: tty7
+tty7: dist ##             - Creates a local RPM package, useful for development
 	cd $(ROOTDIR) && mkdir -p ${RPM_TOPDIR}/{RPMS,SRPMS,BUILD,SOURCES}
 	cd $(ROOTDIR) && tools/version-update -v ${VERSION}
-	cd $(ROOTDIR) && cp ./rpm/v${VERSION}.tar.gz ${RPM_TOPDIR}/SOURCES
+	cd $(ROOTDIR) && cp ./rpm/qm-tty7-${VERSION}.tar.gz ${RPM_TOPDIR}/SOURCES
 	cd $(ROOTDIR) && rpmbuild -ba \
 		--define="_topdir ${RPM_TOPDIR}" \
 		--define="version ${VERSION}" \
diff --git a/subsystems/ttyUSB0/Makefile b/subsystems/ttyUSB0/Makefile
index 42d450a2..662343bf 100644
--- a/subsystems/ttyUSB0/Makefile
+++ b/subsystems/ttyUSB0/Makefile
@@ -1,25 +1,26 @@
-SPECFILE_SUBPACKAGE_TTYUSB0=rpm/ttyUSB0/ttyUSB0.spec
+RPM_TOPDIR ?= $(PWD)/rpmbuild
+VERSION ?= $(shell cat VERSION)
+ROOTDIR ?= $(PWD)
+SPECFILE_SUBPACKAGE_TTYUSB0 ?= ${ROOTDIR}/rpm/ttyUSB0/ttyUSB0.spec
 
 .PHONY: dist
 dist: ##             - Creates the QM ttyUSB0 package
 	cd $(ROOTDIR) && tar cvz \
-		--exclude-from=build-aux/exclude_from_tar_gz_subpackage_kvm.txt \
 		--dereference \
 		--transform s/qm/qm-ttyUSB0-${VERSION}/ \
 		-f /tmp/qm-ttyUSB0-${VERSION}.tar.gz \
 		../qm/README.md \
 		../qm/SECURITY.md \
 		../qm/LICENSE \
-		../qm/ \
 		../qm/etc/containers/systemd/qm.container.d/qm_dropin_mount_bind_ttyUSB0.conf
 	cd $(ROOTDIR) && mv /tmp/qm-ttyUSB0-${VERSION}.tar.gz ./rpm
 
-.PHONY: rpm
-rpm: dist ##             - Creates a local RPM package, useful for development
+.PHONY: ttyusb0
+ttyusb0: dist ##             - Creates a local RPM package, useful for development
 	cd $(ROOTDIR) && mkdir -p ${RPM_TOPDIR}/{RPMS,SRPMS,BUILD,SOURCES}
 	cd $(ROOTDIR) && tools/version-update -v ${VERSION}
-	cd $(ROOTDIR) && cp ./rpm/v${VERSION}.tar.gz ${RPM_TOPDIR}/SOURCES
-	cd $(ROOTDIR) && rpmbuild -ba \
+	cd $(ROOTDIR) && cp ./rpm/qm-ttyUSB0${VERSION}.tar.gz ${RPM_TOPDIR}/SOURCES
+	rpmbuild -ba \
 		--define="_topdir ${RPM_TOPDIR}" \
 		--define="version ${VERSION}" \
 		${SPECFILE_SUBPACKAGE_TTYUSB0}