diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e7a3cd26a..4fe179cad 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -68,7 +68,8 @@ jobs:
     if: ${{ fromJSON(needs.change_detect.outputs.source_modified) }}
     name: ${{ matrix.config.name }}
     runs-on: ubuntu-20.04
-    #container: ghcr.io/${{ needs.change_detect.outputs.docker_repo }}/openfpga-build-${{ matrix.config.cc}}
+    # Note: dependencies are installed in the container. See details about dependency list in docker/Dockerfile.master
+    container: ghcr.io/${{ needs.change_detect.outputs.docker_repo }}/openfpga-build-${{ matrix.config.cc}}
     # Branch on different OS and settings
     strategy:
       fail-fast: false
@@ -116,9 +117,6 @@ jobs:
         with:
           submodules: true
       
-      - name: Install dependencies
-        run: ./.github/workflows/install_dependencies_build.sh
-
       - name: Dump tool versions
         run: |
           cmake --version
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.clang-10 b/docker/Dockerfile.clang-10
new file mode 100644
index 000000000..447c5fc81
--- /dev/null
+++ b/docker/Dockerfile.clang-10
@@ -0,0 +1,2 @@
+FROM ghcr.io/lnis-uofu/openfpga-build-base
+RUN apt-get update && apt-get install -y clang-format-7 clang-10
diff --git a/docker/Dockerfile.clang-7 b/docker/Dockerfile.clang-7
new file mode 100644
index 000000000..485a61318
--- /dev/null
+++ b/docker/Dockerfile.clang-7
@@ -0,0 +1,2 @@
+FROM ghcr.io/lnis-uofu/openfpga-build-base
+RUN apt-get update && apt-get install -y clang-format-7 clang-7
diff --git a/docker/Dockerfile.gcc-10 b/docker/Dockerfile.gcc-10
new file mode 100644
index 000000000..241b0c477
--- /dev/null
+++ b/docker/Dockerfile.gcc-10
@@ -0,0 +1,2 @@
+FROM ghcr.io/lnis-uofu/openfpga-build-base
+RUN apt-get update && apt-get install -y gcc-10 g++-10
diff --git a/docker/Dockerfile.gcc-11 b/docker/Dockerfile.gcc-11
new file mode 100644
index 000000000..0b8bf6ab0
--- /dev/null
+++ b/docker/Dockerfile.gcc-11
@@ -0,0 +1,2 @@
+FROM ghcr.io/lnis-uofu/openfpga-build-base
+RUN apt-get update && apt-get install -y gcc-11 g++-11
diff --git a/docker/Dockerfile.gcc-5 b/docker/Dockerfile.gcc-5
deleted file mode 100644
index f1ee75572..000000000
--- a/docker/Dockerfile.gcc-5
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM ghcr.io/lnis-uofu/openfpga-build-base
-RUN apt-get update && apt-get install -y gcc-5 g++-5
diff --git a/docker/Dockerfile.gcc-6 b/docker/Dockerfile.gcc-6
deleted file mode 100644
index 89ae008f2..000000000
--- a/docker/Dockerfile.gcc-6
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM ghcr.io/lnis-uofu/openfpga-build-base
-RUN apt-get update && apt-get install -y gcc-6 g++-6
diff --git a/docker/Dockerfile.master b/docker/Dockerfile.master
index 72fc90e4b..8d094a197 100644
--- a/docker/Dockerfile.master
+++ b/docker/Dockerfile.master
@@ -2,7 +2,7 @@ FROM ghcr.io/lnis-uofu/openfpga-env
 RUN mkdir -p /opt/openfpga
 WORKDIR /opt/openfpga
 COPY . /opt/openfpga
-RUN chmod +x abc/abc ace2/ace openfpga/openfpga vpr/vpr
+RUN chmod +x build/vtr-verilog-to-routing/abc/abc ace2/ace build/openfpga/openfpga build/vtr-verilog-to-routing/vpr/vpr
 RUN chmod +x yosys/install/bin/yosys yosys/install/bin/yosys-abc yosys/install/bin/yosys-config yosys/install/bin/yosys-filterlib yosys/install/bin/yosys-smtbmc
 ENV PATH="/opt/openfpga/openfpga:/opt/openfpga/yosys/install/bin:${PATH}"
 ENV PATH="/opt/openfpga/ace2:/opt/openfpga/abc:/opt/openfpga/vpr:${PATH}"