diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index d7ff2605..a8e4025f 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -5,7 +5,15 @@ on:
 jobs:
   build:
     name: Build ${{ matrix.model }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
+    container:
+      image: shellyhomekit/mos:latest
+    services:
+      docker:
+        image: docker:dind
+        options: --privileged
+        ports:
+          - 2375:2375
     strategy:
       fail-fast: false
       matrix:
@@ -41,12 +49,10 @@ jobs:
       - name: Build docker image # remove if newer mos docker image is available
         if: ${{ contains( matrix.model , 'Plus') || contains( matrix.model , 'Gen3') }}
         run: docker build -t mgos/esp32-build:4.4.1-r7 -f .github/workflows/Dockerfile-esp32-build .
-      - name: Install mos build tool
-        run: |
-          sudo add-apt-repository -y ppa:mongoose-os/mos
-          sudo apt -q install -y mos-latest
       - name: Build
-        run: make ${{ matrix.model }} RELEASE=1 RELEASE_SUFFIX=$(.github/version.py --suffix)       
+        run: | 
+          git config --global --add safe.directory /__w/shelly-homekit/shelly-homekit
+          make ${{ matrix.model }} LOCAL=1 RELEASE=1 RELEASE_SUFFIX=$(.github/version.py --suffix)       
       - name: Upload firmware artifacts
         uses: actions/upload-artifact@v4
         with: