diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4c35dfac..4c248dbd 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -37,25 +37,21 @@ jobs:
     - name: Setup OOT
       run: |
         cd oot
-        mkdir -p baseroms/gc-eu-mq-dbg
+        mkdir -p baseroms/gc-eu-mq-dbg/segments
         cp ~/baserom_original.z64 ./baseroms/gc-eu-mq-dbg/baserom.z64
         make venv
         make -C tools -j
         cp ../ZAPD.out tools/ZAPD/
         .venv/bin/python3 tools/decompress_baserom.py gc-eu-mq-dbg
-        .venv/bin/python3 extract_baserom.py
+        .venv/bin/python3 tools/extract_baserom.py baseroms/gc-eu-mq-dbg/baserom-decompressed.z64 -o baseroms/gc-eu-mq-dbg/segments --dmadata-start 0x12f70 --dmadata-names baseroms/gc-eu-mq-dbg/dmadata_names.txt
         .venv/bin/python3 extract_assets.py -j 4
 
-    - name: Install Python dependencies
+    - name: Setup MM
       run: |
         cd mm
         python3 -m venv .mm-env
         source .mm-env/bin/activate 
         python3 -m pip install -r requirements.txt
-
-    - name: Setup MM
-      run: |
-        cd mm
         cp ~/baserom.mm.us.rev1.z64 ./baserom.mm.us.rev1.z64
         make -C tools -j
         cp ../ZAPD.out tools/ZAPD/
@@ -76,6 +72,9 @@ jobs:
     - name: Build mm
       run: |
         cd mm
+        python3 -m venv .mm-env
+        source .mm-env/bin/activate 
+        python3 -m pip install -r requirements.txt
         make -j disasm
         make -j