diff --git a/docker/Dockerfile_debian_10 b/docker/Dockerfile_debian_10
index 10dc6cc6e0c2d9c032c9032af1a2e7df8ea85141..a96b009b769197a95e448747843ed1ac50c7cfe1 100644
--- a/docker/Dockerfile_debian_10
+++ b/docker/Dockerfile_debian_10
@@ -19,13 +19,8 @@ RUN sh -c "echo 'deb [signed-by=/usr/share/keyrings/jami-archive-keyring.gpg] ht
 RUN sed -n '/^deb\s/s//deb-src /p' /etc/apt/sources.list > /etc/apt/sources.list.d/deb-src.list
 RUN apt-get clean && apt-get update
 
-COPY packaging/rules/debian/* ${OVERRIDE_PACKAGING_DIR} /tmp/builddeps/debian/
-RUN cd /tmp/builddeps/debian; \
-    if [ -n "${OVERRIDE_PACKAGING_DIR}" ] && [ -d "$(basename ${OVERRIDE_PACKAGING_DIR})" ]; then \
-        mv "$(basename ${OVERRIDE_PACKAGING_DIR})"/* .; \
-        rm -r "$(basename ${OVERRIDE_PACKAGING_DIR})"; \
-    fi; \
-    cd ..; \
+COPY packaging/rules/debian/* /tmp/builddeps/debian/
+RUN cd /tmp/builddeps && \
     apt-get update; \
     mk-build-deps \
         --remove --install \
diff --git a/docker/Dockerfile_debian_10_arm64 b/docker/Dockerfile_debian_10_arm64
index e14ed3bc5c9eff1b84f7b0d74ee6f86fb1d0fffc..0dd24e068a135396816008809067d7dcd465a19e 100644
--- a/docker/Dockerfile_debian_10_arm64
+++ b/docker/Dockerfile_debian_10_arm64
@@ -19,13 +19,8 @@ RUN sh -c "echo 'deb [signed-by=/usr/share/keyrings/jami-archive-keyring.gpg] ht
 RUN sed -n '/^deb\s/s//deb-src /p' /etc/apt/sources.list > /etc/apt/sources.list.d/deb-src.list
 RUN apt-get clean && apt-get update
 
-COPY packaging/rules/debian/* ${OVERRIDE_PACKAGING_DIR} /tmp/builddeps/debian/
-RUN cd /tmp/builddeps/debian; \
-    if [ -n "${OVERRIDE_PACKAGING_DIR}" ] && [ -d "$(basename ${OVERRIDE_PACKAGING_DIR})" ]; then \
-        mv "$(basename ${OVERRIDE_PACKAGING_DIR})"/* .; \
-        rm -r "$(basename ${OVERRIDE_PACKAGING_DIR})"; \
-    fi; \
-    cd ..; \
+COPY packaging/rules/debian/* /tmp/builddeps/debian/
+RUN cd /tmp/builddeps && \
     apt-get update; \
     mk-build-deps \
         --remove --install \
diff --git a/docker/Dockerfile_debian_10_armhf b/docker/Dockerfile_debian_10_armhf
index b248da2c8c2232575045e7b62ac1fa77cc919889..f8229e9bd9b7101463a233eb03d3a6e6436dd2f1 100644
--- a/docker/Dockerfile_debian_10_armhf
+++ b/docker/Dockerfile_debian_10_armhf
@@ -19,13 +19,8 @@ RUN sh -c "echo 'deb [signed-by=/usr/share/keyrings/jami-archive-keyring.gpg] ht
 RUN sed -n '/^deb\s/s//deb-src /p' /etc/apt/sources.list > /etc/apt/sources.list.d/deb-src.list
 RUN apt-get clean && apt-get update
 
-COPY packaging/rules/debian/* ${OVERRIDE_PACKAGING_DIR} /tmp/builddeps/debian/
-RUN cd /tmp/builddeps/debian; \
-    if [ -n "${OVERRIDE_PACKAGING_DIR}" ] && [ -d "$(basename ${OVERRIDE_PACKAGING_DIR})" ]; then \
-        mv "$(basename ${OVERRIDE_PACKAGING_DIR})"/* .; \
-        rm -r "$(basename ${OVERRIDE_PACKAGING_DIR})"; \
-    fi; \
-    cd ..; \
+COPY packaging/rules/debian/* /tmp/builddeps/debian/
+RUN cd /tmp/builddeps && \
     apt-get update; \
     mk-build-deps \
         --remove --install \
diff --git a/docker/Dockerfile_debian_10_i386 b/docker/Dockerfile_debian_10_i386
index f40d46732f13fae1bea34f54ca6bb734e69cb7ec..4d08a5a56456cd34ce9067358c63687607700eba 100644
--- a/docker/Dockerfile_debian_10_i386
+++ b/docker/Dockerfile_debian_10_i386
@@ -19,13 +19,8 @@ RUN sh -c "echo 'deb [signed-by=/usr/share/keyrings/jami-archive-keyring.gpg] ht
 RUN sed -n '/^deb\s/s//deb-src /p' /etc/apt/sources.list > /etc/apt/sources.list.d/deb-src.list
 RUN apt-get clean && apt-get update
 
-COPY packaging/rules/debian/* ${OVERRIDE_PACKAGING_DIR} /tmp/builddeps/debian/
-RUN cd /tmp/builddeps/debian; \
-    if [ -n "${OVERRIDE_PACKAGING_DIR}" ] && [ -d "$(basename ${OVERRIDE_PACKAGING_DIR})" ]; then \
-        mv "$(basename ${OVERRIDE_PACKAGING_DIR})"/* .; \
-        rm -r "$(basename ${OVERRIDE_PACKAGING_DIR})"; \
-    fi; \
-    cd ..; \
+COPY packaging/rules/debian/* /tmp/builddeps/debian/
+RUN cd /tmp/builddeps && \
     apt-get update; \
     mk-build-deps \
         --remove --install \
diff --git a/docker/Dockerfile_debian_10_qt b/docker/Dockerfile_debian_10_qt
index 32459806d5baa8a914916857d623bf0dda4b42a9..54e6b082072c2728eb26050b2bfe4118f6036f68 100644
--- a/docker/Dockerfile_debian_10_qt
+++ b/docker/Dockerfile_debian_10_qt
@@ -12,13 +12,8 @@ RUN apt-get update && \
 RUN sed -n '/^deb\s/s//deb-src /p' /etc/apt/sources.list > /etc/apt/sources.list.d/deb-src.list
 
 RUN apt-get clean && apt-get update
-COPY packaging/rules/debian-qt/* ${OVERRIDE_PACKAGING_DIR} /tmp/builddeps/debian/
-RUN cd /tmp/builddeps/debian; \
-    if [ -n "${OVERRIDE_PACKAGING_DIR}" ] && [ -d "$(basename ${OVERRIDE_PACKAGING_DIR})" ]; then \
-        mv "$(basename ${OVERRIDE_PACKAGING_DIR})"/* .; \
-        rm -r "$(basename ${OVERRIDE_PACKAGING_DIR})"; \
-    fi; \
-    cd ..; \
+COPY packaging/rules/debian-qt/* /tmp/builddeps/debian/
+RUN cd /tmp/builddeps && \
     apt-get update; \
     mk-build-deps \
         --remove --install \
diff --git a/docker/Dockerfile_ubuntu_18.04 b/docker/Dockerfile_ubuntu_18.04
index da48ed1e6bb58bca941ab7eaad330cd90139155c..b7d2ede170ebb5bb412f38ef92da6d13d77b9f6a 100644
--- a/docker/Dockerfile_ubuntu_18.04
+++ b/docker/Dockerfile_ubuntu_18.04
@@ -22,13 +22,8 @@ RUN sh -c "echo 'deb [signed-by=/usr/share/keyrings/jami-archive-keyring.gpg] ht
 RUN sed -n '/^deb\s/s//deb-src /p' /etc/apt/sources.list > /etc/apt/sources.list.d/deb-src.list
 RUN apt-get clean && apt-get update
 
-COPY packaging/rules/debian/* ${OVERRIDE_PACKAGING_DIR} /tmp/builddeps/debian/
-RUN cd /tmp/builddeps/debian; \
-    if [ -n "${OVERRIDE_PACKAGING_DIR}" ] && [ -d "$(basename ${OVERRIDE_PACKAGING_DIR})" ]; then \
-        mv "$(basename ${OVERRIDE_PACKAGING_DIR})"/* .; \
-        rm -r "$(basename ${OVERRIDE_PACKAGING_DIR})"; \
-    fi; \
-    cd ..; \
+COPY packaging/rules/debian/* /tmp/builddeps/debian/
+RUN cd /tmp/builddeps && \
     apt-get update; \
     mk-build-deps \
         --remove --install \
diff --git a/docker/Dockerfile_ubuntu_18.04_i386 b/docker/Dockerfile_ubuntu_18.04_i386
index 35d636ffc9cd2aa90135de8b02c0ce4b8d701845..e6aaa730d3fe997aa756b9c6ea95f3af7a73d081 100644
--- a/docker/Dockerfile_ubuntu_18.04_i386
+++ b/docker/Dockerfile_ubuntu_18.04_i386
@@ -22,13 +22,8 @@ RUN sh -c "echo 'deb [signed-by=/usr/share/keyrings/jami-archive-keyring.gpg] ht
 RUN sed -n '/^deb\s/s//deb-src /p' /etc/apt/sources.list > /etc/apt/sources.list.d/deb-src.list
 RUN apt-get clean && apt-get update
 
-COPY packaging/rules/debian/* ${OVERRIDE_PACKAGING_DIR} /tmp/builddeps/debian/
-RUN cd /tmp/builddeps/debian; \
-    if [ -n "${OVERRIDE_PACKAGING_DIR}" ] && [ -d "$(basename ${OVERRIDE_PACKAGING_DIR})" ]; then \
-        mv "$(basename ${OVERRIDE_PACKAGING_DIR})"/* .; \
-        rm -r "$(basename ${OVERRIDE_PACKAGING_DIR})"; \
-    fi; \
-    cd ..; \
+COPY packaging/rules/debian/* /tmp/builddeps/debian/
+RUN cd /tmp/builddeps && \
     apt-get update; \
     mk-build-deps \
         --remove --install \
diff --git a/docker/Dockerfile_ubuntu_18.04_qt b/docker/Dockerfile_ubuntu_18.04_qt
index 222be506c1b40deadec434c73648f92003539514..774f56f3afb4efe02501d98c272cf9c6b599e49c 100644
--- a/docker/Dockerfile_ubuntu_18.04_qt
+++ b/docker/Dockerfile_ubuntu_18.04_qt
@@ -13,13 +13,8 @@ RUN apt-get update && \
 RUN sed -n '/^deb\s/s//deb-src /p' /etc/apt/sources.list > /etc/apt/sources.list.d/deb-src.list
 
 RUN apt-get clean && apt-get update
-COPY packaging/rules/debian-qt/* ${OVERRIDE_PACKAGING_DIR} /tmp/builddeps/debian/
-RUN cd /tmp/builddeps/debian; \
-    if [ -n "${OVERRIDE_PACKAGING_DIR}" ] && [ -d "$(basename ${OVERRIDE_PACKAGING_DIR})" ]; then \
-        mv "$(basename ${OVERRIDE_PACKAGING_DIR})"/* .; \
-        rm -r "$(basename ${OVERRIDE_PACKAGING_DIR})"; \
-    fi; \
-    cd ..; \
+COPY packaging/rules/debian-qt/* /tmp/builddeps/debian/
+RUN cd /tmp/builddeps && \
     apt-get update; \
     mk-build-deps \
         --remove --install \
diff --git a/docker/Dockerfile_ubuntu_18.04_qt_i386 b/docker/Dockerfile_ubuntu_18.04_qt_i386
index 271b8afda4cf8fe14e779f45974347af098159f7..4b31ab2ef8d5b77fa8f6ea8973837266dc2cfcb6 100644
--- a/docker/Dockerfile_ubuntu_18.04_qt_i386
+++ b/docker/Dockerfile_ubuntu_18.04_qt_i386
@@ -13,13 +13,8 @@ RUN apt-get update && \
 RUN sed -n '/^deb\s/s//deb-src /p' /etc/apt/sources.list > /etc/apt/sources.list.d/deb-src.list
 
 RUN apt-get clean && apt-get update
-COPY packaging/rules/debian-qt/* ${OVERRIDE_PACKAGING_DIR} /tmp/builddeps/debian/
-RUN cd /tmp/builddeps/debian; \
-    if [ -n "${OVERRIDE_PACKAGING_DIR}" ] && [ -d "$(basename ${OVERRIDE_PACKAGING_DIR})" ]; then \
-        mv "$(basename ${OVERRIDE_PACKAGING_DIR})"/* .; \
-        rm -r "$(basename ${OVERRIDE_PACKAGING_DIR})"; \
-    fi; \
-    cd ..; \
+COPY packaging/rules/debian-qt/* /tmp/builddeps/debian/
+RUN cd /tmp/builddeps && \
     apt-get update; \
     mk-build-deps \
         --remove --install \
diff --git a/docker/Dockerfile_ubuntu_20.04 b/docker/Dockerfile_ubuntu_20.04
index d4bb9ae8b7a69420f70b742b31f9abd4224ab23d..e3adb9b7453b5b021ef81a9e86c9bda7a863a13c 100644
--- a/docker/Dockerfile_ubuntu_20.04
+++ b/docker/Dockerfile_ubuntu_20.04
@@ -20,13 +20,8 @@ RUN sh -c "echo 'deb [signed-by=/usr/share/keyrings/jami-archive-keyring.gpg] ht
 RUN sed -n '/^deb\s/s//deb-src /p' /etc/apt/sources.list > /etc/apt/sources.list.d/deb-src.list
 RUN apt-get clean && apt-get update
 
-COPY packaging/rules/debian/* ${OVERRIDE_PACKAGING_DIR} /tmp/builddeps/debian/
-RUN cd /tmp/builddeps/debian; \
-    if [ -n "${OVERRIDE_PACKAGING_DIR}" ] && [ -d "$(basename ${OVERRIDE_PACKAGING_DIR})" ]; then \
-        mv "$(basename ${OVERRIDE_PACKAGING_DIR})"/* .; \
-        rm -r "$(basename ${OVERRIDE_PACKAGING_DIR})"; \
-    fi; \
-    cd ..; \
+COPY packaging/rules/debian/* /tmp/builddeps/debian/
+RUN cd /tmp/builddeps && \
     apt-get update; \
     mk-build-deps \
         --remove --install \
diff --git a/docker/Dockerfile_ubuntu_20.04_qt b/docker/Dockerfile_ubuntu_20.04_qt
index 053bf6d20cad69e55d9d5d7afe3d50e2d34be092..12b5fc510b7ddce6ec9a88935e65ae886e4d0957 100644
--- a/docker/Dockerfile_ubuntu_20.04_qt
+++ b/docker/Dockerfile_ubuntu_20.04_qt
@@ -13,13 +13,8 @@ RUN apt-get update && \
 RUN sed -n '/^deb\s/s//deb-src /p' /etc/apt/sources.list > /etc/apt/sources.list.d/deb-src.list
 
 RUN apt-get clean && apt-get update
-COPY packaging/rules/debian-qt/* ${OVERRIDE_PACKAGING_DIR} /tmp/builddeps/debian/
-RUN cd /tmp/builddeps/debian; \
-    if [ -n "${OVERRIDE_PACKAGING_DIR}" ] && [ -d "$(basename ${OVERRIDE_PACKAGING_DIR})" ]; then \
-        mv "$(basename ${OVERRIDE_PACKAGING_DIR})"/* .; \
-        rm -r "$(basename ${OVERRIDE_PACKAGING_DIR})"; \
-    fi; \
-    cd ..; \
+COPY packaging/rules/debian-qt/* /tmp/builddeps/debian/
+RUN cd /tmp/builddeps && \
     apt-get update; \
     mk-build-deps \
         --remove --install \
diff --git a/docker/Dockerfile_ubuntu_20.10 b/docker/Dockerfile_ubuntu_20.10
index 6201b4247e4bc03ac4aae587bcc13df7a11b1635..db33b2937fb360396723c762a46e338b4a4f8270 100644
--- a/docker/Dockerfile_ubuntu_20.10
+++ b/docker/Dockerfile_ubuntu_20.10
@@ -20,13 +20,8 @@ RUN sh -c "echo 'deb [signed-by=/usr/share/keyrings/jami-archive-keyring.gpg] ht
 RUN sed -n '/^deb\s/s//deb-src /p' /etc/apt/sources.list > /etc/apt/sources.list.d/deb-src.list
 RUN apt-get clean && apt-get update
 
-COPY packaging/rules/debian/* ${OVERRIDE_PACKAGING_DIR} /tmp/builddeps/debian/
-RUN cd /tmp/builddeps/debian; \
-    if [ -n "${OVERRIDE_PACKAGING_DIR}" ] && [ -d "$(basename ${OVERRIDE_PACKAGING_DIR})" ]; then \
-        mv "$(basename ${OVERRIDE_PACKAGING_DIR})"/* .; \
-        rm -r "$(basename ${OVERRIDE_PACKAGING_DIR})"; \
-    fi; \
-    cd ..; \
+COPY packaging/rules/debian/* /tmp/builddeps/debian/
+RUN cd /tmp/builddeps && \
     apt-get update; \
     mk-build-deps \
         --remove --install \
diff --git a/docker/Dockerfile_ubuntu_20.10_qt b/docker/Dockerfile_ubuntu_20.10_qt
index 6b1ed4cb241efbb5768f71f2348a7641769cea90..46adee1df9f87226dfc5723b0cfd31a10cd12cf5 100644
--- a/docker/Dockerfile_ubuntu_20.10_qt
+++ b/docker/Dockerfile_ubuntu_20.10_qt
@@ -13,13 +13,8 @@ RUN apt-get update && \
 RUN sed -n '/^deb\s/s//deb-src /p' /etc/apt/sources.list > /etc/apt/sources.list.d/deb-src.list
 
 RUN apt-get clean && apt-get update
-COPY packaging/rules/debian-qt/* ${OVERRIDE_PACKAGING_DIR} /tmp/builddeps/debian/
-RUN cd /tmp/builddeps/debian; \
-    if [ -n "${OVERRIDE_PACKAGING_DIR}" ] && [ -d "$(basename ${OVERRIDE_PACKAGING_DIR})" ]; then \
-        mv "$(basename ${OVERRIDE_PACKAGING_DIR})"/* .; \
-        rm -r "$(basename ${OVERRIDE_PACKAGING_DIR})"; \
-    fi; \
-    cd ..; \
+COPY packaging/rules/debian-qt/* /tmp/builddeps/debian/
+RUN cd /tmp/builddeps && \
     apt-get update; \
     mk-build-deps \
         --remove --install \
diff --git a/scripts/build-package-debian-qt.sh b/scripts/build-package-debian-qt.sh
index bfbf46a5d18c2f759199042b931ce66859f88327..2852cbf74e2952a87405d141b4dc6b24372618f8 100755
--- a/scripts/build-package-debian-qt.sh
+++ b/scripts/build-package-debian-qt.sh
@@ -24,10 +24,6 @@
 set -e
 
 PKG_DIR="packaging/rules/debian-qt"
-if [ -n "${OVERRIDE_PACKAGING_DIR}" ]; then
-    echo "Using OVERRIDE_PACKAGING_DIR: $OVERRIDE_PACKAGING_DIR"
-    PKG_DIR="${OVERRIDE_PACKAGING_DIR}"
-fi
 
 cache_dir=/opt/ring-contrib
 temp_dir=$(mktemp -d)
diff --git a/scripts/build-package-debian.sh b/scripts/build-package-debian.sh
index 0a93f4b37cb620cc656a60c57c79cab065fb12e3..0df0d246f94f82ff91a29d1faf12587f5f6d4bd9 100755
--- a/scripts/build-package-debian.sh
+++ b/scripts/build-package-debian.sh
@@ -27,11 +27,6 @@ cp -r /opt/ring-project-ro /opt/ring-project
 cd /opt/ring-project
 
 PKG_DIR="packaging/rules/debian"
-if [ -z "${OVERRIDE_PACKAGING_DIR}" ]; then
-    echo "OVERRIDE_PACKAGING_DIR not set."
-else
-    PKG_DIR="${OVERRIDE_PACKAGING_DIR}"
-fi
 
 # import the debian folder and override files if needed
 cp -r ${PKG_DIR} debian