diff --git a/.github/workflows/apt.yml b/.github/workflows/apt.yml
index 091d73aa..fc5520af 100644
--- a/.github/workflows/apt.yml
+++ b/.github/workflows/apt.yml
@@ -42,7 +42,15 @@ jobs:
           tr -d '\n' < .version > temp && mv temp .version
           VERSION=$(cat .version)
           echo VERSION=${VERSION} >> $GITHUB_ENV
-          echo STANDARDS_VERSION=$(echo ${VERSION%+*}) >> $GITHUB_ENV
+          if [[ $VERSION == *"-"* ]]; then
+            echo STANDARDS_VERSION=$(echo ${VERSION%-*}) >> $GITHUB_ENV
+            echo TARBALL_VERSION=$(echo ${VERSION%-*}) >> $GITHUB_ENV
+            echo DEBIAN_FORMAT='3.0 (quilt)' >> $GITHUB_ENV
+          else
+            echo STANDARDS_VERSION=$(echo ${VERSION%+*}) >> $GITHUB_ENV
+            echo TARBALL_VERSION=${VERSION}~$(echo ${{ matrix.distribution }} | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV
+            echo DEBIAN_FORMAT='3.0 (native)' >> $GITHUB_ENV
+          fi
           echo DISTRIBUTION=$(echo ${{ matrix.distribution }} | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV
 
       - name: Build package
@@ -54,12 +62,12 @@ jobs:
             -v "${GITHUB_WORKSPACE}:/source:rw" \
             ghcr.io/hyperion-project/${{ matrix.architecture }}:${{ env.DISTRIBUTION }} \
             /bin/bash -c "cd /source && \
-            mkdir -p debian/source && echo '3.0 (native)' > debian/source/format && \
+            mkdir -p debian/source && echo '${{ env.DEBIAN_FORMAT }}' > debian/source/format && \
             dch --create --distribution ${{ env.DISTRIBUTION }} --package 'hyperion' -v '${{ env.VERSION }}~${{ env.DISTRIBUTION }}' '${{ github.event.commits[0].message }}' && \
             cp -fr LICENSE debian/copyright && \
             sed 's/@BUILD_DEPENDS@/${{ matrix.build-depends }}/g; s/@DEPENDS@/${{ matrix.package-depends }}/g; s/@ARCHITECTURE@/${{ matrix.architecture }}/g; s/@STANDARDS_VERSION@/${{ env.STANDARDS_VERSION }}/g' debian/control.in > debian/control && \
             sed 's/@CMAKE_ENVIRONMENT@/${{ matrix.cmake-environment }}/g' debian/rules.in > debian/rules && \
-            tar -cJf ../hyperion_${{ env.VERSION }}~${{ env.DISTRIBUTION }}.orig.tar.xz . && \
+            tar -cJf ../hyperion_${{ env.TARBALL_VERSION }}.orig.tar.xz . && \
             debuild --no-lintian -uc -us && \
             cp ../hyperion_* /deploy"
 
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index e0a88926..312d1517 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -55,7 +55,15 @@ jobs:
           echo "$(tr -d '\n' < .version)+nightly$(date '+%Y%m%d')$(git rev-parse --short HEAD)" > .version
           VERSION=$(cat .version)
           echo VERSION=${VERSION} >> $GITHUB_ENV
-          echo STANDARDS_VERSION=$(echo ${VERSION%+*}) >> $GITHUB_ENV
+          if [[ $VERSION == *"-"* ]]; then
+            echo STANDARDS_VERSION=$(echo ${VERSION%-*}) >> $GITHUB_ENV
+            echo TARBALL_VERSION=$(echo ${VERSION%-*}) >> $GITHUB_ENV
+            echo DEBIAN_FORMAT='3.0 (quilt)' >> $GITHUB_ENV
+          else
+            echo STANDARDS_VERSION=$(echo ${VERSION%+*}) >> $GITHUB_ENV
+            echo TARBALL_VERSION=${VERSION}~$(echo ${{ matrix.distribution }} | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV
+            echo DEBIAN_FORMAT='3.0 (native)' >> $GITHUB_ENV
+          fi
           echo DISTRIBUTION=$(echo ${{ matrix.distribution }} | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV
 
       - name: Build package
@@ -67,12 +75,12 @@ jobs:
             -v "${GITHUB_WORKSPACE}:/source:rw" \
             ghcr.io/hyperion-project/${{ matrix.architecture }}:${{ env.DISTRIBUTION }} \
             /bin/bash -c "cd /source && \
-            mkdir -p debian/source && echo '3.0 (native)' > debian/source/format && \
+            mkdir -p debian/source && echo '${{ env.DEBIAN_FORMAT }}' > debian/source/format && \
             dch --create --distribution ${{ env.DISTRIBUTION }} --package 'hyperion' -v '${{ env.VERSION }}~${{ env.DISTRIBUTION }}' '${{ github.event.commits[0].message }}' && \
             cp -fr LICENSE debian/copyright && \
             sed 's/@BUILD_DEPENDS@/${{ matrix.build-depends }}/g; s/@DEPENDS@/${{ matrix.package-depends }}/g; s/@ARCHITECTURE@/${{ matrix.architecture }}/g; s/@STANDARDS_VERSION@/${{ env.STANDARDS_VERSION }}/g' debian/control.in > debian/control && \
             sed 's/@CMAKE_ENVIRONMENT@/${{ matrix.cmake-environment }}/g' debian/rules.in > debian/rules && \
-            tar -cJf ../hyperion_${{ env.VERSION }}~${{ env.DISTRIBUTION }}.orig.tar.xz . && \
+            tar -cJf ../hyperion_${{ env.TARBALL_VERSION }}.orig.tar.xz . && \
             debuild --no-lintian -uc -us && \
             cp ../hyperion_* /deploy"