diff --git a/.github/workflows/cyancore_build.yml b/.github/workflows/cyancore_build.yml
index efa78529..ae2b3f3a 100644
--- a/.github/workflows/cyancore_build.yml
+++ b/.github/workflows/cyancore_build.yml
@@ -31,9 +31,7 @@ jobs:
 
       - name: Fetch Dependencies
         run: |
-          sudo apt install cppcheck ccache -y
-          make get_avr_tc
-          make get_riscv_tc
+          make setup_workspace
 
       - name: Init CodeQL
         uses: github/codeql-action/init@v3
diff --git a/.github/workflows/cyancore_tools_build.yml b/.github/workflows/cyancore_tools_build.yml
index 7a3cf90c..175e0f5b 100644
--- a/.github/workflows/cyancore_tools_build.yml
+++ b/.github/workflows/cyancore_tools_build.yml
@@ -30,7 +30,7 @@ jobs:
 
       - name: Tools Build
         run: |
-          # make get_qemu V=1
+          make get_qemu V=1
           make get_picotool V=1
 
       - name: Clean Up