diff --git a/.github/workflows/Tasmota_build_devel.yml b/.github/workflows/Tasmota_build_devel.yml
index f633250dd..d4a8c1d93 100644
--- a/.github/workflows/Tasmota_build_devel.yml
+++ b/.github/workflows/Tasmota_build_devel.yml
@@ -28,6 +28,10 @@ jobs:
       - name: Install clang compiler
         run: |
           sudo apt-get install -f clang
+      - name: Run coc
+        run: |
+          cd lib/libesp32/berry
+          ./gen.sh
       - name: Make Berry and Tasmota Berry code
         run: |
           cd lib/libesp32/berry
@@ -44,8 +48,8 @@ jobs:
           ../../libesp32/berry/berry -s -g solidify_all.be
       - uses: jason2866/upload-artifact@v2.0.2
         with:
-          name: '["berry_matter", "berry_tasmota", "lvgl_tasmota"]'
-          path: '["./lib/libesp32/berry_matter/src/solidify", "./lib/libesp32/berry_tasmota/src/solidify", "./lib/libesp32_lvgl/lv_binding_berry/src/solidify"]'
+          name: '["berry_tasmota", "berry_matter", "berry_lvgl"]'
+          path: '["./lib/libesp32/berry_tasmota/src/solidify", "./lib/libesp32/berry_matter/src/solidify", "./lib/libesp32_lvgl/lv_binding_berry/src/solidify"]'
 
   push_solidified:
     needs: be_solidify
@@ -61,13 +65,13 @@ jobs:
       - uses: jason2866/download-artifact@v3
         with:
           name: |
-            berry_matter
             berry_tasmota
-            lvgl_tasmota 
+            berry_matter
+            berry_lvgl
           path: |
-           ./lib/libesp32/berry_matter/src/solidify
-           ./lib/libesp32/berry_tasmota/src/solidify
-           ./lib/libesp32_lvgl/lv_binding_berry/src/solidify
+            ./lib/libesp32/berry_tasmota/src/solidify
+            ./lib/libesp32/berry_matter/src/solidify
+            ./lib/libesp32_lvgl/lv_binding_berry/src/solidify
       - uses: stefanzweifel/git-auto-commit-action@v4
         with:
           commit_message: Solidified Code updated
diff --git a/.github/workflows/Tasmota_build_master.yml b/.github/workflows/Tasmota_build_master.yml
index e7c8587aa..ee45b03d1 100644
--- a/.github/workflows/Tasmota_build_master.yml
+++ b/.github/workflows/Tasmota_build_master.yml
@@ -15,14 +15,22 @@ concurrency:
 
 jobs:
   be_solidify:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     if: github.repository == 'arendst/Tasmota'
+    continue-on-error: true
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
           python-version: '3.x'
+      - name: Install clang compiler
+        run: |
+          sudo apt-get install -f clang
+      - name: Run coc
+        run: |
+          cd lib/libesp32/berry
+          ./gen.sh
       - name: Make Berry and Tasmota Berry code
         run: |
           cd lib/libesp32/berry
@@ -39,13 +47,14 @@ jobs:
           ../../libesp32/berry/berry -s -g solidify_all.be
       - uses: jason2866/upload-artifact@v2.0.2
         with:
-          name: '["berry_matter", "berry_tasmota", "lvgl_tasmota"]'
-          path: '["./lib/libesp32/berry_matter/src/solidify", "./lib/libesp32/berry_tasmota/src/solidify", "./lib/libesp32_lvgl/lv_binding_berry/src/solidify"]'
+          name: '["berry_tasmota", "berry_matter", "berry_lvgl"]'
+          path: '["./lib/libesp32/berry_tasmota/src/solidify", "./lib/libesp32/berry_matter/src/solidify", "./lib/libesp32_lvgl/lv_binding_berry/src/solidify"]'
 
   push_solidified:
     needs: be_solidify
     runs-on: ubuntu-latest
     if: github.repository == 'arendst/Tasmota'
+    continue-on-error: true
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python
@@ -55,13 +64,13 @@ jobs:
       - uses: jason2866/download-artifact@v3
         with:
           name: |
-            berry_matter
             berry_tasmota
-            lvgl_tasmota 
+            berry_matter
+            berry_lvgl
           path: |
-           ./lib/libesp32/berry_matter/src/solidify
-           ./lib/libesp32/berry_tasmota/src/solidify
-           ./lib/libesp32_lvgl/lv_binding_berry/src/solidify
+            ./lib/libesp32/berry_tasmota/src/solidify
+            ./lib/libesp32/berry_matter/src/solidify
+            ./lib/libesp32_lvgl/lv_binding_berry/src/solidify
       - uses: stefanzweifel/git-auto-commit-action@v4
         with:
           commit_message: Solidified Code updated
diff --git a/lib/libesp32/berry/gen.sh b/lib/libesp32/berry/gen.sh
index e67d6a426..ebf4163ef 100755
--- a/lib/libesp32/berry/gen.sh
+++ b/lib/libesp32/berry/gen.sh
@@ -4,5 +4,5 @@
 #
 # Should be eventually included in the build process
 #
-rm generate/be_*.h
+rm -Rf ./generate/be_*.h
 python3 tools/coc/coc -o generate src default ../berry_tasmota/src ../berry_mapping/src ../berry_int64/src ../../libesp32_lvgl/lv_binding_berry/src ../../libesp32_lvgl/lv_binding_berry/src/solidify ../../libesp32_lvgl/lv_binding_berry/generate -c default/berry_conf.h