diff --git a/.github/workflows/bpi-r4-BE14-janusz.yaml b/.github/workflows/bpi-r4-BE14-community.yaml
similarity index 96%
rename from .github/workflows/bpi-r4-BE14-janusz.yaml
rename to .github/workflows/bpi-r4-BE14-community.yaml
index a702aa4..2191b22 100644
--- a/.github/workflows/bpi-r4-BE14-janusz.yaml
+++ b/.github/workflows/bpi-r4-BE14-community.yaml
@@ -1,5 +1,4 @@
 ---
-# Janusz fix: https://github.com/openwrt/openwrt/pull/16342
 # Luci fix: https://github.com/openwrt/luci/pull/7279
 name: BPI-R4 + BE14 + EHT fix by Janusz + luci BE
 
@@ -8,10 +7,8 @@ on:
 
 env:
   REMOTE_REPOSITORY: danpawlik/openwrt
-  REMOTE_BRANCH: be14-janusz-v12-luci
+  REMOTE_BRANCH: v14-luci-eht-rmadrad
   RELEASE_PREFIX: Mediatek_mt7988a_bpi-r4_be14_eht
-  DEVICE_CONFIG: configs/mediatek/mt7988a/bpi-r4
-  ROLE_CONFIG: configs/common/main-router
 
 jobs:
   check_commits:
diff --git a/.github/workflows/bpi-r4-BE14.yaml b/.github/workflows/bpi-r4-BE14.yaml
index 46359f5..d164960 100644
--- a/.github/workflows/bpi-r4-BE14.yaml
+++ b/.github/workflows/bpi-r4-BE14.yaml
@@ -1,5 +1,4 @@
 ---
-# Based on https://github.com/JuliusBairaktaris/Qualcommax_NSS_Builder/blob/main/.github/workflows/build.yaml
 name: BPI-R4 + all packages + BE14 + luci BE
 
 on:
@@ -7,11 +6,8 @@ on:
 
 env:
   REMOTE_REPOSITORY: danpawlik/openwrt
-  # REMOTE_BRANCH: be14
-  REMOTE_BRANCH: be14-janusz-v12-luci
+  REMOTE_BRANCH: v14-luci-eht-rmadrad
   RELEASE_PREFIX: Mediatek_mt7988a_bpi-r4_be14_all_packages_eht
-  DEVICE_CONFIG: configs/mediatek/mt7988a/bpi-r4
-  ROLE_CONFIG: configs/common/main-router
 
 jobs:
   check_commits: