From 418edb8e2bf00670c52ca12afd1d0488cf90b68e Mon Sep 17 00:00:00 2001
From: Andrey Volk <andywolk@gmail.com>
Date: Fri, 21 Nov 2025 17:47:45 +0300
Subject: [PATCH] [Build-System] Use unique .orig.tar.xz filenames across
 different Debian distributions. Update Debian distributions since stable is
 Trixie now. Use codename instead of suite when generating the distribution
 field in .changes files. (#2953)

---
 .../bookworm/amd64/public.release.Dockerfile  | 30 ++++++++---------
 .../bookworm/amd64/public.unstable.Dockerfile | 30 ++++++++---------
 .../arm32v7/public.release.Dockerfile         | 31 ++++++++---------
 .../arm32v7/public.unstable.Dockerfile        | 31 ++++++++---------
 .../arm64v8/public.release.Dockerfile         | 31 ++++++++---------
 .../arm64v8/public.unstable.Dockerfile        | 31 ++++++++---------
 .../bullseye/amd64/public.release.Dockerfile  | 33 ++++++++++---------
 .../bullseye/amd64/public.unstable.Dockerfile | 33 ++++++++++---------
 .../arm32v7/public.release.Dockerfile         | 31 ++++++++---------
 .../arm32v7/public.unstable.Dockerfile        | 31 ++++++++---------
 .../arm64v8/public.release.Dockerfile         | 31 ++++++++---------
 .../arm64v8/public.unstable.Dockerfile        | 31 ++++++++---------
 .../trixie/amd64/public.release.Dockerfile    | 30 ++++++++---------
 .../trixie/amd64/public.unstable.Dockerfile   | 30 ++++++++---------
 .../trixie/arm32v7/public.release.Dockerfile  | 28 ++++++++--------
 .../trixie/arm32v7/public.unstable.Dockerfile | 28 ++++++++--------
 .../trixie/arm64v8/public.release.Dockerfile  | 28 ++++++++--------
 .../trixie/arm64v8/public.unstable.Dockerfile | 28 ++++++++--------
 debian/util.sh                                | 22 ++++++-------
 19 files changed, 289 insertions(+), 279 deletions(-)

diff --git a/.github/docker/debian/bookworm/amd64/public.release.Dockerfile b/.github/docker/debian/bookworm/amd64/public.release.Dockerfile
index 2a99fe6a46..86f78c7018 100644
--- a/.github/docker/debian/bookworm/amd64/public.release.Dockerfile
+++ b/.github/docker/debian/bookworm/amd64/public.release.Dockerfile
@@ -59,8 +59,7 @@ COPY . ${DATA_DIR}
 WORKDIR ${DATA_DIR}
 RUN echo "export VERSION=$(cat ./build/next-release.txt | tr -d '\n')" | tee -a ~/.env
 
-RUN . ~/.env && ./debian/util.sh prep-create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
-RUN . ~/.env && ./debian/util.sh prep-create-dsc ${CODENAME}
+RUN . ~/.env && ./debian/util.sh prep-create-dsc -a amd64 ${CODENAME}
 
 RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
     printf "machine ${REPO_DOMAIN} "  > /etc/apt/auth.conf && \
@@ -83,21 +82,22 @@ RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
     rm -f /etc/apt/auth.conf
 
 ENV DEB_BUILD_OPTIONS="parallel=1"
-RUN . ~/.env && dch -b -M -v "${VERSION}-${BUILD_NUMBER}-${GIT_SHA}~${CODENAME}" \
-  --force-distribution -D "${CODENAME}" "Nightly build, ${GIT_SHA}"
+RUN . ~/.env && ./debian/util.sh create-orig -n -v${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
 
-RUN . ~/.env && ./debian/util.sh create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
+RUN . ~/.env && ORIGFILE=$(find ../ -name "freeswitch_*.orig.tar.xz" -type f) \
+    && ./debian/util.sh create-dsc -a amd64 -z9 ${CODENAME} "$ORIGFILE"
 
-RUN dpkg-source \
-        --diff-ignore=.* \
-        --compression=xz \
-        --compression-level=9 \
-        --build \
-    . \
-    && debuild -b -us -uc \
-    && mkdir OUT \
-    && mv -v ../*.{deb,dsc,changes,tar.*} OUT/.
+WORKDIR /
+RUN dpkg-source -x freeswitch_*.dsc
+
+RUN cd freeswitch-*/ && debuild -S -sa -d -us -uc
+
+RUN cd freeswitch-*/ && debuild -b -us -uc
+
+RUN mkdir OUT && mv -v *.{deb,dsc,changes,tar.*} OUT/.
+
+RUN ls -lah /OUT
 
 # Artifacts image (mandatory part, the resulting image must have a single filesystem layer)
 FROM scratch
-COPY --from=builder /data/OUT/ /
+COPY --from=builder /OUT/ /
diff --git a/.github/docker/debian/bookworm/amd64/public.unstable.Dockerfile b/.github/docker/debian/bookworm/amd64/public.unstable.Dockerfile
index a39bbd05f2..f84da92fa4 100644
--- a/.github/docker/debian/bookworm/amd64/public.unstable.Dockerfile
+++ b/.github/docker/debian/bookworm/amd64/public.unstable.Dockerfile
@@ -59,8 +59,7 @@ COPY . ${DATA_DIR}
 WORKDIR ${DATA_DIR}
 RUN echo "export VERSION=$(cat ./build/next-release.txt | tr -d '\n')" | tee -a ~/.env
 
-RUN . ~/.env && ./debian/util.sh prep-create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
-RUN . ~/.env && ./debian/util.sh prep-create-dsc ${CODENAME}
+RUN . ~/.env && ./debian/util.sh prep-create-dsc -a amd64 ${CODENAME}
 
 RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
     printf "machine ${REPO_DOMAIN} "  > /etc/apt/auth.conf && \
@@ -83,21 +82,22 @@ RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
     rm -f /etc/apt/auth.conf
 
 ENV DEB_BUILD_OPTIONS="parallel=1"
-RUN . ~/.env && dch -b -M -v "${VERSION}-${BUILD_NUMBER}-${GIT_SHA}~${CODENAME}" \
-  --force-distribution -D "${CODENAME}" "Nightly build, ${GIT_SHA}"
+RUN . ~/.env && ./debian/util.sh create-orig -n -v${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
 
-RUN . ~/.env && ./debian/util.sh create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
+RUN . ~/.env && ORIGFILE=$(find ../ -name "freeswitch_*.orig.tar.xz" -type f) \
+    && ./debian/util.sh create-dsc -a amd64 -z9 ${CODENAME} "$ORIGFILE"
 
-RUN dpkg-source \
-        --diff-ignore=.* \
-        --compression=xz \
-        --compression-level=9 \
-        --build \
-    . \
-    && debuild -b -us -uc \
-    && mkdir OUT \
-    && mv -v ../*.{deb,dsc,changes,tar.*} OUT/.
+WORKDIR /
+RUN dpkg-source -x freeswitch_*.dsc
+
+RUN cd freeswitch-*/ && debuild -S -sa -d -us -uc
+
+RUN cd freeswitch-*/ && debuild -b -us -uc
+
+RUN mkdir OUT && mv -v *.{deb,dsc,changes,tar.*} OUT/.
+
+RUN ls -lah /OUT
 
 # Artifacts image (mandatory part, the resulting image must have a single filesystem layer)
 FROM scratch
-COPY --from=builder /data/OUT/ /
+COPY --from=builder /OUT/ /
diff --git a/.github/docker/debian/bookworm/arm32v7/public.release.Dockerfile b/.github/docker/debian/bookworm/arm32v7/public.release.Dockerfile
index 78d10ee66c..b7c5188292 100644
--- a/.github/docker/debian/bookworm/arm32v7/public.release.Dockerfile
+++ b/.github/docker/debian/bookworm/arm32v7/public.release.Dockerfile
@@ -59,7 +59,6 @@ COPY . ${DATA_DIR}
 WORKDIR ${DATA_DIR}
 RUN echo "export VERSION=$(cat ./build/next-release.txt | tr -d '\n')" | tee -a ~/.env
 
-RUN . ~/.env && ./debian/util.sh prep-create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
 RUN . ~/.env && ./debian/util.sh prep-create-dsc -a armhf ${CODENAME}
 
 RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
@@ -83,20 +82,22 @@ RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
     rm -f /etc/apt/auth.conf
 
 ENV DEB_BUILD_OPTIONS="parallel=1"
-RUN . ~/.env && dch -b -M -v "${VERSION}-${BUILD_NUMBER}-${GIT_SHA}~${CODENAME}" \
-  --force-distribution -D "${CODENAME}" "Nightly build, ${GIT_SHA}"
-RUN . ~/.env && ./debian/util.sh create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
-
-RUN dpkg-source \
-        --diff-ignore=.* \
-        --compression=xz \
-        --compression-level=9 \
-        --build \
-    . \
-    && debuild -b -us -uc \
-    && mkdir OUT \
-    && mv -v ../*.{deb,dsc,changes,tar.*} OUT/.
+RUN . ~/.env && ./debian/util.sh create-orig -n -v${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
+
+RUN . ~/.env && ORIGFILE=$(find ../ -name "freeswitch_*.orig.tar.xz" -type f) \
+    && ./debian/util.sh create-dsc -a armhf -z9 ${CODENAME} "$ORIGFILE"
+
+WORKDIR /
+RUN dpkg-source -x freeswitch_*.dsc
+
+RUN cd freeswitch-*/ && debuild -S -sa -d -us -uc
+
+RUN cd freeswitch-*/ && debuild -b -us -uc
+
+RUN mkdir OUT && mv -v *.{deb,dsc,changes,tar.*} OUT/.
+
+RUN ls -lah /OUT
 
 # Artifacts image (mandatory part, the resulting image must have a single filesystem layer)
 FROM scratch
-COPY --from=builder /data/OUT/ /
+COPY --from=builder /OUT/ /
diff --git a/.github/docker/debian/bookworm/arm32v7/public.unstable.Dockerfile b/.github/docker/debian/bookworm/arm32v7/public.unstable.Dockerfile
index 94ef25d432..48f00343da 100644
--- a/.github/docker/debian/bookworm/arm32v7/public.unstable.Dockerfile
+++ b/.github/docker/debian/bookworm/arm32v7/public.unstable.Dockerfile
@@ -59,7 +59,6 @@ COPY . ${DATA_DIR}
 WORKDIR ${DATA_DIR}
 RUN echo "export VERSION=$(cat ./build/next-release.txt | tr -d '\n')" | tee -a ~/.env
 
-RUN . ~/.env && ./debian/util.sh prep-create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
 RUN . ~/.env && ./debian/util.sh prep-create-dsc -a armhf ${CODENAME}
 
 RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
@@ -83,20 +82,22 @@ RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
     rm -f /etc/apt/auth.conf
 
 ENV DEB_BUILD_OPTIONS="parallel=1"
-RUN . ~/.env && dch -b -M -v "${VERSION}-${BUILD_NUMBER}-${GIT_SHA}~${CODENAME}" \
-  --force-distribution -D "${CODENAME}" "Nightly build, ${GIT_SHA}"
-RUN . ~/.env && ./debian/util.sh create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
-
-RUN dpkg-source \
-        --diff-ignore=.* \
-        --compression=xz \
-        --compression-level=9 \
-        --build \
-    . \
-    && debuild -b -us -uc \
-    && mkdir OUT \
-    && mv -v ../*.{deb,dsc,changes,tar.*} OUT/.
+RUN . ~/.env && ./debian/util.sh create-orig -n -v${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
+
+RUN . ~/.env && ORIGFILE=$(find ../ -name "freeswitch_*.orig.tar.xz" -type f) \
+    && ./debian/util.sh create-dsc -a armhf -z9 ${CODENAME} "$ORIGFILE"
+
+WORKDIR /
+RUN dpkg-source -x freeswitch_*.dsc
+
+RUN cd freeswitch-*/ && debuild -S -sa -d -us -uc
+
+RUN cd freeswitch-*/ && debuild -b -us -uc
+
+RUN mkdir OUT && mv -v *.{deb,dsc,changes,tar.*} OUT/.
+
+RUN ls -lah /OUT
 
 # Artifacts image (mandatory part, the resulting image must have a single filesystem layer)
 FROM scratch
-COPY --from=builder /data/OUT/ /
+COPY --from=builder /OUT/ /
diff --git a/.github/docker/debian/bookworm/arm64v8/public.release.Dockerfile b/.github/docker/debian/bookworm/arm64v8/public.release.Dockerfile
index 2bf5084ca3..6f11d33e3e 100644
--- a/.github/docker/debian/bookworm/arm64v8/public.release.Dockerfile
+++ b/.github/docker/debian/bookworm/arm64v8/public.release.Dockerfile
@@ -59,7 +59,6 @@ COPY . ${DATA_DIR}
 WORKDIR ${DATA_DIR}
 RUN echo "export VERSION=$(cat ./build/next-release.txt | tr -d '\n')" | tee -a ~/.env
 
-RUN . ~/.env && ./debian/util.sh prep-create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
 RUN . ~/.env && ./debian/util.sh prep-create-dsc -a arm64 ${CODENAME}
 
 RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
@@ -83,20 +82,22 @@ RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
     rm -f /etc/apt/auth.conf
 
 ENV DEB_BUILD_OPTIONS="parallel=1"
-RUN . ~/.env && dch -b -M -v "${VERSION}-${BUILD_NUMBER}-${GIT_SHA}~${CODENAME}" \
-  --force-distribution -D "${CODENAME}" "Nightly build, ${GIT_SHA}"
-RUN . ~/.env && ./debian/util.sh create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
-
-RUN dpkg-source \
-        --diff-ignore=.* \
-        --compression=xz \
-        --compression-level=9 \
-        --build \
-    . \
-    && debuild -b -us -uc \
-    && mkdir OUT \
-    && mv -v ../*.{deb,dsc,changes,tar.*} OUT/.
+RUN . ~/.env && ./debian/util.sh create-orig -n -v${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
+
+RUN . ~/.env && ORIGFILE=$(find ../ -name "freeswitch_*.orig.tar.xz" -type f) \
+    && ./debian/util.sh create-dsc -a arm64 -z9 ${CODENAME} "$ORIGFILE"
+
+WORKDIR /
+RUN dpkg-source -x freeswitch_*.dsc
+
+RUN cd freeswitch-*/ && debuild -S -sa -d -us -uc
+
+RUN cd freeswitch-*/ && debuild -b -us -uc
+
+RUN mkdir OUT && mv -v *.{deb,dsc,changes,tar.*} OUT/.
+
+RUN ls -lah /OUT
 
 # Artifacts image (mandatory part, the resulting image must have a single filesystem layer)
 FROM scratch
-COPY --from=builder /data/OUT/ /
+COPY --from=builder /OUT/ /
diff --git a/.github/docker/debian/bookworm/arm64v8/public.unstable.Dockerfile b/.github/docker/debian/bookworm/arm64v8/public.unstable.Dockerfile
index 56cc1c7e47..a185961dc6 100644
--- a/.github/docker/debian/bookworm/arm64v8/public.unstable.Dockerfile
+++ b/.github/docker/debian/bookworm/arm64v8/public.unstable.Dockerfile
@@ -59,7 +59,6 @@ COPY . ${DATA_DIR}
 WORKDIR ${DATA_DIR}
 RUN echo "export VERSION=$(cat ./build/next-release.txt | tr -d '\n')" | tee -a ~/.env
 
-RUN . ~/.env && ./debian/util.sh prep-create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
 RUN . ~/.env && ./debian/util.sh prep-create-dsc -a arm64 ${CODENAME}
 
 RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
@@ -83,20 +82,22 @@ RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
     rm -f /etc/apt/auth.conf
 
 ENV DEB_BUILD_OPTIONS="parallel=1"
-RUN . ~/.env && dch -b -M -v "${VERSION}-${BUILD_NUMBER}-${GIT_SHA}~${CODENAME}" \
-  --force-distribution -D "${CODENAME}" "Nightly build, ${GIT_SHA}"
-RUN . ~/.env && ./debian/util.sh create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
-
-RUN dpkg-source \
-        --diff-ignore=.* \
-        --compression=xz \
-        --compression-level=9 \
-        --build \
-    . \
-    && debuild -b -us -uc \
-    && mkdir OUT \
-    && mv -v ../*.{deb,dsc,changes,tar.*} OUT/.
+RUN . ~/.env && ./debian/util.sh create-orig -n -v${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
+
+RUN . ~/.env && ORIGFILE=$(find ../ -name "freeswitch_*.orig.tar.xz" -type f) \
+    && ./debian/util.sh create-dsc -a arm64 -z9 ${CODENAME} "$ORIGFILE"
+
+WORKDIR /
+RUN dpkg-source -x freeswitch_*.dsc
+
+RUN cd freeswitch-*/ && debuild -S -sa -d -us -uc
+
+RUN cd freeswitch-*/ && debuild -b -us -uc
+
+RUN mkdir OUT && mv -v *.{deb,dsc,changes,tar.*} OUT/.
+
+RUN ls -lah /OUT
 
 # Artifacts image (mandatory part, the resulting image must have a single filesystem layer)
 FROM scratch
-COPY --from=builder /data/OUT/ /
+COPY --from=builder /OUT/ /
diff --git a/.github/docker/debian/bullseye/amd64/public.release.Dockerfile b/.github/docker/debian/bullseye/amd64/public.release.Dockerfile
index 17411f7afd..d9b0db0522 100644
--- a/.github/docker/debian/bullseye/amd64/public.release.Dockerfile
+++ b/.github/docker/debian/bullseye/amd64/public.release.Dockerfile
@@ -59,8 +59,7 @@ COPY . ${DATA_DIR}
 WORKDIR ${DATA_DIR}
 RUN echo "export VERSION=$(cat ./build/next-release.txt | tr -d '\n')" | tee -a ~/.env
 
-RUN . ~/.env && ./debian/util.sh prep-create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
-RUN . ~/.env && ./debian/util.sh prep-create-dsc ${CODENAME}
+RUN . ~/.env && ./debian/util.sh prep-create-dsc -a amd64 ${CODENAME}
 
 RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
     printf "machine ${REPO_DOMAIN} "  > /etc/apt/auth.conf && \
@@ -83,20 +82,22 @@ RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
     rm -f /etc/apt/auth.conf
 
 ENV DEB_BUILD_OPTIONS="parallel=1"
-RUN . ~/.env && dch -b -M -v "${VERSION}-${BUILD_NUMBER}-${GIT_SHA}~${CODENAME}" \
-  --force-distribution -D "${CODENAME}" "Nightly build, ${GIT_SHA}"
-RUN . ~/.env && ./debian/util.sh create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
-
-RUN dpkg-source \
-        --diff-ignore=.* \
-        --compression=xz \
-        --compression-level=9 \
-        --build \
-    . \
-    && debuild -b -us -uc \
-    && mkdir OUT \
-    && mv -v ../*.{deb,dsc,changes,tar.*} OUT/.
+RUN . ~/.env && ./debian/util.sh create-orig -n -v${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
+
+RUN . ~/.env && ORIGFILE=$(find ../ -name "freeswitch_*.orig.tar.xz" -type f) \
+    && ./debian/util.sh create-dsc -a amd64 -z9 ${CODENAME} "$ORIGFILE"
+
+WORKDIR /
+RUN dpkg-source -x freeswitch_*.dsc
+
+RUN cd freeswitch-*/ && debuild -S -sa -d -us -uc
+
+RUN cd freeswitch-*/ && debuild -b -us -uc
+
+RUN mkdir OUT && mv -v *.{deb,dsc,changes,tar.*} OUT/.
+
+RUN ls -lah /OUT
 
 # Artifacts image (mandatory part, the resulting image must have a single filesystem layer)
 FROM scratch
-COPY --from=builder /data/OUT/ /
+COPY --from=builder /OUT/ /
diff --git a/.github/docker/debian/bullseye/amd64/public.unstable.Dockerfile b/.github/docker/debian/bullseye/amd64/public.unstable.Dockerfile
index 364107852e..a2e54e819c 100644
--- a/.github/docker/debian/bullseye/amd64/public.unstable.Dockerfile
+++ b/.github/docker/debian/bullseye/amd64/public.unstable.Dockerfile
@@ -59,8 +59,7 @@ COPY . ${DATA_DIR}
 WORKDIR ${DATA_DIR}
 RUN echo "export VERSION=$(cat ./build/next-release.txt | tr -d '\n')" | tee -a ~/.env
 
-RUN . ~/.env && ./debian/util.sh prep-create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
-RUN . ~/.env && ./debian/util.sh prep-create-dsc ${CODENAME}
+RUN . ~/.env && ./debian/util.sh prep-create-dsc -a amd64 ${CODENAME}
 
 RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
     printf "machine ${REPO_DOMAIN} "  > /etc/apt/auth.conf && \
@@ -83,20 +82,22 @@ RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
     rm -f /etc/apt/auth.conf
 
 ENV DEB_BUILD_OPTIONS="parallel=1"
-RUN . ~/.env && dch -b -M -v "${VERSION}-${BUILD_NUMBER}-${GIT_SHA}~${CODENAME}" \
-  --force-distribution -D "${CODENAME}" "Nightly build, ${GIT_SHA}"
-RUN . ~/.env && ./debian/util.sh create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
-
-RUN dpkg-source \
-        --diff-ignore=.* \
-        --compression=xz \
-        --compression-level=9 \
-        --build \
-    . \
-    && debuild -b -us -uc \
-    && mkdir OUT \
-    && mv -v ../*.{deb,dsc,changes,tar.*} OUT/.
+RUN . ~/.env && ./debian/util.sh create-orig -n -v${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
+
+RUN . ~/.env && ORIGFILE=$(find ../ -name "freeswitch_*.orig.tar.xz" -type f) \
+    && ./debian/util.sh create-dsc -a amd64 -z9 ${CODENAME} "$ORIGFILE"
+
+WORKDIR /
+RUN dpkg-source -x freeswitch_*.dsc
+
+RUN cd freeswitch-*/ && debuild -S -sa -d -us -uc
+
+RUN cd freeswitch-*/ && debuild -b -us -uc
+
+RUN mkdir OUT && mv -v *.{deb,dsc,changes,tar.*} OUT/.
+
+RUN ls -lah /OUT
 
 # Artifacts image (mandatory part, the resulting image must have a single filesystem layer)
 FROM scratch
-COPY --from=builder /data/OUT/ /
+COPY --from=builder /OUT/ /
diff --git a/.github/docker/debian/bullseye/arm32v7/public.release.Dockerfile b/.github/docker/debian/bullseye/arm32v7/public.release.Dockerfile
index f3e135b7a3..8fb8c47f20 100644
--- a/.github/docker/debian/bullseye/arm32v7/public.release.Dockerfile
+++ b/.github/docker/debian/bullseye/arm32v7/public.release.Dockerfile
@@ -59,7 +59,6 @@ COPY . ${DATA_DIR}
 WORKDIR ${DATA_DIR}
 RUN echo "export VERSION=$(cat ./build/next-release.txt | tr -d '\n')" | tee -a ~/.env
 
-RUN . ~/.env && ./debian/util.sh prep-create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
 RUN . ~/.env && ./debian/util.sh prep-create-dsc -a armhf ${CODENAME}
 
 RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
@@ -83,20 +82,22 @@ RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
     rm -f /etc/apt/auth.conf
 
 ENV DEB_BUILD_OPTIONS="parallel=1"
-RUN . ~/.env && dch -b -M -v "${VERSION}-${BUILD_NUMBER}-${GIT_SHA}~${CODENAME}" \
-  --force-distribution -D "${CODENAME}" "Nightly build, ${GIT_SHA}"
-RUN . ~/.env && ./debian/util.sh create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
-
-RUN dpkg-source \
-        --diff-ignore=.* \
-        --compression=xz \
-        --compression-level=9 \
-        --build \
-    . \
-    && debuild -b -us -uc \
-    && mkdir OUT \
-    && mv -v ../*.{deb,dsc,changes,tar.*} OUT/.
+RUN . ~/.env && ./debian/util.sh create-orig -n -v${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
+
+RUN . ~/.env && ORIGFILE=$(find ../ -name "freeswitch_*.orig.tar.xz" -type f) \
+    && ./debian/util.sh create-dsc -a armhf -z9 ${CODENAME} "$ORIGFILE"
+
+WORKDIR /
+RUN dpkg-source -x freeswitch_*.dsc
+
+RUN cd freeswitch-*/ && debuild -S -sa -d -us -uc
+
+RUN cd freeswitch-*/ && debuild -b -us -uc
+
+RUN mkdir OUT && mv -v *.{deb,dsc,changes,tar.*} OUT/.
+
+RUN ls -lah /OUT
 
 # Artifacts image (mandatory part, the resulting image must have a single filesystem layer)
 FROM scratch
-COPY --from=builder /data/OUT/ /
+COPY --from=builder /OUT/ /
diff --git a/.github/docker/debian/bullseye/arm32v7/public.unstable.Dockerfile b/.github/docker/debian/bullseye/arm32v7/public.unstable.Dockerfile
index 6c6367ff14..76c8eab3a3 100644
--- a/.github/docker/debian/bullseye/arm32v7/public.unstable.Dockerfile
+++ b/.github/docker/debian/bullseye/arm32v7/public.unstable.Dockerfile
@@ -59,7 +59,6 @@ COPY . ${DATA_DIR}
 WORKDIR ${DATA_DIR}
 RUN echo "export VERSION=$(cat ./build/next-release.txt | tr -d '\n')" | tee -a ~/.env
 
-RUN . ~/.env && ./debian/util.sh prep-create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
 RUN . ~/.env && ./debian/util.sh prep-create-dsc -a armhf ${CODENAME}
 
 RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
@@ -83,20 +82,22 @@ RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
     rm -f /etc/apt/auth.conf
 
 ENV DEB_BUILD_OPTIONS="parallel=1"
-RUN . ~/.env && dch -b -M -v "${VERSION}-${BUILD_NUMBER}-${GIT_SHA}~${CODENAME}" \
-  --force-distribution -D "${CODENAME}" "Nightly build, ${GIT_SHA}"
-RUN . ~/.env && ./debian/util.sh create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
-
-RUN dpkg-source \
-        --diff-ignore=.* \
-        --compression=xz \
-        --compression-level=9 \
-        --build \
-    . \
-    && debuild -b -us -uc \
-    && mkdir OUT \
-    && mv -v ../*.{deb,dsc,changes,tar.*} OUT/.
+RUN . ~/.env && ./debian/util.sh create-orig -n -v${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
+
+RUN . ~/.env && ORIGFILE=$(find ../ -name "freeswitch_*.orig.tar.xz" -type f) \
+    && ./debian/util.sh create-dsc -a armhf -z9 ${CODENAME} "$ORIGFILE"
+
+WORKDIR /
+RUN dpkg-source -x freeswitch_*.dsc
+
+RUN cd freeswitch-*/ && debuild -S -sa -d -us -uc
+
+RUN cd freeswitch-*/ && debuild -b -us -uc
+
+RUN mkdir OUT && mv -v *.{deb,dsc,changes,tar.*} OUT/.
+
+RUN ls -lah /OUT
 
 # Artifacts image (mandatory part, the resulting image must have a single filesystem layer)
 FROM scratch
-COPY --from=builder /data/OUT/ /
+COPY --from=builder /OUT/ /
diff --git a/.github/docker/debian/bullseye/arm64v8/public.release.Dockerfile b/.github/docker/debian/bullseye/arm64v8/public.release.Dockerfile
index 53361956d7..1c23d558ee 100644
--- a/.github/docker/debian/bullseye/arm64v8/public.release.Dockerfile
+++ b/.github/docker/debian/bullseye/arm64v8/public.release.Dockerfile
@@ -59,7 +59,6 @@ COPY . ${DATA_DIR}
 WORKDIR ${DATA_DIR}
 RUN echo "export VERSION=$(cat ./build/next-release.txt | tr -d '\n')" | tee -a ~/.env
 
-RUN . ~/.env && ./debian/util.sh prep-create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
 RUN . ~/.env && ./debian/util.sh prep-create-dsc -a arm64 ${CODENAME}
 
 RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
@@ -83,20 +82,22 @@ RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
     rm -f /etc/apt/auth.conf
 
 ENV DEB_BUILD_OPTIONS="parallel=1"
-RUN . ~/.env && dch -b -M -v "${VERSION}-${BUILD_NUMBER}-${GIT_SHA}~${CODENAME}" \
-  --force-distribution -D "${CODENAME}" "Nightly build, ${GIT_SHA}"
-RUN . ~/.env && ./debian/util.sh create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
-
-RUN dpkg-source \
-        --diff-ignore=.* \
-        --compression=xz \
-        --compression-level=9 \
-        --build \
-    . \
-    && debuild -b -us -uc \
-    && mkdir OUT \
-    && mv -v ../*.{deb,dsc,changes,tar.*} OUT/.
+RUN . ~/.env && ./debian/util.sh create-orig -n -v${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
+
+RUN . ~/.env && ORIGFILE=$(find ../ -name "freeswitch_*.orig.tar.xz" -type f) \
+    && ./debian/util.sh create-dsc -a arm64 -z9 ${CODENAME} "$ORIGFILE"
+
+WORKDIR /
+RUN dpkg-source -x freeswitch_*.dsc
+
+RUN cd freeswitch-*/ && debuild -S -sa -d -us -uc
+
+RUN cd freeswitch-*/ && debuild -b -us -uc
+
+RUN mkdir OUT && mv -v *.{deb,dsc,changes,tar.*} OUT/.
+
+RUN ls -lah /OUT
 
 # Artifacts image (mandatory part, the resulting image must have a single filesystem layer)
 FROM scratch
-COPY --from=builder /data/OUT/ /
+COPY --from=builder /OUT/ /
diff --git a/.github/docker/debian/bullseye/arm64v8/public.unstable.Dockerfile b/.github/docker/debian/bullseye/arm64v8/public.unstable.Dockerfile
index 3ae9e546fb..5131671dbd 100644
--- a/.github/docker/debian/bullseye/arm64v8/public.unstable.Dockerfile
+++ b/.github/docker/debian/bullseye/arm64v8/public.unstable.Dockerfile
@@ -59,7 +59,6 @@ COPY . ${DATA_DIR}
 WORKDIR ${DATA_DIR}
 RUN echo "export VERSION=$(cat ./build/next-release.txt | tr -d '\n')" | tee -a ~/.env
 
-RUN . ~/.env && ./debian/util.sh prep-create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
 RUN . ~/.env && ./debian/util.sh prep-create-dsc -a arm64 ${CODENAME}
 
 RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
@@ -83,20 +82,22 @@ RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
     rm -f /etc/apt/auth.conf
 
 ENV DEB_BUILD_OPTIONS="parallel=1"
-RUN . ~/.env && dch -b -M -v "${VERSION}-${BUILD_NUMBER}-${GIT_SHA}~${CODENAME}" \
-  --force-distribution -D "${CODENAME}" "Nightly build, ${GIT_SHA}"
-RUN . ~/.env && ./debian/util.sh create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
-
-RUN dpkg-source \
-        --diff-ignore=.* \
-        --compression=xz \
-        --compression-level=9 \
-        --build \
-    . \
-    && debuild -b -us -uc \
-    && mkdir OUT \
-    && mv -v ../*.{deb,dsc,changes,tar.*} OUT/.
+RUN . ~/.env && ./debian/util.sh create-orig -n -v${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
+
+RUN . ~/.env && ORIGFILE=$(find ../ -name "freeswitch_*.orig.tar.xz" -type f) \
+    && ./debian/util.sh create-dsc -a arm64 -z9 ${CODENAME} "$ORIGFILE"
+
+WORKDIR /
+RUN dpkg-source -x freeswitch_*.dsc
+
+RUN cd freeswitch-*/ && debuild -S -sa -d -us -uc
+
+RUN cd freeswitch-*/ && debuild -b -us -uc
+
+RUN mkdir OUT && mv -v *.{deb,dsc,changes,tar.*} OUT/.
+
+RUN ls -lah /OUT
 
 # Artifacts image (mandatory part, the resulting image must have a single filesystem layer)
 FROM scratch
-COPY --from=builder /data/OUT/ /
+COPY --from=builder /OUT/ /
diff --git a/.github/docker/debian/trixie/amd64/public.release.Dockerfile b/.github/docker/debian/trixie/amd64/public.release.Dockerfile
index 13a57440ac..4fa212d656 100644
--- a/.github/docker/debian/trixie/amd64/public.release.Dockerfile
+++ b/.github/docker/debian/trixie/amd64/public.release.Dockerfile
@@ -49,8 +49,7 @@ COPY . ${DATA_DIR}
 WORKDIR ${DATA_DIR}
 RUN echo "export VERSION=$(cat ./build/next-release.txt | tr -d '\n')" | tee -a ~/.env
 
-RUN . ~/.env && ./debian/util.sh prep-create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
-RUN . ~/.env && ./debian/util.sh prep-create-dsc ${CODENAME}
+RUN . ~/.env && ./debian/util.sh prep-create-dsc -a amd64 ${CODENAME}
 
 RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
     sha512sum /run/secrets/REPO_PASSWORD && \
@@ -65,21 +64,22 @@ RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
     rm -f /etc/apt/auth.conf
 
 ENV DEB_BUILD_OPTIONS="parallel=1"
-RUN . ~/.env && dch -b -M -v "${VERSION}-${BUILD_NUMBER}-${GIT_SHA}~${CODENAME}" \
-  --force-distribution -D "${CODENAME}" "Nightly build, ${GIT_SHA}"
+RUN . ~/.env && ./debian/util.sh create-orig -n -v${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
 
-RUN . ~/.env && ./debian/util.sh create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
+RUN . ~/.env && ORIGFILE=$(find ../ -name "freeswitch_*.orig.tar.xz" -type f) \
+    && ./debian/util.sh create-dsc -a amd64 -z9 ${CODENAME} "$ORIGFILE"
 
-RUN dpkg-source \
-        --diff-ignore=.* \
-        --compression=xz \
-        --compression-level=9 \
-        --build \
-    . \
-    && debuild -b -us -uc \
-    && mkdir OUT \
-    && mv -v ../*.{deb,dsc,changes,tar.*} OUT/.
+WORKDIR /
+RUN dpkg-source -x freeswitch_*.dsc
+
+RUN cd freeswitch-*/ && debuild -S -sa -d -us -uc
+
+RUN cd freeswitch-*/ && debuild -b -us -uc
+
+RUN mkdir OUT && mv -v *.{deb,dsc,changes,tar.*} OUT/.
+
+RUN ls -lah /OUT
 
 # Artifacts image (mandatory part, the resulting image must have a single filesystem layer)
 FROM scratch
-COPY --from=builder /data/OUT/ /
+COPY --from=builder /OUT/ /
diff --git a/.github/docker/debian/trixie/amd64/public.unstable.Dockerfile b/.github/docker/debian/trixie/amd64/public.unstable.Dockerfile
index 13a57440ac..4fa212d656 100644
--- a/.github/docker/debian/trixie/amd64/public.unstable.Dockerfile
+++ b/.github/docker/debian/trixie/amd64/public.unstable.Dockerfile
@@ -49,8 +49,7 @@ COPY . ${DATA_DIR}
 WORKDIR ${DATA_DIR}
 RUN echo "export VERSION=$(cat ./build/next-release.txt | tr -d '\n')" | tee -a ~/.env
 
-RUN . ~/.env && ./debian/util.sh prep-create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
-RUN . ~/.env && ./debian/util.sh prep-create-dsc ${CODENAME}
+RUN . ~/.env && ./debian/util.sh prep-create-dsc -a amd64 ${CODENAME}
 
 RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
     sha512sum /run/secrets/REPO_PASSWORD && \
@@ -65,21 +64,22 @@ RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
     rm -f /etc/apt/auth.conf
 
 ENV DEB_BUILD_OPTIONS="parallel=1"
-RUN . ~/.env && dch -b -M -v "${VERSION}-${BUILD_NUMBER}-${GIT_SHA}~${CODENAME}" \
-  --force-distribution -D "${CODENAME}" "Nightly build, ${GIT_SHA}"
+RUN . ~/.env && ./debian/util.sh create-orig -n -v${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
 
-RUN . ~/.env && ./debian/util.sh create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
+RUN . ~/.env && ORIGFILE=$(find ../ -name "freeswitch_*.orig.tar.xz" -type f) \
+    && ./debian/util.sh create-dsc -a amd64 -z9 ${CODENAME} "$ORIGFILE"
 
-RUN dpkg-source \
-        --diff-ignore=.* \
-        --compression=xz \
-        --compression-level=9 \
-        --build \
-    . \
-    && debuild -b -us -uc \
-    && mkdir OUT \
-    && mv -v ../*.{deb,dsc,changes,tar.*} OUT/.
+WORKDIR /
+RUN dpkg-source -x freeswitch_*.dsc
+
+RUN cd freeswitch-*/ && debuild -S -sa -d -us -uc
+
+RUN cd freeswitch-*/ && debuild -b -us -uc
+
+RUN mkdir OUT && mv -v *.{deb,dsc,changes,tar.*} OUT/.
+
+RUN ls -lah /OUT
 
 # Artifacts image (mandatory part, the resulting image must have a single filesystem layer)
 FROM scratch
-COPY --from=builder /data/OUT/ /
+COPY --from=builder /OUT/ /
diff --git a/.github/docker/debian/trixie/arm32v7/public.release.Dockerfile b/.github/docker/debian/trixie/arm32v7/public.release.Dockerfile
index c96c491ffa..e378b3224e 100644
--- a/.github/docker/debian/trixie/arm32v7/public.release.Dockerfile
+++ b/.github/docker/debian/trixie/arm32v7/public.release.Dockerfile
@@ -49,7 +49,6 @@ COPY . ${DATA_DIR}
 WORKDIR ${DATA_DIR}
 RUN echo "export VERSION=$(cat ./build/next-release.txt | tr -d '\n')" | tee -a ~/.env
 
-RUN . ~/.env && ./debian/util.sh prep-create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
 RUN . ~/.env && ./debian/util.sh prep-create-dsc -a armhf ${CODENAME}
 
 RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
@@ -65,21 +64,22 @@ RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
     rm -f /etc/apt/auth.conf
 
 ENV DEB_BUILD_OPTIONS="parallel=1"
-RUN . ~/.env && dch -b -M -v "${VERSION}-${BUILD_NUMBER}-${GIT_SHA}~${CODENAME}" \
-  --force-distribution -D "${CODENAME}" "Nightly build, ${GIT_SHA}"
+RUN . ~/.env && ./debian/util.sh create-orig -n -v${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
 
-RUN . ~/.env && ./debian/util.sh create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
+RUN . ~/.env && ORIGFILE=$(find ../ -name "freeswitch_*.orig.tar.xz" -type f) \
+    && ./debian/util.sh create-dsc -a armhf -z9 ${CODENAME} "$ORIGFILE"
 
-RUN dpkg-source \
-        --diff-ignore=.* \
-        --compression=xz \
-        --compression-level=9 \
-        --build \
-    . \
-    && debuild -b -us -uc \
-    && mkdir OUT \
-    && mv -v ../*.{deb,dsc,changes,tar.*} OUT/.
+WORKDIR /
+RUN dpkg-source -x freeswitch_*.dsc
+
+RUN cd freeswitch-*/ && debuild -S -sa -d -us -uc
+
+RUN cd freeswitch-*/ && debuild -b -us -uc
+
+RUN mkdir OUT && mv -v *.{deb,dsc,changes,tar.*} OUT/.
+
+RUN ls -lah /OUT
 
 # Artifacts image (mandatory part, the resulting image must have a single filesystem layer)
 FROM scratch
-COPY --from=builder /data/OUT/ /
+COPY --from=builder /OUT/ /
diff --git a/.github/docker/debian/trixie/arm32v7/public.unstable.Dockerfile b/.github/docker/debian/trixie/arm32v7/public.unstable.Dockerfile
index c96c491ffa..e378b3224e 100644
--- a/.github/docker/debian/trixie/arm32v7/public.unstable.Dockerfile
+++ b/.github/docker/debian/trixie/arm32v7/public.unstable.Dockerfile
@@ -49,7 +49,6 @@ COPY . ${DATA_DIR}
 WORKDIR ${DATA_DIR}
 RUN echo "export VERSION=$(cat ./build/next-release.txt | tr -d '\n')" | tee -a ~/.env
 
-RUN . ~/.env && ./debian/util.sh prep-create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
 RUN . ~/.env && ./debian/util.sh prep-create-dsc -a armhf ${CODENAME}
 
 RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
@@ -65,21 +64,22 @@ RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
     rm -f /etc/apt/auth.conf
 
 ENV DEB_BUILD_OPTIONS="parallel=1"
-RUN . ~/.env && dch -b -M -v "${VERSION}-${BUILD_NUMBER}-${GIT_SHA}~${CODENAME}" \
-  --force-distribution -D "${CODENAME}" "Nightly build, ${GIT_SHA}"
+RUN . ~/.env && ./debian/util.sh create-orig -n -v${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
 
-RUN . ~/.env && ./debian/util.sh create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
+RUN . ~/.env && ORIGFILE=$(find ../ -name "freeswitch_*.orig.tar.xz" -type f) \
+    && ./debian/util.sh create-dsc -a armhf -z9 ${CODENAME} "$ORIGFILE"
 
-RUN dpkg-source \
-        --diff-ignore=.* \
-        --compression=xz \
-        --compression-level=9 \
-        --build \
-    . \
-    && debuild -b -us -uc \
-    && mkdir OUT \
-    && mv -v ../*.{deb,dsc,changes,tar.*} OUT/.
+WORKDIR /
+RUN dpkg-source -x freeswitch_*.dsc
+
+RUN cd freeswitch-*/ && debuild -S -sa -d -us -uc
+
+RUN cd freeswitch-*/ && debuild -b -us -uc
+
+RUN mkdir OUT && mv -v *.{deb,dsc,changes,tar.*} OUT/.
+
+RUN ls -lah /OUT
 
 # Artifacts image (mandatory part, the resulting image must have a single filesystem layer)
 FROM scratch
-COPY --from=builder /data/OUT/ /
+COPY --from=builder /OUT/ /
diff --git a/.github/docker/debian/trixie/arm64v8/public.release.Dockerfile b/.github/docker/debian/trixie/arm64v8/public.release.Dockerfile
index ef0ad6a7e9..fb4e4d46e2 100644
--- a/.github/docker/debian/trixie/arm64v8/public.release.Dockerfile
+++ b/.github/docker/debian/trixie/arm64v8/public.release.Dockerfile
@@ -49,7 +49,6 @@ COPY . ${DATA_DIR}
 WORKDIR ${DATA_DIR}
 RUN echo "export VERSION=$(cat ./build/next-release.txt | tr -d '\n')" | tee -a ~/.env
 
-RUN . ~/.env && ./debian/util.sh prep-create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
 RUN . ~/.env && ./debian/util.sh prep-create-dsc -a arm64 ${CODENAME}
 
 RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
@@ -65,21 +64,22 @@ RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
     rm -f /etc/apt/auth.conf
 
 ENV DEB_BUILD_OPTIONS="parallel=1"
-RUN . ~/.env && dch -b -M -v "${VERSION}-${BUILD_NUMBER}-${GIT_SHA}~${CODENAME}" \
-  --force-distribution -D "${CODENAME}" "Nightly build, ${GIT_SHA}"
+RUN . ~/.env && ./debian/util.sh create-orig -n -v${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
 
-RUN . ~/.env && ./debian/util.sh create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
+RUN . ~/.env && ORIGFILE=$(find ../ -name "freeswitch_*.orig.tar.xz" -type f) \
+    && ./debian/util.sh create-dsc -a arm64 -z9 ${CODENAME} "$ORIGFILE"
 
-RUN dpkg-source \
-        --diff-ignore=.* \
-        --compression=xz \
-        --compression-level=9 \
-        --build \
-    . \
-    && debuild -b -us -uc \
-    && mkdir OUT \
-    && mv -v ../*.{deb,dsc,changes,tar.*} OUT/.
+WORKDIR /
+RUN dpkg-source -x freeswitch_*.dsc
+
+RUN cd freeswitch-*/ && debuild -S -sa -d -us -uc
+
+RUN cd freeswitch-*/ && debuild -b -us -uc
+
+RUN mkdir OUT && mv -v *.{deb,dsc,changes,tar.*} OUT/.
+
+RUN ls -lah /OUT
 
 # Artifacts image (mandatory part, the resulting image must have a single filesystem layer)
 FROM scratch
-COPY --from=builder /data/OUT/ /
+COPY --from=builder /OUT/ /
diff --git a/.github/docker/debian/trixie/arm64v8/public.unstable.Dockerfile b/.github/docker/debian/trixie/arm64v8/public.unstable.Dockerfile
index ef0ad6a7e9..fb4e4d46e2 100644
--- a/.github/docker/debian/trixie/arm64v8/public.unstable.Dockerfile
+++ b/.github/docker/debian/trixie/arm64v8/public.unstable.Dockerfile
@@ -49,7 +49,6 @@ COPY . ${DATA_DIR}
 WORKDIR ${DATA_DIR}
 RUN echo "export VERSION=$(cat ./build/next-release.txt | tr -d '\n')" | tee -a ~/.env
 
-RUN . ~/.env && ./debian/util.sh prep-create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
 RUN . ~/.env && ./debian/util.sh prep-create-dsc -a arm64 ${CODENAME}
 
 RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
@@ -65,21 +64,22 @@ RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
     rm -f /etc/apt/auth.conf
 
 ENV DEB_BUILD_OPTIONS="parallel=1"
-RUN . ~/.env && dch -b -M -v "${VERSION}-${BUILD_NUMBER}-${GIT_SHA}~${CODENAME}" \
-  --force-distribution -D "${CODENAME}" "Nightly build, ${GIT_SHA}"
+RUN . ~/.env && ./debian/util.sh create-orig -n -v${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
 
-RUN . ~/.env && ./debian/util.sh create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
+RUN . ~/.env && ORIGFILE=$(find ../ -name "freeswitch_*.orig.tar.xz" -type f) \
+    && ./debian/util.sh create-dsc -a arm64 -z9 ${CODENAME} "$ORIGFILE"
 
-RUN dpkg-source \
-        --diff-ignore=.* \
-        --compression=xz \
-        --compression-level=9 \
-        --build \
-    . \
-    && debuild -b -us -uc \
-    && mkdir OUT \
-    && mv -v ../*.{deb,dsc,changes,tar.*} OUT/.
+WORKDIR /
+RUN dpkg-source -x freeswitch_*.dsc
+
+RUN cd freeswitch-*/ && debuild -S -sa -d -us -uc
+
+RUN cd freeswitch-*/ && debuild -b -us -uc
+
+RUN mkdir OUT && mv -v *.{deb,dsc,changes,tar.*} OUT/.
+
+RUN ls -lah /OUT
 
 # Artifacts image (mandatory part, the resulting image must have a single filesystem layer)
 FROM scratch
-COPY --from=builder /data/OUT/ /
+COPY --from=builder /OUT/ /
diff --git a/debian/util.sh b/debian/util.sh
index aefc0efebf..5f3dadcc20 100755
--- a/debian/util.sh
+++ b/debian/util.sh
@@ -46,10 +46,10 @@ find_distro () {
   case "$1" in
     experimental) echo "sid";;
     unstable) echo "sid";;
-    testing) echo "trixie";;
-    stable) echo "bookworm";;
-    oldstable) echo "bullseye";;
-    oldoldstable) echo "buster";;
+    stable) echo "trixie";;
+    oldstable) echo "bookworm";;
+    oldoldstable) echo "bullseye";;
+    oldoldoldstable) echo "buster";;
     *) echo "$1";;
   esac
 }
