diff --git a/.github/workflows/validate_esphome.yml b/.github/workflows/validate_esphome.yml
index 890f465..7fdd981 100644
--- a/.github/workflows/validate_esphome.yml
+++ b/.github/workflows/validate_esphome.yml
@@ -206,78 +206,45 @@ jobs:
         with:
           yaml_file: prebuilt/nspanel_esphome_prebuilt.yaml
 
-      - name: Move and Rename Firmware File
+      - name: Move and Rename Firmware File - nspanel_esphome_prebuilt
         run: |
           mkdir -p prebuilt
           cp prebuilt/.esphome/build/nspanel/.pioenvs/nspanel/firmware.bin prebuilt/nspanel_esphome_prebuilt.bin || true
           cp prebuilt/.esphome/build/nspanel/.pioenvs/nspanel/firmware-factory.bin prebuilt/nspanel_esphome_prebuilt-factory.bin || true
 
-      - name: Generate checksum
-        uses: jmgilman/actions-generate-checksum@v1
-        with:
-          method: md5
-          patterns: prebuilt/nspanel_esphome_prebuilt.bin
-          output: prebuilt/nspanel_esphome_prebuilt.bin.md5
-
-      - name: Generate checksum
-        uses: jmgilman/actions-generate-checksum@v1
-        with:
-          method: md5
-          patterns: prebuilt/nspanel_esphome_prebuilt-factory.bin
-          output: prebuilt/nspanel_esphome_prebuilt-factory.bin.md5
-
-      - name: Set Commit Message
-        id: set_commit_message
-        run: |
-          if [[ "${{ github.event_name }}" == "pull_request" ]]; then
-            echo "COMMIT_MESSAGE=Pre-built firmware for NSPanel - ${{ github.event.pull_request.title }}" >> $GITHUB_ENV
-          elif [[ "${{ github.event_name }}" == "push" ]]; then
-            commit_message=$(git log -1 --pretty=format:'%s')
-            echo "COMMIT_MESSAGE=Pre-built firmware for NSPanel - $commit_message" >> $GITHUB_ENV
-          else
-            echo "COMMIT_MESSAGE=Pre-built firmware for NSPanel" >> $GITHUB_ENV
-          fi
-
-      - name: Commit and Push Firmware Files
-        run: |
-          git config --global user.name 'GitHub Actions'
-          git config --global user.email 'actions@github.com'
-          git add prebuilt/*.bin
-          git add prebuilt/*.md5
-          git commit -m "${{ env.COMMIT_MESSAGE }}"
-          git push
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-  build_wall_display_firmware:
-    name: Prebuilt Wall Display 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'
-
       - name: Build ESPHome Prebuilt Wall Display Firmware
         uses: barndawgie/build-action@v1.9.0
         with:
           yaml_file: prebuilt/Wall_Display.yaml
 
-      - name: Move and Rename Firmware File
+      - name: Move and Rename Firmware File - wall_display
         run: |
           mkdir -p prebuilt
           cp prebuilt/.esphome/build/nspanel/.pioenvs/nspanel/firmware.bin prebuilt/wall_display.bin || true
           cp prebuilt/.esphome/build/nspanel/.pioenvs/nspanel/firmware-factory.bin prebuilt/wall_display-factory.bin || true
 
-      - name: Generate checksum
+      - name: Generate checksum nspanel_esphome_prebuilt
+        uses: jmgilman/actions-generate-checksum@v1
+        with:
+          method: md5
+          patterns: prebuilt/nspanel_esphome_prebuilt.bin
+          output: prebuilt/nspanel_esphome_prebuilt.bin.md5
+
+      - name: Generate checksum nspanel_esphome_prebuilt-factory
+        uses: jmgilman/actions-generate-checksum@v1
+        with:
+          method: md5
+          patterns: prebuilt/nspanel_esphome_prebuilt-factory.bin
+          output: prebuilt/nspanel_esphome_prebuilt-factory.bin.md5
+
+      - name: Generate checksum wall_display
         uses: jmgilman/actions-generate-checksum@v1
         with:
           method: md5
           patterns: prebuilt/wall_display.bin
           output: prebuilt/wall_display.bin.md5
 
-      - name: Generate checksum
+      - name: Generate checksum wall_display-factory
         uses: jmgilman/actions-generate-checksum@v1
         with:
           method: md5