diff --git a/.github/workflows/build_linux_amd64.yml b/.github/workflows/build_linux_amd64.yml
index d046b3fc..a45193c7 100644
--- a/.github/workflows/build_linux_amd64.yml
+++ b/.github/workflows/build_linux_amd64.yml
@@ -12,7 +12,7 @@ jobs:
         # 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-latest
+        runs-on: ubuntu-20.04
 
         steps:
         - uses: actions/checkout@v2
@@ -42,7 +42,7 @@ jobs:
           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
+          run: cmake --build . --config $BUILD_TYPE -j2
 
         - name: Create Deb Archive
           working-directory: ${{runner.workspace}}
@@ -51,7 +51,7 @@ jobs:
         - name: Save Deb Archive
           uses: actions/upload-artifact@v2
           with:
-              name: sdrpp_debian_amd64
+              name: sdrpp_ubuntu20.04_amd64
               path: ${{runner.workspace}}/sdrpp_debian_amd64.deb
 
     build_windows:
@@ -97,4 +97,46 @@ jobs:
           uses: actions/upload-artifact@v2
           with:
               name: sdrpp_windows_x64
-              path: ${{runner.workspace}}/sdrpp_windows_x64.zip
\ No newline at end of file
+              path: ${{runner.workspace}}/sdrpp_windows_x64.zip
+  
+    build_debian10:
+        runs-on: ubuntu-latest
+
+        steps:
+        - uses: actions/checkout@v2
+        
+        - name: Create Docker Image
+          run: cd $GITHUB_WORKSPACE/docker_builds/debian10 && docker build . --tag sdrpp_build
+
+        - name: Run Container
+          run: docker run --name build -it sdrpp_build /root/do_build.sh
+
+        - name: Recover Deb Archive
+          run: docker cp build:/root/SDRPlusPlus/sdrpp_debian_amd64.deb ./
+
+        - name: Save Deb Archive
+          uses: actions/upload-artifact@v2
+          with:
+              name: sdrpp_debian10_amd64
+              path: ${{runner.workspace}}/sdrpp_debian_amd64.deb
+
+    build_debian11:
+        runs-on: ubuntu-latest
+
+        steps:
+        - uses: actions/checkout@v2
+        
+        - name: Create Docker Image
+          run: cd $GITHUB_WORKSPACE/docker_builds/debian11 && docker build . --tag sdrpp_build
+
+        - name: Run Container
+          run: docker run --name build -it sdrpp_build /root/do_build.sh
+
+        - name: Recover Deb Archive
+          run: docker cp build:/root/SDRPlusPlus/sdrpp_debian_amd64.deb ./
+
+        - name: Save Deb Archive
+          uses: actions/upload-artifact@v2
+          with:
+              name: sdrpp_debian11_amd64
+              path: ${{runner.workspace}}/sdrpp_debian_amd64.deb
\ No newline at end of file
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index aaad1921..185f883e 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -79,8 +79,6 @@ else()
         ${VOLK_LIBRARIES}
     )
 
-    message(${VOLK_LIBRARIES})
-
     if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
         target_link_libraries(sdrpp_core PUBLIC stdc++fs)
     endif ()
diff --git a/docker_builds/debian10/Dockerfile b/docker_builds/debian10/Dockerfile
new file mode 100644
index 00000000..07f7b8e0
--- /dev/null
+++ b/docker_builds/debian10/Dockerfile
@@ -0,0 +1,2 @@
+FROM debian:10
+COPY do_build.sh /root
\ No newline at end of file
diff --git a/docker_builds/debian10/do_build.sh b/docker_builds/debian10/do_build.sh
new file mode 100644
index 00000000..90d8107d
--- /dev/null
+++ b/docker_builds/debian10/do_build.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+set -e
+cd /root
+
+apt update
+apt install -y build-essential cmake git libfftw3-dev libglfw3-dev libglew-dev libvolk1-dev libsoapysdr-dev libairspyhf-dev libairspy-dev libiio-dev libad9361-dev librtaudio-dev libhackrf-dev librtlsdr-dev
+
+git clone https://github.com/AlexandreRouma/SDRPlusPlus
+
+cd SDRPlusPlus
+mkdir build
+cd build
+cmake ..
+make -j2
+
+cd ..
+sh make_debian_package.sh ./build
\ No newline at end of file
diff --git a/docker_builds/debian11/Dockerfile b/docker_builds/debian11/Dockerfile
new file mode 100644
index 00000000..3cf088da
--- /dev/null
+++ b/docker_builds/debian11/Dockerfile
@@ -0,0 +1,2 @@
+FROM debian:11
+COPY do_build.sh /root
\ No newline at end of file
diff --git a/docker_builds/debian11/do_build.sh b/docker_builds/debian11/do_build.sh
new file mode 100644
index 00000000..9e508b7d
--- /dev/null
+++ b/docker_builds/debian11/do_build.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+set -e
+cd /root
+
+apt update
+apt install -y build-essential cmake git libfftw3-dev libglfw3-dev libglew-dev libvolk2-dev libsoapysdr-dev libairspyhf-dev libairspy-dev libiio-dev libad9361-dev librtaudio-dev libhackrf-dev librtlsdr-dev
+
+git clone https://github.com/AlexandreRouma/SDRPlusPlus
+
+cd SDRPlusPlus
+mkdir build
+cd build
+cmake ..
+make -j2
+
+cd ..
+sh make_debian_package.sh ./build
\ No newline at end of file