@@ -57,10 +57,10 @@ find_distro () {
 find_suite () {
   case "$1" in
     sid) echo "unstable";;
-    trixie) echo "testing";;
-    bookworm) echo "stable";;
-    bullseye) echo "oldstable";;
-    buster) echo "oldoldstable";;
+    trixie) echo "stable";;
+    bookworm) echo "oldstable";;
+    bullseye) echo "oldoldstable";;
+    buster) echo "oldoldoldstable";;
     *) echo "$1";;
   esac
 }
@@ -210,8 +210,8 @@ create_orig () {
       orig="../freeswitch_$(debian/version-omit_revision.pl).orig.tar.xz"
       git_archive_prefix="freeswitch/"
     else
-      orig="../freeswitch_$(mk_dver "$uver")~$(lsb_release -sc).orig.tar.xz"
-      git_archive_prefix="freeswitch-$uver/"
+      orig="../freeswitch_${uver}~$(lsb_release -sc)~$(dpkg-architecture -qDEB_BUILD_ARCH).orig.tar.xz"
+      git_archive_prefix="freeswitch/"
     fi
 
     mv .gitattributes .gitattributes.orig
@@ -360,7 +360,7 @@ create_dsc () {
 
     [ "$zl" -ge "1" ] || zl=1
 
-    dch -b -m -v "$dver" --force-distribution -D "$suite" "Nightly build."
+    dch -b -m -v "$dver" --force-distribution -D "$distro" "Nightly build."
 
     git add debian/rules debian/changelog && git commit -m "nightly v$orig_ver"
 
-- 
2.47.3