diff --git a/.github/workflows/bpi-r4-BE14-community.yaml b/.github/workflows/bpi-r4-BE14-community.yaml
index c7e9281724..7f9a081a3f 100644
--- a/.github/workflows/bpi-r4-BE14-community.yaml
+++ b/.github/workflows/bpi-r4-BE14-community.yaml
@@ -24,7 +24,8 @@ on:
 
 env:
   REMOTE_REPOSITORY: danpawlik/openwrt
-  REMOTE_BRANCH: v15-luci-eht${{ inputs.RMADRAD_VERSION == 'true' && '-rmadrad' || '' }}
+  #REMOTE_BRANCH: v15-luci-eht${{ inputs.RMADRAD_VERSION == 'true' && '-rmadrad' || '' }}
+  REMOTE_BRANCH: main
   RELEASE_PREFIX: Mediatek_mt7988a_bpi-r4_be14_eht${{ inputs.RMADRAD_VERSION == 'true' && '-rmadrad' || '-stock' }}
   DEVICE_CONFIG: ${{ inputs.DEVICE_CONFIG == 'poe' && 'configs/mediatek/mt7988a/bpi-r4-poe' || 'configs/mediatek/mt7988a/bpi-r4' }}
   ROLE_CONFIG: configs/common/community
diff --git a/.github/workflows/bpi-r4-BE14.yaml b/.github/workflows/bpi-r4-BE14.yaml
index 3ebb796379..15a3cc2c75 100644
--- a/.github/workflows/bpi-r4-BE14.yaml
+++ b/.github/workflows/bpi-r4-BE14.yaml
@@ -6,7 +6,7 @@ on:
 
 env:
   REMOTE_REPOSITORY: danpawlik/openwrt
-  REMOTE_BRANCH: v15-luci-eht
+  REMOTE_BRANCH: main
   RELEASE_PREFIX: Mediatek_mt7988a_bpi-r4_be14_all_packages_eht
 
 jobs:
diff --git a/.github/workflows/bpi-r4.yaml b/.github/workflows/bpi-r4.yaml
index 017ca59347..beed900044 100644
--- a/.github/workflows/bpi-r4.yaml
+++ b/.github/workflows/bpi-r4.yaml
@@ -71,10 +71,10 @@ jobs:
           curl -SL https://raw.githubusercontent.com/danpawlik/openwrt-builder/master/configs/common/main-router >> .config
           curl -SL https://raw.githubusercontent.com/danpawlik/openwrt-builder/master/configs/common/snapshot-short >> .config
 
-#      - name: Enable openssl
-#        run:
-#          sed -i '/CONFIG_PACKAGE_wpad-mbedtls=y/d' .config
-#          curl -SL https://raw.githubusercontent.com/danpawlik/openwrt-builder/master/configs/common/openssl >> .config
+      - name: Enable openssl
+        run:
+          sed -i '/CONFIG_PACKAGE_wpad-mbedtls=y/d' .config
+          curl -SL https://raw.githubusercontent.com/danpawlik/openwrt-builder/master/configs/common/openssl >> .config
 
       - name: Run defconfig
         run: