diff --git a/.github/workflows/main_matrix.yml b/.github/workflows/main_matrix.yml
index d9d6634ff..f58eccca7 100644
--- a/.github/workflows/main_matrix.yml
+++ b/.github/workflows/main_matrix.yml
@@ -333,6 +333,23 @@ jobs:
             release/device-*.sh
             release/device-*.bat
           retention-days: 30
+      
+      - name: Docker login
+        uses: docker/login-action@v2
+        with: 
+          username: meshtastic
+          password: ${{ secrets.DOCKER_TOKEN }}
+
+      - name: Docker setup
+        uses: docker/setup-buildx-action@v2
+
+      - name: Docker build and push
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: ./Dockerfile
+          push: true
+          tags: meshtastic/device:simulator
 
   after-checks:
     runs-on: ubuntu-latest