diff --git a/.gitignore b/.gitignore
index 8c82430..0e74474 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 output
 *.whl
+wheel2deb.yml
diff --git a/build.sh b/build.sh
index 45245fd..fd2e5f6 100644
--- a/build.sh
+++ b/build.sh
@@ -1,13 +1,20 @@
 #!/bin/bash
 
-DISTRIBUTION=${DISTRIBUTION:-jammy}
+DISTRIBUTION=${DISTRIBUTION:-noble}
+REVISION=${REVISION:-1}
 
 rm -rf output
+rm -rf *.whl
+rm wheel2deb.yml
 
 # Download latest weels
 python3 -m pip wheel PySide6-Essentials
 python3 -m pip wheel PySide6-Addons
 
+# Create wheel for distribution
+cp wheel2deb.src.yml wheel2deb.yml
+sed -i -e "s/\\[DIST\\]/$DISTRIBUTION/g" wheel2deb.yml
+
 wheel2deb convert -c ./wheel2deb.yml
 
 echo -e "\n[Writing modifications]\n"
@@ -16,10 +23,24 @@ for i in output/*; do
     cp copyright "$i/debian" # Add copyrights
     perl -i -p0e 's/python3 \(<< 3.(\d)+\),//gm' "$i/debian/control" # Remove upper limit from control.
     sed -i "s/stable;/$DISTRIBUTION;/g" "$i/debian/changelog" # Change distribution.
+    sed -i "s/1~w2d0/$REVISION/g" "$i/debian/changelog" # Change suffix
+    mv "$i" "${i/1~w2d0/$REVISION}"
 done
 
 # Moving the shaders library over to essentials since it's required by Qt5Compat
-# mv output/python3-pyside6-addons_*_amd64/src/PySide6/Qt/lib/libQt6ShaderTools.so.6 output/python3-pyside6-essentials_*_amd64/src/PySide6/Qt/lib/
+mv output/python3-pyside6-addons_*_amd64/src/PySide6/Qt/lib/libQt6ShaderTools.so.6 output/python3-pyside6-essentials_*_amd64/src/PySide6/Qt/lib/
 
 # Remove conflicting files between Essentials and Addons
-rm output/python3-pyside6-addons_*_amd64/src/PySide6/__init__.py
+rm output/python3-pyside6-addons_*_amd64/src/PySide6/{__init__.py,_config.py,_git_pyside_version.py}
+rm -r output/python3-pyside6-addons_*_amd64/src/PySide6/{QtAsyncio,support,scripts}
+
+# Removing conflictual directories
+rm -rf output/python3-pyside6-addons_*_amd64/src/shiboken6*
+rm -rf output/python3-pyside6-essentials_*_amd64/src/shiboken6*
+rm -rf output/python3-shiboken6_*_amd64/src/PySide6
+
+function filter() { cat "$1" | awk "$2" > "$1"; }
+
+filter output/python3-shiboken6_*_amd64/debian/install '/^src\/shiboken6/ { print $0; }'
+filter output/python3-pyside6-essentials_*_amd64/debian/install '/^src\/PySide6/ { print $0; }'
+filter output/python3-pyside6-addons_*_amd64/debian/install '/^src\/PySide6/ { print $0; }'
diff --git a/upload.sh b/upload.sh
index 4e0bce9..824b582 100644
--- a/upload.sh
+++ b/upload.sh
@@ -3,7 +3,7 @@
 PPA_ARCHIVE="ppa:ad5001/logarithmplotter"
 
 # Build and sign the packages.
-for i in output/*; do
+for i in output/*_amd64; do
     cd "$i"
     debuild -S -sa -k"mail@ad5001.eu"
     cd ../../
diff --git a/wheel2deb.yml b/wheel2deb.src.yml
similarity index 80%
rename from wheel2deb.yml
rename to wheel2deb.src.yml
index 2ea43d7..2a3728f 100644
--- a/wheel2deb.yml
+++ b/wheel2deb.src.yml
@@ -1,4 +1,4 @@
 .:
   maintainer_name: 'Ad5001'                            
   maintainer_email: 'mail@ad5001.eu' 
-  distribution: jammy
+  distribution: [DIST]