diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml
index a6fc53885..4456a5c13 100644
--- a/.github/workflows/build_cmake.yml
+++ b/.github/workflows/build_cmake.yml
@@ -32,7 +32,7 @@ jobs:
           }
         - {
             name: "Ubuntu Build", artifact: "Linux.tar.xz",
-            os: ubuntu-16.04,
+            os: ubuntu-latest,
             build_type: "Release", cc: "gcc-9", cxx: "g++-9",
             cmake_platform: "",
             cmake_number_of_jobs: "-j 2"
@@ -44,6 +44,14 @@ jobs:
       if: "github.ref != 'refs/heads/main'"
       with:
         access_token: ${{ github.token }}
+    
+    - name: chroot Ubuntu 16.04
+      if: ${{ (runner.os == 'Linux') }}
+      run: |
+        sudo apt install debootstrap
+        sudo mkdir /ubuntu1604
+        sudo debootstrap --arch=amd64 xenial /ubuntu1604 http://archive.ubuntu.com/ubuntu/
+        sudo chroot /ubuntu1604
 
     - name: Checkout Repo
       uses: actions/checkout@v2
@@ -114,7 +122,7 @@ jobs:
         endif()
 
     - name: Tar Linux Server Binaries
-      if: ${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/releases')) && (runner.os == 'Linux') }}
+      if: ${{ (runner.os == 'Linux') }}
       run: >-
         tar -cvzf ni-grpc-device-server-linux-glibc2_23-x64.tar.gz
         -C ${GITHUB_WORKSPACE}/build
@@ -126,11 +134,11 @@ jobs:
 
     - name: Upload Linux Server Binaries Artifact
       uses: actions/upload-artifact@v2
-      if: ${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/releases')) && (runner.os == 'Linux') }}
+      if: ${{ (runner.os == 'Linux') }}
       with:
         name: ni-grpc-device-server-linux-glibc2_23-x64
         path: ni-grpc-device-server-linux-glibc2_23-x64.tar.gz
-        retention-days: 5
+        retention-days: 1
 
     - name: Tar Linux Test Binaries
       if: ${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/releases')) && (runner.os == 'Linux') }}