diff --git a/.github/workflows/ax3200.yaml b/.github/workflows/ax3200.yaml
index 0c501da..657cef5 100644
--- a/.github/workflows/ax3200.yaml
+++ b/.github/workflows/ax3200.yaml
@@ -61,6 +61,8 @@ jobs:
           curl -SL https://raw.githubusercontent.com/danpawlik/openwrt-builder/master/configs/mediatek/mt7622/ax3200 > .config
           curl -SL https://raw.githubusercontent.com/danpawlik/openwrt-builder/master/configs/common/dumb_ap >> .config
           curl -SL https://raw.githubusercontent.com/danpawlik/openwrt-builder/master/configs/common/snapshot-short >> .config
+          sed -i '/CONFIG_PACKAGE_wpad-mbedtls=y/d' .config
+          curl -SL https://raw.githubusercontent.com/danpawlik/openwrt-builder/master/configs/common/openssl >> .config
           make defconfig
 
       - name: Remove packages that are marked as modules
diff --git a/.github/workflows/bpi-r4-BE14-janusz.yaml b/.github/workflows/bpi-r4-BE14-janusz.yaml
index 85e627c..5a87715 100644
--- a/.github/workflows/bpi-r4-BE14-janusz.yaml
+++ b/.github/workflows/bpi-r4-BE14-janusz.yaml
@@ -9,7 +9,7 @@ on:
 
 env:
   REMOTE_REPOSITORY: danpawlik/openwrt
-  REMOTE_BRANCH: be14-and-hostapd-janusz-v4
+  REMOTE_BRANCH: be14-and-hostapd-janusz-v5
   RELEASE_PREFIX: Mediatek_mt7988a_bpi-r4_be14_luci_eht
   DEVICE_CONFIG: configs/mediatek/mt7988a/bpi-r4
   ROLE_CONFIG: configs/common/main-router
diff --git a/.github/workflows/bpi-r4-BE14.yaml b/.github/workflows/bpi-r4-BE14.yaml
index 7a5c7fb..141d264 100644
--- a/.github/workflows/bpi-r4-BE14.yaml
+++ b/.github/workflows/bpi-r4-BE14.yaml
@@ -8,7 +8,7 @@ on:
 env:
   REMOTE_REPOSITORY: danpawlik/openwrt
   # REMOTE_BRANCH: be14
-  REMOTE_BRANCH: be14-and-hostapd-janusz-v4
+  REMOTE_BRANCH: be14-and-hostapd-janusz-v5
   RELEASE_PREFIX: Mediatek_mt7988a_bpi-r4_be14_all_packages_eht
   DEVICE_CONFIG: configs/mediatek/mt7988a/bpi-r4
   ROLE_CONFIG: configs/common/main-router