diff --git a/.github/workflows/Suite.yml b/.github/workflows/Suite.yml
index 96a5e3e1..e029a30d 100644
--- a/.github/workflows/Suite.yml
+++ b/.github/workflows/Suite.yml
@@ -45,9 +45,9 @@ jobs:
         run: |
           python3 -m pip install -r conf/requirements.txt
           PYTHONPATH=$(pwd) python3 ./.github/scripts/generate_job_matrix.py all
-  
+
   Build_nextpnr-fpga_interchange-experimental:
-    
+
     container: ubuntu:focal
     runs-on: [self-hosted, Linux, X64]
 
@@ -55,12 +55,12 @@ jobs:
       - uses: actions/checkout@v3
         with:
           submodules: recursive
-      
+
       - name: Build Tools
         run: |
           bash .github/scripts/build_nextpnr_fpga_interchange.sh
           mv ./third_party/nextpnr/nextpnr-fpga_interchange ./third_party/nextpnr/nextpnr-fpga_interchange.this_is_a_file
-      
+
       - name: Upload nextpnr-fpga_interchange-experimental
         uses: actions/upload-artifact@v3
         if: always()
@@ -367,7 +367,7 @@ jobs:
           path: |
             **/results*.gz
             **/plot_*.svg
-  
+
   NextpnrFPGAInterchangeAlreadySynthesized:
     needs: Matrix
 
@@ -396,6 +396,7 @@ jobs:
         run: >
           source env.sh nextpnr &&
           python3 exhaust.py
+          --verbose
           --project ${{ matrix.project }}
           --toolchain ${{ matrix.toolchain }}
           --board ${{ matrix.board }}
@@ -409,7 +410,7 @@ jobs:
           path: |
             **/results*.gz
             **/plot_*.svg
-  
+
   NextpnrFPGAInterchangeExperimentalAlreadySynthesized:
     needs:
       - Matrix
@@ -431,13 +432,13 @@ jobs:
       - uses: actions/checkout@v3
         with:
           submodules: recursive
-      
+
       - name: Download nextpnr-fpga_interchange-experimental
         uses: actions/download-artifact@v3
         with:
           name: nextpnr-fpga_interchange-experimental
           path: ./download/
-      
+
       - name: Install nextpnr-fpga_interchange-experimental
         run: |
           mv ./download/nextpnr-fpga_interchange.this_is_a_file /usr/bin/nextpnr-fpga_interchange-experimental
@@ -455,6 +456,7 @@ jobs:
         run: >
           source env.sh nextpnr &&
           python3 exhaust.py
+          --verbose
           --project ${{ matrix.project }}
           --toolchain ${{ matrix.toolchain }}
           --board ${{ matrix.board }}
diff --git a/Makefile b/Makefile
index 7b323065..59539796 100644
--- a/Makefile
+++ b/Makefile
@@ -52,7 +52,7 @@ env:: | $(CONDA_ENV_PYTHON)
 
 install_f4pga: | $(CONDA_ENV_PYTHON)
 	mkdir -p env/f4pga
-	curl -fsSL https://storage.googleapis.com/symbiflow-arch-defs/artifacts/prod/foss-fpga-tools/symbiflow-arch-defs/continuous/install/20220901-121844/symbiflow-arch-defs-install-xc7-75e2533.tar.xz | tar -xJC env/f4pga
+	curl -fsSL ${F4PGA_LATEST_URL} | xargs curl -fsSL | tar -xJC env/f4pga
 	# Adapt the environment file from f4pga-arch-defs
 	test -e env/f4pga/xc7_env/xc7_environment.yml && \
 		sed -i 's/name: xc7/name: f4pga-env/g' env/f4pga/xc7_env/xc7_environment.yml
@@ -62,7 +62,7 @@ install_f4pga: | $(CONDA_ENV_PYTHON)
 	@$(CONDA_ACTIVATE) f4pga-env && conda list
 	# Install all devices
 	for device in ${F4PGA_DEVICES}; do \
-		curl -fsSL https://storage.googleapis.com/symbiflow-arch-defs/artifacts/prod/foss-fpga-tools/symbiflow-arch-defs/continuous/install/20220901-121844/symbiflow-arch-defs-$${device}_test-75e2533.tar.xz | tar -xJC env/f4pga; \
+		curl -fsSL ${F4PGA_LATEST_URL_BASE}/symbiflow-$${device}_test-latest | xargs curl -fsSL | tar -xJC env/f4pga; \
 	done
 
 install_interchange:
diff --git a/conf/requirements.txt b/conf/requirements.txt
index bc2d0639..499fd2b9 100644
--- a/conf/requirements.txt
+++ b/conf/requirements.txt
@@ -14,4 +14,4 @@ termcolor
 terminaltables
 yapf==0.31.0
 git+https://github.com/antmicro/edalize.git@fpga-tool-perf-custom_nextpnr#egg=edalize
-https://github.com/chipsalliance/f4pga/archive/de9ed1f3dba34d641c354bdb070232887254b142.zip#subdirectory=f4pga
+https://github.com/chipsalliance/f4pga/archive/main.zip#subdirectory=f4pga
diff --git a/fpgaperf.py b/fpgaperf.py
index 3e77cc2e..e8f0ae85 100755
--- a/fpgaperf.py
+++ b/fpgaperf.py
@@ -296,7 +296,15 @@ def get_combinations():
 
                     if board_info is None or b not in board_info:
                         continue
+
+                    if t == 'vpr' and project_name != 'baselitex':
+                        continue
+
+                    if t == 'vpr-fasm2bels' and project_name not in ['blinky', 'oneblink']:
+                        continue
+
                     combs.append((project_name, t, b))
+
     return combs