diff --git a/.github/workflows/validate_esphome_beta.yml b/.github/workflows/validate_esphome_beta.yml
index b3c6b01..5dfb035 100644
--- a/.github/workflows/validate_esphome_beta.yml
+++ b/.github/workflows/validate_esphome_beta.yml
@@ -20,26 +20,6 @@ jobs:
           fetch-depth: '0'
       - name: Validate nspanel_esphome.yaml
         run: yamllint -c "./.rules/yamllint.yml" nspanel_esphome.yaml
-      - name: Validate nspanel_esphome_core.yaml
-        run: yamllint -c "./.rules/yamllint.yml" esphome/nspanel_esphome_core.yaml
-      - name: Validate nspanel_esphome_addon_climate_cool.yaml
-        run: yamllint -c "./.rules/yamllint.yml" nspanel_esphome_addon_climate_cool.yaml
-      - name: Validate nspanel_esphome_addon_climate_heat.yaml
-        run: yamllint -c "./.rules/yamllint.yml" nspanel_esphome_addon_climate_heat.yaml
-      - name: Validate nspanel_esphome_addon_climate_dual.yaml
-        run: yamllint -c "./.rules/yamllint.yml" nspanel_esphome_addon_climate_dual.yaml
-      - name: Validate nspanel_esphome_addon_upload_tft.yaml
-        run: yamllint -c "./.rules/yamllint.yml" esphome/nspanel_esphome_addon_upload_tft.yaml
-      - name: Validate nspanel_esphome_advanced.yaml
-        run: yamllint -c "./.rules/yamllint.yml" esphome/nspanel_esphome_advanced.yaml
-      - name: Validate nspanel_esphome_addon_climate_base.yaml
-        run: yamllint -c "./.rules/yamllint.yml" esphome/nspanel_esphome_addon_climate_base.yaml
-      - name: Validate nspanel_esphome_addon_climate_cool.yaml
-        run: yamllint -c "./.rules/yamllint.yml" esphome/nspanel_esphome_addon_climate_cool.yaml
-      - name: Validate nspanel_esphome_addon_climate_heat.yaml
-        run: yamllint -c "./.rules/yamllint.yml" esphome/nspanel_esphome_addon_climate_heat.yaml
-      - name: Validate nspanel_esphome_addon_climate_dual.yaml
-        run: yamllint -c "./.rules/yamllint.yml" esphome/nspanel_esphome_addon_climate_dual.yaml
 
   build_core:
     name: Core
@@ -168,8 +148,7 @@ jobs:
     name: Customizations
     runs-on: "ubuntu-latest"
     needs:
-      - build_climate_heat_advanced
-      - build_climate_cool_bluetooth_proxy
+      - code_scan
     steps:
       - uses: actions/checkout@main
         with:
@@ -180,21 +159,27 @@ jobs:
           yaml_file: "./.test/esphome_advanced_climate_heat_customizations.yaml"
           version: beta
 
-  # build_prebuilt_firmware:
-  #   name: Prebuilt Firmware
-  #   runs-on: ubuntu-latest
-  #   needs: build_core  # Ensure this job runs after the core build job
-  #   if: github.ref == 'refs/heads/dev' || github.base_ref == 'dev'
-  #   steps:
-  #     - uses: actions/checkout@main
-  #       with:
-  #         fetch-depth: '0'
+  build_prebuilt_firmware:
+    name: Prebuilt Firmware
+    runs-on: ubuntu-latest
+    needs: code_scan
+    if: github.ref == 'refs/heads/dev' || github.base_ref == 'dev'
+    steps:
+      - uses: actions/checkout@main
+        with:
+          fetch-depth: '0'
 
-  #     - name: Build ESPHome Prebuilt Firmware
-  #       uses: barndawgie/build-action@v1.9.0
-  #       with:
-  #         yaml_file: prebuilt/nspanel_esphome_prebuilt.yaml
-  #         version: beta
+      - name: Build ESPHome Prebuilt Firmware
+        uses: barndawgie/build-action@v1.9.0
+        with:
+          yaml_file: prebuilt/nspanel_esphome_prebuilt.yaml
+          version: beta
+
+      - name: Build ESPHome Prebuilt Wall Display Firmware
+        uses: barndawgie/build-action@v1.9.0
+        with:
+          yaml_file: prebuilt/wall_display.yaml
+          version: beta
 
   build_climate_cool_bluetooth_proxy:
     name: Climate cool & BLE proxy