diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 9406caa5..a94c24b1 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -50,6 +50,24 @@ jobs:
       - name: create folders
         run: |
           mkdir espbinaries
+
+      - name: Build firmware for Tag_Flasher
+        run: |
+          cd Tag_Flasher/ESP32_Flasher
+          export PLATFORMIO_BUILD_FLAGS="-D BUILD_VERSION=${{ github.ref_name }} -D SHA=$GITHUB_SHA"
+          pio run --environment S2_Tag_Flasher
+          pio run --target buildfs --environment S2_Tag_Flasher
+          mkdir /home/runner/work/OpenEPaperLink/OpenEPaperLink/S2_Tag_Flasher
+          cp ~/.platformio/packages/framework-arduinoespressif32/tools/partitions/boot_app0.bin /home/runner/work/OpenEPaperLink/OpenEPaperLink/S2_Tag_Flasher/boot_app0.bin
+          cp .pio/build/S2_Tag_Flasher/firmware.bin /home/runner/work/OpenEPaperLink/OpenEPaperLink/S2_Tag_Flasher/firmware.bin
+          cp .pio/build/S2_Tag_Flasher/bootloader.bin /home/runner/work/OpenEPaperLink/OpenEPaperLink/S2_Tag_Flasher/bootloader.bin
+          cp .pio/build/S2_Tag_Flasher/partitions.bin /home/runner/work/OpenEPaperLink/OpenEPaperLink/S2_Tag_Flasher/partitions.bin
+          cp .pio/build/S2_Tag_Flasher/littlefs.bin /home/runner/work/OpenEPaperLink/OpenEPaperLink/S2_Tag_Flasher/littlefs.bin
+          cd /home/runner/work/OpenEPaperLink/OpenEPaperLink/S2_Tag_Flasher
+          esptool.py --chip esp32-s2 merge_bin -o merged-firmware.bin --flash_mode dio --flash_freq 80m --flash_size 4MB 0x1000 bootloader.bin 0x8000 partitions.bin 0xe000 boot_app0.bin 0x10000 firmware.bin 0x290000 littlefs.bin
+          cd /home/runner/work/OpenEPaperLink/OpenEPaperLink
+          cp S2_Tag_Flasher/firmware.bin espbinaries/S2_Tag_Flasher.bin
+          cp S2_Tag_Flasher/merged-firmware.bin espbinaries/S2_Tag_Flasher_full.bin
           
       - name: Build firmware for Simple_AP
         run: |