diff --git a/.github/workflows/Tasmota_build_devel.yml b/.github/workflows/Tasmota_build_devel.yml
index 5dc38dc11..1da4a1a47 100644
--- a/.github/workflows/Tasmota_build_devel.yml
+++ b/.github/workflows/Tasmota_build_devel.yml
@@ -25,35 +25,57 @@ jobs:
         uses: actions/setup-python@v5
         with:
           python-version: '3.x'
-      #- name: Install clang compiler
-        #run: |
-          #sudo apt-get install -f clang
+
       - name: Make Berry and Tasmota Berry code
         run: |
           cd lib/libesp32/berry
           make
           cd ../berry_tasmota
           ../berry/berry -s -g solidify_all.be
+      - uses: actions/upload-artifact@v4
+        with:
+          name: berry_tasmota
+          path: ./lib/libesp32/berry_tasmota/src/solidify
+
       - name: Matter Berry Code
         run: |
           cd lib/libesp32/berry_matter
           ../berry/berry -s -g solidify_all.be
+      - uses: actions/upload-artifact@v4
+        with:
+          name: berry_matter
+          path: ./lib/libesp32/berry_matter/src/solidify
+
       - name: Berry Animate Code
         run: |
           cd lib/libesp32/berry_animate
           ../berry/berry -s -g solidify_all.be
+      - uses: actions/upload-artifact@v4
+        with:
+          name: berry_animate
+          path: ./lib/libesp32/berry_animate/src/solidify
+
       - name: LVGL Berry Code
         run: |
           cd lib/libesp32_lvgl/lv_binding_berry
           ../../libesp32/berry/berry -s -g solidify_all.be
+      - uses: actions/upload-artifact@v4
+        with:
+          name: berry_lvgl
+          path: ./lib/libesp32_lvgl/lv_binding_berry/src/solidify
+
       - name: HASPmota Berry Code
         run: |
           cd lib/libesp32_lvgl/lv_haspmota
           ../../libesp32/berry/berry -s -g solidify_all.be
-      - uses: jason2866/upload-artifact@v2.0.3
+      - uses: actions/upload-artifact@v4
         with:
-          name: '["berry_tasmota", "berry_matter", "berry_animate", "berry_lvgl", "berry_haspmota", "berry_header"]'
-          path: '["./lib/libesp32/berry_tasmota/src/solidify", "./lib/libesp32/berry_matter/src/solidify", "./lib/libesp32/berry_animate/src/solidify", "./lib/libesp32_lvgl/lv_binding_berry/src/solidify", "./lib/libesp32_lvgl/lv_haspmota/src/solidify", "./lib/libesp32/berry/generate"]'
+          name: berry_haspmota
+          path: ./lib/libesp32_lvgl/lv_haspmota/src/solidify
+      - uses: actions/upload-artifact@v4
+        with:
+          name: berry_header
+          path: ./lib/libesp32/berry/generate
 
   push_solidified:
     needs: be_solidify
@@ -66,9 +88,9 @@ jobs:
         uses: actions/setup-python@v5
         with:
           python-version: '3.x'
-      - uses: jason2866/download-artifact@v3.0.4
+      - uses: actions/download-artifact@v4
         with:
-          name: |
+          pattern: |
             berry_tasmota
             berry_matter
             berry_animate
@@ -129,9 +151,9 @@ jobs:
         #run: |
           #cp ./build_output/firmware/tasmota32solo1-safeboot.bin ./build_output/firmware/tasmota32-safeboot.bin 
       - name: Upload safeboot firmware artifacts
-        uses: jason2866/upload-artifact@v2.0.3
+        uses: actions/upload-artifact@v4
         with:
-          name: firmware_safeboot
+          name: ${{ matrix.variant }}
           path: ./build_output
 
   base-images:
@@ -172,9 +194,9 @@ jobs:
       - name: Run PlatformIO
         run: platformio run -e ${{ matrix.variant }}
       - name: Upload firmware artifacts
-        uses: jason2866/upload-artifact@v2.0.3
+        uses: actions/upload-artifact@v4
         with:
-          name: firmware
+          name: ${{ matrix.variant }}
           path: ./build_output
 
   base32-images:
@@ -214,9 +236,9 @@ jobs:
           pip install -U platformio
           cp ./platformio_override_sample.ini ./platformio_override.ini
       - name: Download safeboot firmwares
-        uses: jason2866/download-artifact@v3.0.4
+        uses: actions/download-artifact@v4
         with:
-          name: firmware_safeboot
+          pattern: *-safeboot
           path: ./firmware
       - name: Add SHA to footer
         run: |
@@ -226,9 +248,9 @@ jobs:
       - name: Run PlatformIO
         run: platformio run -e ${{ matrix.variant }}
       - name: Upload firmware artifacts
-        uses: jason2866/upload-artifact@v2.0.3
+        uses: actions/upload-artifact@v4
         with:
-          name: firmware
+          name: ${{ matrix.variant }}
           path: ./build_output
 
   language-images:
@@ -254,9 +276,9 @@ jobs:
           pip install -U platformio
           cp ./platformio_override_sample.ini ./platformio_override.ini
       - name: Download safeboot firmwares
-        uses: jason2866/download-artifact@v3.0.4
+        uses: actions/download-artifact@v4
         with:
-          name: firmware_safeboot
+          pattern: *-safeboot
           path: ./firmware
       - name: Add SHA to footer
         run: |
@@ -266,9 +288,9 @@ jobs:
       - name: Run PlatformIO
         run: platformio run -e ${{ matrix.variant }}-${{ matrix.language }}
       - name: Upload language firmware artifacts
-        uses: jason2866/upload-artifact@v2.0.3
+        uses: actions/upload-artifact@v4
         with:
-          name: firmware
+          name: ${{ matrix.variant }}
           path: ./build_output
 
   Start_final_copy:
diff --git a/.github/workflows/Tasmota_build_master.yml b/.github/workflows/Tasmota_build_master.yml
index 3ae366cea..541bf6638 100644
--- a/.github/workflows/Tasmota_build_master.yml
+++ b/.github/workflows/Tasmota_build_master.yml
@@ -51,9 +51,9 @@ jobs:
       - name: Run PlatformIO
         run: platformio run -e ${{ matrix.variant }}
       - name: Upload safeboot firmware artifacts
-        uses: jason2866/upload-artifact@v2.0.3
+        uses: actions/upload-artifact@v4
         with:
-          name: firmware_safeboot
+          name: ${{ matrix.variant }}
           path: ./build_output
 
   base-images:
@@ -92,9 +92,9 @@ jobs:
       - name: Run PlatformIO
         run: platformio run -e ${{ matrix.variant }}
       - name: Upload firmware artifacts
-        uses: jason2866/upload-artifact@v2.0.3
+        uses: actions/upload-artifact@v4
         with:
-          name: firmware
+          name: ${{ matrix.variant }}
           path: ./build_output
 
   base32-images:
@@ -134,9 +134,9 @@ jobs:
           pip install -U platformio
           cp ./platformio_override_sample.ini ./platformio_override.ini
       - name: Download safeboot firmwares
-        uses: jason2866/download-artifact@v3.0.4
+        uses: actions/download-artifact@v4
         with:
-          name: firmware_safeboot
+          pattern: tasmota32*
           path: ./firmware
       - name: Display downloaded files
         run: |
@@ -147,9 +147,9 @@ jobs:
       - name: Run PlatformIO
         run: platformio run -e ${{ matrix.variant }}
       - name: Upload firmware artifacts
-        uses: jason2866/upload-artifact@v2.0.3
+        uses: actions/upload-artifact@v4
         with:
-          name: firmware
+          name: ${{ matrix.variant }}
           path: ./build_output
 
   language-images:
@@ -175,9 +175,9 @@ jobs:
           pip install -U platformio
           cp ./platformio_override_sample.ini ./platformio_override.ini
       - name: Download safeboot firmwares
-        uses: jason2866/download-artifact@v3.0.4
+        uses: actions/download-artifact@v4
         with:
-          name: firmware_safeboot
+          pattern: tasmota32*
           path: ./firmware
       - name: Display downloaded files
         run: |
@@ -188,9 +188,9 @@ jobs:
       - name: Run PlatformIO
         run: platformio run -e ${{ matrix.variant }}-${{ matrix.language }}
       - name: Upload language firmware artifacts
-        uses: jason2866/upload-artifact@v2.0.3
+        uses: actions/upload-artifact@v4
         with:
-          name: firmware
+          name: ${{ matrix.variant }}
           path: ./build_output
 
   Release:
@@ -200,14 +200,14 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Download Tasmota firmwares
-      uses: jason2866/download-artifact@v3.0.4
+      uses: actions/download-artifact@v4
       with:
-        name: firmware
+        pattern: tasmota*
         path: ./mv_firmware
     - name: Download safeboot firmwares
-      uses: jason2866/download-artifact@v3.0.4
+      uses: actions/download-artifact@v4
       with:
-        name: firmware_safeboot
+        pattern: *-safeboot
         path: ./mv_firmware
     - name: Display structure of downloaded files
       run: ls -R ./mv_firmware/
diff --git a/.github/workflows/build_all_the_things.yml b/.github/workflows/build_all_the_things.yml
index aa80aa913..aee8ab0c2 100644
--- a/.github/workflows/build_all_the_things.yml
+++ b/.github/workflows/build_all_the_things.yml
@@ -41,9 +41,9 @@ jobs:
           #platformio update
       - name: Run PlatformIO
         run: platformio run -e ${{ matrix.variant }}
-      - uses: jason2866/upload-artifact@v2.0.3
+      - uses: actions/upload-artifact@v4
         with:
-          name: firmware
+          name: ${{ matrix.variant }}
           path: ./build_output
 
   os-check-mac:
@@ -69,9 +69,9 @@ jobs:
           #platformio update
       - name: Run PlatformIO
         run: platformio run -e ${{ matrix.variant }}
-      - uses: jason2866/upload-artifact@v2.0.3
+      - uses: actions/upload-artifact@v4
         with:
-          name: firmware
+          name: ${{ matrix.variant }}
           path: ./build_output
 
   base-images:
@@ -128,9 +128,9 @@ jobs:
           cp ./platformio_override_sample.ini ./platformio_override.ini
       - name: Run PlatformIO
         run: platformio run -e ${{ matrix.variant }}
-      - uses: jason2866/upload-artifact@v2.0.3
+      - uses: actions/upload-artifact@v4
         with:
-          name: firmware
+          name: ${{ matrix.variant }}
           path: ./build_output
 
   language-images:
@@ -156,7 +156,7 @@ jobs:
           #platformio update
       - name: Run PlatformIO
         run: platformio run -e ${{ matrix.variant }}-${{ matrix.language }}
-      - uses: jason2866/upload-artifact@v2.0.3
+      - uses: actions/upload-artifact@v4
         with:
-          name: firmware
+          name: ${{ matrix.variant }}
           path: ./build_output