diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index fcd410be1..2f31e0c83 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -22,7 +22,7 @@ env:
 jobs:
   change_detect:
     name: "Detect code changes"
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     outputs:
       # this is output as string, see https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idoutputs
       source_modified: ${{ steps.changes.outputs.status_code == '1' }}
@@ -67,7 +67,7 @@ jobs:
     needs: change_detect
     if: ${{ fromJSON(needs.change_detect.outputs.source_modified) }}
     name: ${{ matrix.config.name }}
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     # Note: dependencies are installed in the container. See details about dependency list in docker/Dockerfile.master
     # Comment the line out when base image is built again
     #container: ghcr.io/${{ needs.change_detect.outputs.docker_repo }}/openfpga-build-${{ matrix.config.cc}}
@@ -251,9 +251,10 @@ jobs:
           tags: |
             ghcr.io/${{ needs.change_detect.outputs.docker_repo }}/openfpga-master:latest
             ghcr.io/${{ needs.change_detect.outputs.docker_repo }}/openfpga-master:${{ needs.change_detect.outputs.sha_short }}
+
   linux_regression_tests:
     name: linux_regression_tests
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     needs: [linux_build, change_detect]
     container: ghcr.io/${{ needs.change_detect.outputs.docker_repo }}/openfpga-env
     strategy:
@@ -304,11 +305,12 @@ jobs:
           retention-days: 1
           path: |
             openfpga_flow/**/*.log
+
   docker_regression_tests:
     needs: change_detect
     if: ${{ !fromJSON(needs.change_detect.outputs.source_modified) }}
     name: docker_regression_tests
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     container: 
       image: ghcr.io/${{ needs.change_detect.outputs.docker_repo }}/openfpga-master:latest
       options: --user root --workdir /home/openfpga_user
diff --git a/.github/workflows/cell_lib_test.yml b/.github/workflows/cell_lib_test.yml
index e04148251..5016297d5 100644
--- a/.github/workflows/cell_lib_test.yml
+++ b/.github/workflows/cell_lib_test.yml
@@ -13,7 +13,7 @@ jobs:
   # Test the RTL compilation compatibility
   verilog:
     name: RTL compilation and tests
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
       - name: Cancel previous
         uses: styfle/cancel-workflow-action@0.9.1
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index ff1a2f022..f29dbd883 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -10,7 +10,7 @@ env:
 jobs:
   change_detect:
     name: "Detect code changes"
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     outputs:
       docker_repo: ${{ steps.changes.outputs.docker_repo }}
     steps:
diff --git a/docker/Dockerfile.base b/docker/Dockerfile.base
index c635bd4c0..fafef66d3 100755
--- a/docker/Dockerfile.base
+++ b/docker/Dockerfile.base
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && apt-get install software-properties-common -y
 # 18.04 includes 2.17 but github requires 2.18+ to support submodules.
diff --git a/docker/Dockerfile.env b/docker/Dockerfile.env
index bfb114a40..95af40363 100644
--- a/docker/Dockerfile.env
+++ b/docker/Dockerfile.env
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && apt-get install --no-install-recommends software-properties-common -y
 # 18.04 includes 2.17 but github requires 2.18+ to support submodules.