diff --git a/.github/workflows/keymaps.yml b/.github/workflows/keymaps.yml
index d68c6c8..af8c98c 100644
--- a/.github/workflows/keymaps.yml
+++ b/.github/workflows/keymaps.yml
@@ -40,49 +40,29 @@ jobs:
 
   setup:
     runs-on: ubuntu-latest
+    container: ghcr.io/qmk/qmk_cli
     steps:
       - uses: actions/checkout@v4
 
-      - name: Install mise
-        uses: jdx/mise-action@v3
-
       - name: Cache QMK firmware
         id: cache-qmk
         uses: actions/cache@v4
         with:
           path: working_area/qmk_firmware
-          key: qmk-${{ hashFiles('mise-tasks/setup') }}
-
-      - name: Cache pip packages
-        uses: actions/cache@v4
-        with:
-          path: ~/.cache/pip
-          key: pip-qmk-${{ hashFiles('mise-tasks/setup') }}
-
-      - name: Install QMK CLI
-        if: steps.cache-qmk.outputs.cache-hit != 'true'
-        run: python3 -m pip install qmk
-
-      - name: Setup QMK
-        if: steps.cache-qmk.outputs.cache-hit != 'true'
-        run: mise run setup
-
-      - name: Cache QMK build dependencies
-        uses: awalsh128/cache-apt-pkgs-action@latest
-        with:
-          packages: build-essential clang-format diffutils gcc git unzip wget zip python3-pip binutils-avr gcc-avr avr-libc binutils-arm-none-eabi gcc-arm-none-eabi libnewlib-arm-none-eabi avrdude dfu-programmer dfu-util teensy-loader-cli libhidapi-hidraw0 libusb-dev picolibc-riscv64-unknown-elf gcc-riscv64-unknown-elf binutils-riscv64-unknown-elf
-          version: 1.0
-          execute_install_scripts: true
+          key: qmk-container-${{ hashFiles('mise-tasks/setup') }}
 
-      - name: Install QMK build dependencies
+      - name: Clone QMK firmware
         if: steps.cache-qmk.outputs.cache-hit != 'true'
         run: |
-          cd ${{ github.workspace }}/working_area/qmk_firmware
-          sudo util/qmk_install.sh -y
+          git clone --depth 1 --branch 0.31.9 \
+            https://github.com/qmk/qmk_firmware.git working_area/qmk_firmware
+          cd working_area/qmk_firmware
+          git submodule update --init --recursive --depth 1
 
   build:
     needs: [lint, matrix, setup]
     runs-on: ubuntu-latest
+    container: ghcr.io/qmk/qmk_cli
     strategy:
       fail-fast: false
       max-parallel: 8
@@ -91,42 +71,24 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Install mise
-        uses: jdx/mise-action@v3
-
       - name: Restore QMK firmware cache
         uses: actions/cache@v4
         with:
           path: working_area/qmk_firmware
-          key: qmk-${{ hashFiles('mise-tasks/setup') }}
+          key: qmk-container-${{ hashFiles('mise-tasks/setup') }}
           fail-on-cache-miss: true
 
-      - name: Restore QMK build dependencies
-        uses: awalsh128/cache-apt-pkgs-action@latest
-        with:
-          packages: build-essential clang-format diffutils gcc git unzip wget zip python3-pip binutils-avr gcc-avr avr-libc binutils-arm-none-eabi gcc-arm-none-eabi libnewlib-arm-none-eabi avrdude dfu-programmer dfu-util teensy-loader-cli libhidapi-hidraw0 libusb-dev picolibc-riscv64-unknown-elf gcc-riscv64-unknown-elf binutils-riscv64-unknown-elf
-          version: 1.0
-          execute_install_scripts: true
-
-      - name: Restore pip cache
-        uses: actions/cache@v4
-        with:
-          path: ~/.cache/pip
-          key: pip-qmk-${{ hashFiles('mise-tasks/setup') }}
-
-      - name: Install QMK CLI
-        run: python3 -m pip install qmk
-
-      - name: Install QMK build dependencies
-        run: |
-          cd ${{ github.workspace }}/working_area/qmk_firmware
-          sudo util/qmk_install.sh -y
-
       - name: Sync keyboard
-        run: mise run sync "${{ matrix.keyboard }}"
+        env:
+          QMK_HOME: ${{ github.workspace }}/working_area/qmk_firmware
+          QMK_USERSPACE: ${{ github.workspace }}
+        run: ./mise-tasks/sync "${{ matrix.keyboard }}"
 
       - name: Build ${{ matrix.keyboard }}
-        run: mise run qmk compile -kb "${{ matrix.keyboard }}" -km "${{ matrix.keymap }}"
+        env:
+          QMK_HOME: ${{ github.workspace }}/working_area/qmk_firmware
+          QMK_USERSPACE: ${{ github.workspace }}
+        run: qmk compile -kb "${{ matrix.keyboard }}" -km "${{ matrix.keymap }}"
 
       - uses: actions/upload-artifact@v4
         with:
diff --git a/AGENTS.md b/AGENTS.md
index 45a5ed6..c4cc72d 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -267,4 +267,6 @@ This will re-clone the firmware at the new version and re-sync all keyboards.
 
 ## CI Notes
 
-The GitHub Actions workflow (`.github/workflows/keymaps.yml`) uses `awalsh128/cache-apt-pkgs-action` to pre-cache apt packages for faster builds. The `qmk_install.sh` step still runs to ensure all dependencies are properly installed, but the cached packages make it faster.
+The GitHub Actions workflow (`.github/workflows/keymaps.yml`) uses the official `ghcr.io/qmk/qmk_cli` container for build jobs. This container includes all QMK toolchains (ARM, AVR, RISC-V) and the QMK CLI pre-installed, eliminating dependency installation overhead.
+
+The mise task scripts (`mise-tasks/*`) are executed directly in CI without mise installed - they're just bash scripts. The environment variables (`QMK_HOME`, `QMK_USERSPACE`) that mise.toml would normally provide are set explicitly in the workflow.