diff --git a/.github/workflows/Tasmota_build_devel.yml b/.github/workflows/Tasmota_build_devel.yml
index e60c45f7b..f6037bad8 100644
--- a/.github/workflows/Tasmota_build_devel.yml
+++ b/.github/workflows/Tasmota_build_devel.yml
@@ -15,7 +15,62 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  be_solidify:
+    runs-on: ubuntu-20.04
+    if: github.repository == 'arendst/Tasmota'
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.x'
+      - name: Make Berry and Tasmota Berry code
+        run: |
+          cd lib/libesp32/berry
+          make
+          cd ../berry_tasmota
+          ../berry/berry -s -g solidify_all.be
+      - name: Matter Berry Code
+        run: |
+          cd lib/libesp32/berry_matter
+          ../berry/berry -s -g solidify_all.be
+      - uses: actions/upload-artifact@v3
+        with:
+          name: berry_matter
+          path: ./lib/libesp32/berry_matter/src/solidify
+      - uses: actions/upload-artifact@v3
+        with:
+          name: berry_tasmota
+          path: ./lib/libesp32/berry_tasmota/src/solidify
+
+  push_solidified:
+    needs: be_solidify
+    runs-on: ubuntu-latest
+    if: github.repository == 'arendst/Tasmota'
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.x'
+      - name: Remove old solidified code
+        run: |
+          rm ./lib/libesp32/berry_matter/src/solidify/*
+          rm ./lib/libesp32/berry_tasmota/src/solidify/*
+      - uses: actions/download-artifact@v3
+        with:
+          name: berry_matter
+          path: ./lib/libesp32/berry_matter/src/solidify
+      - uses: actions/download-artifact@v3
+        with:
+          name: berry_tasmota
+          path: ./lib/libesp32/berry_tasmota/src/solidify
+      - uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          commit_message: Solidified Code updated
+
   safeboot-images:
+    needs: push_solidified
     runs-on: ubuntu-latest
     if: github.repository == 'arendst/Tasmota'
     continue-on-error: true
diff --git a/.github/workflows/Tasmota_build_master.yml b/.github/workflows/Tasmota_build_master.yml
index 2a9955b7d..299774c54 100644
--- a/.github/workflows/Tasmota_build_master.yml
+++ b/.github/workflows/Tasmota_build_master.yml
@@ -14,7 +14,62 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  be_solidify:
+    runs-on: ubuntu-20.04
+    if: github.repository == 'arendst/Tasmota'
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.x'
+      - name: Make Berry and Tasmota Berry code
+        run: |
+          cd lib/libesp32/berry
+          make
+          cd ../berry_tasmota
+          ../berry/berry -s -g solidify_all.be
+      - name: Matter Berry Code
+        run: |
+          cd lib/libesp32/berry_matter
+          ../berry/berry -s -g solidify_all.be
+      - uses: actions/upload-artifact@v3
+        with:
+          name: berry_matter
+          path: ./lib/libesp32/berry_matter/src/solidify
+      - uses: actions/upload-artifact@v3
+        with:
+          name: berry_tasmota
+          path: ./lib/libesp32/berry_tasmota/src/solidify
+
+  push_solidified:
+    needs: be_solidify
+    runs-on: ubuntu-latest
+    if: github.repository == 'arendst/Tasmota'
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.x'
+      - name: Remove old solidified code
+        run: |
+          rm ./lib/libesp32/berry_matter/src/solidify/*
+          rm ./lib/libesp32/berry_tasmota/src/solidify/*
+      - uses: actions/download-artifact@v3
+        with:
+          name: berry_matter
+          path: ./lib/libesp32/berry_matter/src/solidify
+      - uses: actions/download-artifact@v3
+        with:
+          name: berry_tasmota
+          path: ./lib/libesp32/berry_tasmota/src/solidify
+      - uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          commit_message: Solidified Code updated
+
   safeboot-images:
+    needs: push_solidified
     runs-on: ubuntu-latest
     if: github.repository == 'arendst/Tasmota'
     continue-on-error: true
diff --git a/lib/libesp32/berry_tasmota/src/solidify/solidified_i2c_axp192.h b/lib/libesp32/berry_tasmota/src/solidify/solidified_i2c_axp192.h
index 97c7d8cb3..2ef43a553 100644
--- a/lib/libesp32/berry_tasmota/src/solidify/solidified_i2c_axp192.h
+++ b/lib/libesp32/berry_tasmota/src/solidify/solidified_i2c_axp192.h
@@ -72,7 +72,7 @@ be_local_closure(AXP192_get_bat_power,   /* name */
     1,                          /* has constants */
     ( &(const bvalue[ 2]) {     /* constants */
     /* K0   */  be_nested_str(read24),
-    /* K1   */  be_const_real_hex(0x3A102DE1),
+    /* K1   */  be_const_real_hex(0x3A102DE0),
     }),
     &be_const_str_get_bat_power,
     &be_const_str_solidified,
diff --git a/lib/libesp32/berry_tasmota/src/solidify/solidified_i2c_axp202.h b/lib/libesp32/berry_tasmota/src/solidify/solidified_i2c_axp202.h
index 4d8199e1d..a912b0660 100644
--- a/lib/libesp32/berry_tasmota/src/solidify/solidified_i2c_axp202.h
+++ b/lib/libesp32/berry_tasmota/src/solidify/solidified_i2c_axp202.h
@@ -172,7 +172,7 @@ be_local_closure(AXP202_get_bat_power,   /* name */
     1,                          /* has constants */
     ( &(const bvalue[ 2]) {     /* constants */
     /* K0   */  be_nested_str(read24),
-    /* K1   */  be_const_real_hex(0x3A102DE1),
+    /* K1   */  be_const_real_hex(0x3A102DE0),
     }),
     &be_const_str_get_bat_power,
     &be_const_str_solidified,