diff --git a/.github/workflows/release-debian.yml b/.github/workflows/release-debian.yml
index 306f07f..746d409 100644
--- a/.github/workflows/release-debian.yml
+++ b/.github/workflows/release-debian.yml
@@ -76,9 +76,55 @@ jobs:
       name: "release"
     strategy:
       matrix:
-        distro: [raspbian]
-        release: [buster, bullseye]
-        arch: [armv7, aarch64]
+        include:
+          - distro: "debian"
+            release: "buster"
+            image: "buster"
+            arch: "armv7"
+          - distro: "debian"
+            release: "buster"
+            image: "buster"
+            arch: "aarch64"
+          - distro: "debian"
+            release: "bullseye"
+            image: "bullseye"
+            arch: "armv7"
+          - distro: "debian"
+            release: "bullseye"
+            image: "bullseye"
+            arch: "aarch64"
+          - distro: "ubuntu"
+            release: "bionic"
+            image: "ubuntu18.04"
+            arch: "armv7"
+          - distro: "ubuntu"
+            release: "bionic"
+            image: "ubuntu18.04"
+            arch: "aarch64"
+          - distro: "ubuntu"
+            release: "focal"
+            image: "ubuntu20.04"
+            arch: "armv7"
+          - distro: "ubuntu"
+            release: "focal"
+            image: "ubuntu20.04"
+            arch: "aarch64"
+          - distro: "raspbian"
+            release: "buster"
+            image: "buster"
+            arch: "armv7"
+          - distro: "raspbian"
+            release: "buster"
+            image: "buster"
+            arch: "aarch64"
+          - distro: "raspbian"
+            release: "bullseye"
+            image: "bullseye"
+            arch: "armv7"
+          - distro: "raspbian"
+            release: "bullseye"
+            image: "bullseye"
+            arch: "aarch64"
     steps:
       - name: Checkout repo
         uses: actions/checkout@v2
@@ -87,13 +133,7 @@ jobs:
         id: build
         with:
           arch: ${{ matrix.arch }}
-          distro: ${{ matrix.release }}
-          setup: |
-            mkdir -p "${PWD}/packages"
-          dockerRunArgs: |
-            --volume "${PWD}/packages:/packages"
-          env: |
-            artifact_dir: ${{ matrix.distro }}_${{ matrix.release }}
+          distro: ${{ matrix.image }}
           shell: /bin/bash
           install: |
             apt-get update
@@ -106,11 +146,15 @@ jobs:
           run: |
             export DEBEMAIL='maintainers@faucet.nz'
             export DEBFULLNAME='Faucet Maintainers'
+            mkdir -p /build
+            cp -r ${GITHUB_WORKSPACE} /build/package
+            cd /build/package
             debchange --newversion ${{ github.event.release.tag_name }} -b "New upstream release"
             mk-build-deps -i -r -t 'apt-get -f -y --force-yes'
             dpkg-buildpackage -b -us -uc -rfakeroot
-            mkdir -p /packages/${artifact_dir}
-            cp ../*.deb /packages/${artifact_dir}
+            artifact_dir=${{ matrix.distro }}_${{ matrix.release }}
+            mkdir -p "${GITHUB_WORKSPACE}/packages/${artifact_dir}"
+            cp ../*.deb "${GITHUB_WORKSPACE}/packages/${artifact_dir}"
       - name: Publish package on packagecloud
         uses: faucetsdn/action-packagecloud-upload-debian-packages@v1
         with:
diff --git a/.github/workflows/test-debian.yml b/.github/workflows/test-debian.yml
index eb8508f..d40028e 100644
--- a/.github/workflows/test-debian.yml
+++ b/.github/workflows/test-debian.yml
@@ -58,9 +58,55 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        distro: [raspbian]
-        release: [buster, bullseye]
-        arch: [armv7, aarch64]
+        include:
+          - distro: "debian"
+            release: "buster"
+            image: "buster"
+            arch: "armv7"
+          - distro: "debian"
+            release: "buster"
+            image: "buster"
+            arch: "aarch64"
+          - distro: "debian"
+            release: "bullseye"
+            image: "bullseye"
+            arch: "armv7"
+          - distro: "debian"
+            release: "bullseye"
+            image: "bullseye"
+            arch: "aarch64"
+          - distro: "ubuntu"
+            release: "bionic"
+            image: "ubuntu18.04"
+            arch: "armv7"
+          - distro: "ubuntu"
+            release: "bionic"
+            image: "ubuntu18.04"
+            arch: "aarch64"
+          - distro: "ubuntu"
+            release: "focal"
+            image: "ubuntu20.04"
+            arch: "armv7"
+          - distro: "ubuntu"
+            release: "focal"
+            image: "ubuntu20.04"
+            arch: "aarch64"
+          - distro: "raspbian"
+            release: "buster"
+            image: "buster"
+            arch: "armv7"
+          - distro: "raspbian"
+            release: "buster"
+            image: "buster"
+            arch: "aarch64"
+          - distro: "raspbian"
+            release: "bullseye"
+            image: "bullseye"
+            arch: "armv7"
+          - distro: "raspbian"
+            release: "bullseye"
+            image: "bullseye"
+            arch: "aarch64"
     steps:
       - name: Checkout repo
         uses: actions/checkout@v2
@@ -69,11 +115,7 @@ jobs:
         id: build
         with:
           arch: ${{ matrix.arch }}
-          distro: ${{ matrix.release }}
-          setup: |
-            mkdir -p "${PWD}/packages"
-          dockerRunArgs: |
-            --volume "${PWD}/packages:/packages"
+          distro: ${{ matrix.image }}
           shell: /bin/bash
           install: |
             apt-get update
@@ -86,6 +128,9 @@ jobs:
           run: |
             export DEBEMAIL='maintainers@faucet.nz'
             export DEBFULLNAME='Faucet Maintainers'
+            mkdir -p /build
+            cp -r ${GITHUB_WORKSPACE} /build/package
+            cd /build/package
             debchange -b "Test release"
             mk-build-deps -i -r -t 'apt-get -f -y --force-yes'
             dpkg-buildpackage -b -us -uc -rfakeroot