diff --git a/.ci/dolphin/build-gamecube.sh b/.ci/dolphin/build-gamecube.sh
index 4580a16..508d267 100755
--- a/.ci/dolphin/build-gamecube.sh
+++ b/.ci/dolphin/build-gamecube.sh
@@ -1,16 +1,13 @@
 #!/bin/bash
-docker build -t dolbuild:latest -f .ci/dolphin/Dockerfile .
-docker run -u "$(id -u):$(id -g)" -w /app -v "$(pwd):/app" dolbuild:latest /bin/bash -c ' \
-  echo "Current dir" && \
-  realpath . && \
-  ls -l && \
-  echo "/app" && \
-  ls -l /app
-'
-#   export PATH="$DEVKITPPC/bin:$PATH" && \
-#   # cmake -S. -Bbuildcube -DDUSK_TARGET_SYSTEM=gamecube -DCMAKE_TOOLCHAIN_FILE="$DEVKITPRO/cmake/GameCube.cmake" && \
-#   cmake -S. -Bbuildcube -DDUSK_TARGET_SYSTEM=wii -DCMAKE_TOOLCHAIN_FILE="$DEVKITPRO/cmake/Wii.cmake" && \
-#   cd buildcube && \
-#   make VERBOSE=1 && \
-#   cp ./Dusk.dol ./boot.dol
-# '
\ No newline at end of file
+docker build -t myapp:latest -f .ci/dolphin/Dockerfile .
+docker run -it -v ./:/workdir myapp:latest /bin/bash -c ' \
+  export PATH="$DEVKITPPC/bin:$PATH" && \
+  cd /workdir && \
+  rm -rf build2 && \
+  mkdir -p build2 && \
+  # cmake -S. -Bbuild2 -DDUSK_TARGET_SYSTEM=gamecube -DCMAKE_TOOLCHAIN_FILE="$DEVKITPRO/cmake/GameCube.cmake" && \
+  cmake -S. -Bbuild2 -DDUSK_TARGET_SYSTEM=wii -DCMAKE_TOOLCHAIN_FILE="$DEVKITPRO/cmake/Wii.cmake" && \
+  cd build2 && \
+  make VERBOSE=1 && \
+  cp ./Dusk.dol ./boot.dol
+'
\ No newline at end of file
diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml
index b43a8e6..4a57dfa 100644
--- a/.gitea/workflows/build.yml
+++ b/.gitea/workflows/build.yml
@@ -16,42 +16,28 @@ jobs:
         uses: actions/checkout@v5
       - name: Install dependencies
         run: |
-          apt-get update
-          sudo apt remove $(dpkg --get-selections docker.io docker-compose docker-compose-v2 docker-doc podman-docker containerd runc | cut -f1)
-          # Add Docker's official GPG key:
-          sudo apt update
-          sudo apt install ca-certificates curl
-          sudo install -m 0755 -d /etc/apt/keyrings
-          sudo curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc
-          sudo chmod a+r /etc/apt/keyrings/docker.asc
+          # Install devkit pacman
+          wget https://apt.devkitpro.org/install-devkitpro-pacman
+          chmod +x ./install-devkitpro-pacman
+          sudo ./install-devkitpro-pacman
 
-          # Add the repository to Apt sources:
-          sudo tee /etc/apt/sources.list.d/docker.sources <<EOF
-          Types: deb
-          URIs: https://download.docker.com/linux/ubuntu
-          Suites: $(. /etc/os-release && echo "${UBUNTU_CODENAME:-$VERSION_CODENAME}")
-          Components: stable
-          Signed-By: /etc/apt/keyrings/docker.asc
-          EOF
+          sudo dkp-pacman -Syu --noconfirm
+          sudo dkp-pacman -S gamecube-dev --noconfirm
 
-          sudo apt update --yes
-          sudo apt install docker-ce docker-ce-cli containerd.io docker-buildx-plugin --yes
       - name: Build GameCube
         run: |
-          sudo docker build -t dolbuild:latest -f .ci/dolphin/Dockerfile .
-          sudo docker run -w /app -v "$(pwd):/app" dolbuild:latest /bin/bash -c ' \
-            echo "Inside Docker:" && \
-            echo "Current dir" && \
-            realpath . && \
-            ls -l && \
-            echo "/app" && \
-            ls -l /app
-          '
+          export DEVKITPRO=/opt/devkitpro
+          export DEVKITPPC=/opt/devkitpro/devkitPPC
+          mkdir -p ./build-gamecube
+          cd build-gamecube
+          cmake -S. -Bbuild2 -DDUSK_TARGET_SYSTEM=gamecube -DCMAKE_TOOLCHAIN_FILE="$DEVKITPRO/cmake/GameCube.cmake"
+          make VERBOSE=1
+
       - name: Copy GameCube
         run: |
-          mkdir -p build/gitea/GameCube/Dusk
-          mv build/Dusk.dol build/gitea/GameCube/Dusk/Dusk.dol
-          mv build/dusk.dsk build/gitea/GameCube/Dusk/dusk.dsk
+          ls -l
+          # mv build/Dusk.dol build/gitea/GameCube/Dusk/Dusk.dol
+          # mv build/dusk.dsk build/gitea/GameCube/Dusk/dusk.dsk
       - name: Upload GameCube Binary
         uses: actions/upload-artifact@v3
         with: