diff --git a/.github/workflows/Tasmota_build_devel.yml b/.github/workflows/Tasmota_build_devel.yml
index 3d03136c3..4021fe646 100644
--- a/.github/workflows/Tasmota_build_devel.yml
+++ b/.github/workflows/Tasmota_build_devel.yml
@@ -90,40 +90,17 @@ jobs:
           python-version: '3.x'
       - uses: actions/download-artifact@v4
         with:
-          pattern: berry_tasmota
-          path: berry_tasmota
-      - name: Move files back to orig folder
-        run: mv berry_tasmota/berry_tasmota/* ./lib/libesp32/berry_tasmota/src/solidify
-      - uses: actions/download-artifact@v4
-        with:
-          pattern: berry_matter
-          path: berry_matter
-      - name: Move files back to orig folder
-        run: mv berry_matter/berry_matter/* ./lib/libesp32/berry_matter/src/solidify
-      - uses: actions/download-artifact@v4
-        with:
-          pattern: berry_animate
-          path: berry_animate
-      - name: Move files back to orig folder
-        run: mv berry_animate/berry_animate/* ./lib/libesp32/berry_animate/src/solidify
-      - uses: actions/download-artifact@v4
-        with:
-          pattern: berry_lvgl
-          path: berry_lvgl
-      - name: Move files back to orig folder
-        run: mv berry_lvgl/berry_lvgl/* ./lib/libesp32_lvgl/lv_binding_berry/src/solidify
-      - uses: actions/download-artifact@v4
-        with:
-          pattern: berry_haspmota
-          path: berry_haspmota
-      - name: Move files back to orig folder
-        run: mv berry_haspmota/berry_haspmota/* ./lib/libesp32_lvgl/lv_haspmota/src/solidify
-      - uses: actions/download-artifact@v4
-        with:
-          pattern: berry_header
-          path: berry_header
-      - name: Move files back to orig folder
-        run: mv berry_header/berry_header/* ./lib/libesp32/berry/generate
+          pattern: berry*
+          path: berry
+      - name: Move solidified Berry files back
+        run: |
+          ls -R ./berry
+          mv berry/berry_tasmota/* ./lib/libesp32/berry_tasmota/src/solidify
+          mv berry/berry_matter/* ./lib/libesp32/berry_matter/src/solidify
+          mv berry/berry_animate/* ./lib/libesp32/berry_animate/src/solidify
+          mv berry/berry_lvgl/* ./lib/libesp32_lvgl/lv_binding_berry/src/solidify
+          mv berry/berry_haspmota/* ./lib/libesp32_lvgl/lv_haspmota/src/solidify
+          mv berry/berry_header/* ./lib/libesp32/berry/generate
       - uses: stefanzweifel/git-auto-commit-action@v5
         with:
           commit_message: Solidified Code updated