diff --git a/.github/workflows/ax3200.yaml b/.github/workflows/ax3200.yaml
index 0d30bff439..0a08119abf 100644
--- a/.github/workflows/ax3200.yaml
+++ b/.github/workflows/ax3200.yaml
@@ -49,6 +49,10 @@ jobs:
           cat custom_repo/${{ env.ROLE_CONFIG }} >> .config
           make defconfig
 
+      - name: Remove packages that are marked as modules
+        run: |
+          grep "=m" .config | grep -v 'CONFIG_PACKAGE_libustream-mbedtls=m' | while read -r line; do module=$(echo "$line" | cut -f1 -d'='); sed -i "s/^$line$/# $module is not set/" .config; done
+
       - name: Download dependencies
         run: make -j $(nproc) download
 
@@ -77,6 +81,9 @@ jobs:
       - name: Extract artifacts
         run: tar xf ax_3200-images.tar
 
+      - name: Get version
+        run: echo "VERSION_INFO=$(cat version.buildinfo)" >> $GITHUB_ENV
+
       - name: Get current date
         run: echo "RELEASE_DATE=$(date +%F)" >> $GITHUB_ENV
 
@@ -84,10 +91,10 @@ jobs:
         uses: softprops/action-gh-release@master
         with:
           files: bin/targets/mediatek/mt7622/*
-          tag_name: ${{ env.RELEASE_PREFIX }}-${{ env.RELEASE_DATE }}
-          name: Openwrt AX3200 ${{ env.RELEASE_DATE }}
+          tag_name: ${{ env.RELEASE_PREFIX }}-${{ env.RELEASE_DATE }}-${{ env.VERSION_INFO }}
+          name: OpenWRT AX3200 ${{ env.RELEASE_DATE }}-${{ env.VERSION_INFO }}
           body: |
-            Updated prebuilt images for ${{ env.RELEASE_DATE }}
+            Updated prebuilt images for ${{ env.RELEASE_DATE }} based on ${{ env.VERSION_INFO }}
             Build Commit: ${{ needs.check_commits.outputs.latest_commit_sha }}
 
       - name: Clean up old releases
diff --git a/.github/workflows/ax3600.yaml b/.github/workflows/ax3600.yaml
index d08f892126..84d7222216 100644
--- a/.github/workflows/ax3600.yaml
+++ b/.github/workflows/ax3600.yaml
@@ -54,6 +54,10 @@ jobs:
           cat custom_repo/${{ env.NSS_CONFIG }} >> .config
           make defconfig
 
+      - name: Remove packages that are marked as modules
+        run: |
+          grep "=m" .config | grep -v 'CONFIG_PACKAGE_libustream-mbedtls=m' | while read -r line; do module=$(echo "$line" | cut -f1 -d'='); sed -i "s/^$line$/# $module is not set/" .config; done
+
       - name: Download dependencies
         run: make -j $(nproc) download
 
@@ -82,6 +86,9 @@ jobs:
       - name: Extract artifacts
         run: tar xf ax_3600-images.tar
 
+      - name: Get version
+        run: echo "VERSION_INFO=$(cat version.buildinfo)" >> $GITHUB_ENV
+
       - name: Get current date
         run: echo "RELEASE_DATE=$(date +%F)" >> $GITHUB_ENV
 
@@ -89,10 +96,10 @@ jobs:
         uses: softprops/action-gh-release@master
         with:
           files: bin/targets/qualcommax/ipq807x/*
-          tag_name: ${{ env.RELEASE_PREFIX }}-${{ env.RELEASE_DATE }}
-          name: Openwrt AX3600-NSS ${{ env.RELEASE_DATE }}
+          tag_name: ${{ env.RELEASE_PREFIX }}-${{ env.RELEASE_DATE }}-${{ env.VERSION_INFO }}
+          name: OpenWRT AX3600-NSS ${{ env.RELEASE_DATE }}-${{ env.VERSION_INFO }}
           body: |
-            Updated prebuilt images for ${{ env.RELEASE_DATE }}
+            Updated prebuilt images for ${{ env.RELEASE_DATE }} based on ${{ env.VERSION_INFO }}
             Build Commit: ${{ needs.check_commits.outputs.latest_commit_sha }}
 
       - name: Clean up old releases
diff --git a/.github/workflows/bpi-r4.yaml b/.github/workflows/bpi-r4.yaml
index 19ea742e82..ce935d527e 100644
--- a/.github/workflows/bpi-r4.yaml
+++ b/.github/workflows/bpi-r4.yaml
@@ -48,7 +48,7 @@ jobs:
           ./scripts/feeds update -a
           ./scripts/feeds install -a
 
-      - name: Apply kmod-thermal
+      - name: Apply kmod-thermal and build mt7925 firmware
         run: |
           cd target/linux/mediatek/patches-6.6
           curl -LO https://raw.githubusercontent.com/danpawlik/openwrt-builder/master/patches/0001-Add-kmod-thermal-for-BPI-R4.patch
@@ -62,6 +62,10 @@ jobs:
           cat custom_repo/${{ env.ROLE_CONFIG }} >> .config
           make defconfig
 
+      - name: Remove packages that are marked as modules
+        run: |
+          grep "=m" .config | grep -v 'CONFIG_PACKAGE_libustream-mbedtls=m' | while read -r line; do module=$(echo "$line" | cut -f1 -d'='); sed -i "s/^$line$/# $module is not set/" .config; done
+
 #      - name: Include custom files
 #        run: |
 #          mkdir -p ${{ env.CUSTOM_FILES_PATH }}
@@ -95,6 +99,9 @@ jobs:
       - name: Extract artifacts
         run: tar xf bpi_r4-images.tar
 
+      - name: Get version
+        run: echo "VERSION_INFO=$(cat version.buildinfo)" >> $GITHUB_ENV
+
       - name: Get current date
         run: echo "RELEASE_DATE=$(date +%F)" >> $GITHUB_ENV
 
@@ -102,10 +109,10 @@ jobs:
         uses: softprops/action-gh-release@master
         with:
           files: bin/targets/mediatek/filogic/*
-          tag_name: ${{ env.RELEASE_PREFIX }}-${{ env.RELEASE_DATE }}
-          name: Openwrt BPI-r4 ${{ env.RELEASE_DATE }}
+          tag_name: ${{ env.RELEASE_PREFIX }}-${{ env.RELEASE_DATE }}-${{ env.VERSION_INFO }}
+          name: OpenWRT BPI-r4 ${{ env.RELEASE_DATE }}-${{ env.VERSION_INFO }}
           body: |
-            Updated prebuilt images for ${{ env.RELEASE_DATE }}
+            Updated prebuilt images for ${{ env.RELEASE_DATE }} based on ${{ env.VERSION_INFO }}
             Build Commit: ${{ needs.check_commits.outputs.latest_commit_sha }}
 
       - name: Clean up old releases