diff --git a/.github/workflows/build-nightly.yaml b/.github/workflows/build-nightly.yaml
index 6db3c2d..f479b01 100644
--- a/.github/workflows/build-nightly.yaml
+++ b/.github/workflows/build-nightly.yaml
@@ -1,4 +1,4 @@
-name: Nightly Stock Firmware Build
+name: Nightly Firmware Build Check
 on:
   schedule:
     - cron: "0 0 * * *"
@@ -11,35 +11,23 @@ jobs:
     name: Build Firmware
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - uses: actions/setup-python@v2
         with:
           python-version: "3.9"
 
-      - name: Install ESPHome
-        run: pip install --pre --user esphome
-      
       - name: Compile Stock Firmware
-        working-directory: firmware
-        run: |
-          esphome compile doorman-stock.yaml
-          mkdir -p bin
-          mv .esphome/build/doorman-s3/.pioenvs/doorman-s3/firmware.factory.bin bin/stock-firmware-factory.bin
-          mv .esphome/build/doorman-s3/.pioenvs/doorman-s3/firmware.bin bin/stock-firmware.bin
-      
-      - name: Compile Nuki Bridge Firmware
-        working-directory: firmware
-        run: |
-          esphome compile doorman-nuki-bridge.yaml
-          mkdir -p bin
-          mv .esphome/build/doorman-s3/.pioenvs/doorman-s3/firmware.factory.bin bin/nuki-bridge-firmware-factory.bin
-          mv .esphome/build/doorman-s3/.pioenvs/doorman-s3/firmware.bin bin/nuki-bridge-firmware.bin
+        uses: esphome/build-action@v4.0.1
+        with:
+          yaml_file: firmware/doorman-stock.yaml
+          version: beta
 
-      - uses: actions/upload-artifact@v4
+      - name: Compile Nuki Bridge Firmware
+        uses: esphome/build-action@v4.0.1
         with:
-          name: firmware-bin
-          path: firmware/bin
+          yaml_file: firmware/doorman-nuki-bridge.yaml
+          version: beta
 
       - name: Send Discord failure notification
         if: failure()
diff --git a/.github/workflows/esphome-build.yml b/.github/workflows/esphome-build.yml
index c8758e9..2305b08 100644
--- a/.github/workflows/esphome-build.yml
+++ b/.github/workflows/esphome-build.yml
@@ -51,8 +51,8 @@ jobs:
       esphome-build-name: ${{ steps.esphome-build.outputs.name}}
       project-version: ${{ steps.esphome-build.outputs.project-version }}
     steps:
-      - uses: actions/checkout@v3.5.3
-      - uses: esphome/build-action@v3.2.0
+      - uses: actions/checkout@v4
+      - uses: esphome/build-action@v4.0.1
         id: esphome-build
         with:
           yaml_file: ${{ matrix.file }}
@@ -73,7 +73,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [build]
     steps:
-      - uses: actions/checkout@v3.5.3
+      - uses: actions/checkout@v4
       - uses: actions/download-artifact@v4
         with:
           path: output