diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index aad5baf79..38aa97d66 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -170,12 +170,12 @@ jobs:
             openfpga/openfpga
             vpr/libvpr.a
             vpr/vpr
-            yosys/share/
-            yosys/yosys
-            yosys/yosys-abc
-            yosys/yosys-config
-            yosys/yosys-filterlib
-            yosys/yosys-smtbmc
+            yosys/install/share/
+            yosys/install/bin/yosys
+            yosys/install/bin/yosys-abc
+            yosys/install/bin/yosys-config
+            yosys/install/bin/yosys-filterlib
+            yosys/install/bin/yosys-smtbmc
             openfpga_flow
             openfpga.sh
   docker_distribution:
@@ -240,11 +240,11 @@ jobs:
           chmod +x ace2/ace
           chmod +x openfpga/openfpga
           chmod +x vpr/vpr
-          chmod +x yosys/yosys
-          chmod +x yosys/yosys-abc
-          chmod +x yosys/yosys-config
-          chmod +x yosys/yosys-filterlib
-          chmod +x yosys/yosys-smtbmc
+          chmod +x yosys/install/bin/yosys
+          chmod +x yosys/install/bin/yosys-abc
+          chmod +x yosys/install/bin/yosys-config
+          chmod +x yosys/install/bin/yosys-filterlib
+          chmod +x yosys/install/bin/yosys-smtbmc
       - name: ${{matrix.config.name}}_GCC-8_(Ubuntu 18.04)
         shell: bash
         run: source openfpga.sh && source openfpga_flow/regression_test_scripts/${{matrix.config.name}}.sh
diff --git a/docker/Dockerfile.master b/docker/Dockerfile.master
index 872ce07a8..783197ee6 100644
--- a/docker/Dockerfile.master
+++ b/docker/Dockerfile.master
@@ -3,7 +3,7 @@ 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 yosys/yosys yosys/yosys-abc yosys/yosys-config yosys/yosys-filterlib yosys/yosys-smtbmc
-ENV PATH="/opt/openfpga/openfpga:/opt/openfpga/yosys:${PATH}"
+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}"
 ENV OPENFPGA_PATH="/opt/openfpga"