diff --git a/.github/workflows/build_linux_amd64.yml b/.github/workflows/build_linux_amd64.yml
index 42d5efa9..09d2353d 100644
--- a/.github/workflows/build_linux_amd64.yml
+++ b/.github/workflows/build_linux_amd64.yml
@@ -7,53 +7,6 @@ env:
     BUILD_TYPE: Release
 
 jobs:
-    build_ubuntu:
-        # The CMake configure and build commands are platform agnostic and should work equally
-        # well on Windows or Mac.  You can convert this to a matrix build if you need
-        # cross-platform coverage.
-        # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
-        runs-on: ubuntu-20.04
-
-        steps:
-        - uses: actions/checkout@v2
-        
-        - name: Update repositories
-          run: sudo apt update 
-        
-        - name: Install dependencies
-          run: sudo apt install libfftw3-dev libglfw3-dev libglew-dev libvolk2-dev libsoapysdr-dev libairspyhf-dev libairspy-dev libiio-dev libad9361-dev librtaudio-dev libhackrf-dev librtlsdr-dev
-
-        - name: Create Build Environment
-          # Some projects don't allow in-source building, so create a separate build directory
-          # We'll use this as our working directory for all subsequent commands
-          run: cmake -E make_directory ${{runner.workspace}}/build
-
-        - name: Configure CMake
-          # Use a bash shell so we can use the same syntax for environment variable
-          # access regardless of the host operating system
-          shell: bash
-          working-directory: ${{runner.workspace}}/build
-          # Note the current convention is to use the -S and -B options here to specify source 
-          # and build directories, but this is only available with CMake 3.13 and higher.  
-          # The CMake binaries on the Github Actions machines are (as of this writing) 3.12
-          run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DOPT_BUILD_SDRPLAY_SOURCE=OFF
-
-        - name: Build
-          working-directory: ${{runner.workspace}}/build
-          shell: bash
-          # Execute the build.  You can specify a specific target with "--target <NAME>"
-          run: cmake --build . --config $BUILD_TYPE -j2
-
-        - name: Create Deb Archive
-          working-directory: ${{runner.workspace}}
-          run: sh $GITHUB_WORKSPACE/make_debian_package.sh ${{runner.workspace}}/build
-
-        - name: Save Deb Archive
-          uses: actions/upload-artifact@v2
-          with:
-              name: sdrpp_ubuntu20.04_amd64
-              path: ${{runner.workspace}}/sdrpp_debian_amd64.deb
-
     build_windows:
         runs-on: windows-latest
 
@@ -141,4 +94,92 @@ jobs:
           uses: actions/upload-artifact@v2
           with:
               name: sdrpp_debian_bullseye_amd64
+              path: ${{runner.workspace}}/sdrpp_debian_amd64.deb
+
+    build_ubuntu_bionic:
+        runs-on: ubuntu-latest
+
+        steps:
+        - uses: actions/checkout@v2
+        
+        - name: Create Docker Image
+          run: cd $GITHUB_WORKSPACE/docker_builds/ubuntu_bionic && docker build . --tag sdrpp_build
+
+        - name: Run Container
+          run: docker run --name build sdrpp_build /root/do_build.sh
+
+        - name: Recover Deb Archive
+          working-directory: ${{runner.workspace}}
+          run: docker cp build:/root/SDRPlusPlus/sdrpp_debian_amd64.deb ./
+
+        - name: Save Deb Archive
+          uses: actions/upload-artifact@v2
+          with:
+              name: sdrpp_ubuntu_bionic_amd64
+              path: ${{runner.workspace}}/sdrpp_debian_amd64.deb
+
+    build_ubuntu_focal:
+        runs-on: ubuntu-latest
+
+        steps:
+        - uses: actions/checkout@v2
+        
+        - name: Create Docker Image
+          run: cd $GITHUB_WORKSPACE/docker_builds/ubuntu_focal && docker build . --tag sdrpp_build
+
+        - name: Run Container
+          run: docker run --name build sdrpp_build /root/do_build.sh
+
+        - name: Recover Deb Archive
+          working-directory: ${{runner.workspace}}
+          run: docker cp build:/root/SDRPlusPlus/sdrpp_debian_amd64.deb ./
+
+        - name: Save Deb Archive
+          uses: actions/upload-artifact@v2
+          with:
+              name: sdrpp_ubuntu_focal_amd64
+              path: ${{runner.workspace}}/sdrpp_debian_amd64.deb
+
+    build_ubuntu_groovy:
+        runs-on: ubuntu-latest
+
+        steps:
+        - uses: actions/checkout@v2
+        
+        - name: Create Docker Image
+          run: cd $GITHUB_WORKSPACE/docker_builds/ubuntu_groovy && docker build . --tag sdrpp_build
+
+        - name: Run Container
+          run: docker run --name build sdrpp_build /root/do_build.sh
+
+        - name: Recover Deb Archive
+          working-directory: ${{runner.workspace}}
+          run: docker cp build:/root/SDRPlusPlus/sdrpp_debian_amd64.deb ./
+
+        - name: Save Deb Archive
+          uses: actions/upload-artifact@v2
+          with:
+              name: sdrpp_ubuntu_groovy_amd64
+              path: ${{runner.workspace}}/sdrpp_debian_amd64.deb
+
+    build_ubuntu_hirsute:
+        runs-on: ubuntu-latest
+
+        steps:
+        - uses: actions/checkout@v2
+        
+        - name: Create Docker Image
+          run: cd $GITHUB_WORKSPACE/docker_builds/ubuntu_hirsute && docker build . --tag sdrpp_build
+
+        - name: Run Container
+          run: docker run --name build sdrpp_build /root/do_build.sh
+
+        - name: Recover Deb Archive
+          working-directory: ${{runner.workspace}}
+          run: docker cp build:/root/SDRPlusPlus/sdrpp_debian_amd64.deb ./
+
+        - name: Save Deb Archive
+          uses: actions/upload-artifact@v2
+          with:
+              name: sdrpp_ubuntu_hirsute_amd64
               path: ${{runner.workspace}}/sdrpp_debian_amd64.deb
\ No newline at end of file