diff --git a/.github/workflows/master_build.yml b/.github/workflows/master_build.yml
index 9a80ca4f05..be864bade9 100644
--- a/.github/workflows/master_build.yml
+++ b/.github/workflows/master_build.yml
@@ -38,7 +38,7 @@ jobs:
             build_type: full
           - os: macOS-10.15
             build_type: full
-          - os: ubuntu-18.04
+          - os: ubuntu-20.04
             build_type: full
             apt-dependencies: mesa-common-dev libegl1 libglvnd-dev libdouble-conversion1 libpulse0 libsnappy1v5 libwebpdemux2 libwebpmux3 python3-github python3-distro
       fail-fast: false
@@ -232,6 +232,7 @@ jobs:
       run: cat ./_CPack_Packages/win64/NSIS/NSISOutput.log
 
     - name: Upload artifact
+      if: startsWith(matrix.os, 'windows') || startsWith(matrix.os, 'macOS')  # Automatic Linux packaging is not implemented
       shell: bash
       working-directory: ${{runner.workspace}}/build
       env:
diff --git a/.github/workflows/pr_build.yml b/.github/workflows/pr_build.yml
index ef3cb397ad..eed870b3af 100644
--- a/.github/workflows/pr_build.yml
+++ b/.github/workflows/pr_build.yml
@@ -45,9 +45,9 @@ jobs:
               build_type: full
             - os: macOS-10.15
               build_type: full
-            - os: ubuntu-18.04
+            - os: ubuntu-20.04
               build_type: full
-              apt-dependencies: mesa-common-dev libegl1 libglvnd-dev libdouble-conversion1 libpulse0 libsnappy1v5 libwebpdemux2 libwebpmux3 python3-distro
+              apt-dependencies: mesa-common-dev libegl1 libglvnd-dev libdouble-conversion3 libpulse0 libsnappy1v5 libwebpdemux2 libwebpmux3 python3-distro
             # Android builds are currently failing
             #- os: ubuntu-18.04
             #  build_type: android
@@ -322,6 +322,7 @@ jobs:
       run: cat ./_CPack_Packages/win64/NSIS/NSISOutput.log
 
     - name: Upload Artifact
+      if: startsWith(matrix.os, 'windows') || startsWith(matrix.os, 'macOS')  # Automatic Linux packaging is not implemented
       shell: bash
       working-directory: ${{runner.workspace}}/build
       env: