diff --git a/iopsys-brcm63xx-arm/Config.in b/iopsys-brcm63xx-arm/Config.in
index cace515e6e0fa2baf3073c4ba30afd3fce17b53e..d51b65dfa637035d49e2389e6f2b32237a96dff9 100644
--- a/iopsys-brcm63xx-arm/Config.in
+++ b/iopsys-brcm63xx-arm/Config.in
@@ -2,10 +2,10 @@ menu "Target options Brcm63xx (ARM)"
 	depends on TARGET_iopsys_brcm63xx_arm
 
 	config KERNEL_GIT_CLONE_URI
-		default "https://dev.iopsys.eu/broadcom/bcmlinux.git" if BRCM_SDK_VER_504002
+		default "https://dev.iopsys.eu/broadcom/bcmlinux.git" if BRCM_SDK_VER_504021
 
 	config KERNEL_GIT_BRANCH
-		default "bcm_5.04L.02" if BRCM_SDK_VER_504002
+		default "bcm_5.04L.02" if BRCM_SDK_VER_504021 # TODO: for now use 5.04L.02 bcmlinux
 
 	# brcm has it's own brctl
 	config BUSYBOX_DEFAULT_BRCTL
diff --git a/iopsys-brcm63xx-arm/config/brcm_ref138_p502/config b/iopsys-brcm63xx-arm/config/brcm_ref138_p502/config
index 700998577037cd88eff139136b19007c992d58b6..02cf57abb4383ff9c1db0b4c7bd8281b8b1b8fd1 100644
--- a/iopsys-brcm63xx-arm/config/brcm_ref138_p502/config
+++ b/iopsys-brcm63xx-arm/config/brcm_ref138_p502/config
@@ -1,5 +1,5 @@
 CONFIG_TARGET_FAMILY="BRCM_REF138_P502"
-CONFIG_BCM_KERNEL_PROFILE="963138GWV"
+CONFIG_BCM_KERNEL_PROFILE="963138GW_WL20D1D1"
 CONFIG_BCM_CHIP_ID="63138"
 
 CONFIG_BCM_FIRMWARE_TYPE_EMMC_EXT4=y
diff --git a/iopsys-brcm63xx-arm/config/dg400prime/config b/iopsys-brcm63xx-arm/config/dg400prime/config
index 8c89ab052d286ef8809eb26d67d81cc2337b8a7e..a6972ad823957d3a5b43e208fbea94dfea226510 100644
--- a/iopsys-brcm63xx-arm/config/dg400prime/config
+++ b/iopsys-brcm63xx-arm/config/dg400prime/config
@@ -1,5 +1,5 @@
 CONFIG_TARGET_FAMILY="DG400PRIME"
-CONFIG_BCM_KERNEL_PROFILE="963138GWV"
+CONFIG_BCM_KERNEL_PROFILE="963138GW_WL20D1D1"
 CONFIG_BCM_CHIP_ID="63138"
 CONFIG_BCM_FIRMWARE_TYPE_NAND_SQUASHFS=y
 
diff --git a/iopsys-brcm63xx-arm/config/disc/config b/iopsys-brcm63xx-arm/config/disc/config
index 4bab0e5a49c6dd1d7f230dbc84dec2c2bd9f107e..7767c0c524640c9a64c32ae1eb4946fa35809e10 100644
--- a/iopsys-brcm63xx-arm/config/disc/config
+++ b/iopsys-brcm63xx-arm/config/disc/config
@@ -1,5 +1,5 @@
 CONFIG_TARGET_FAMILY="DISC"
-CONFIG_BCM_KERNEL_PROFILE="947622GW"
+CONFIG_BCM_KERNEL_PROFILE="947622GW_WL20D1D1"
 CONFIG_BCM_CHIP_ID="47622"
 
 # CONFIG_BCM_VOICE is not set
diff --git a/iopsys-brcm63xx-arm/config/eagle/config b/iopsys-brcm63xx-arm/config/eagle/config
index dc0fa29b530f7e5db142aa06c8b1b268b7cefeb6..9936644319b055c0c9d67dc4de28b98f939a3f96 100644
--- a/iopsys-brcm63xx-arm/config/eagle/config
+++ b/iopsys-brcm63xx-arm/config/eagle/config
@@ -1,5 +1,5 @@
 CONFIG_TARGET_FAMILY="EAGLE"
-CONFIG_BCM_KERNEL_PROFILE="96750GW"
+CONFIG_BCM_KERNEL_PROFILE="96750GW_WL20D1D1"
 CONFIG_BCM_CHIP_ID="63178"
 
 CONFIG_BCM_FIRMWARE_TYPE_NAND_SQUASHFS=y
diff --git a/iopsys-brcm63xx-arm/config/panda/config b/iopsys-brcm63xx-arm/config/panda/config
index bcdfd7f92cf2f4eb97e156cc26df3d13aba2c618..148b44b24b4125d6fc2917167dffe172c4c670c7 100644
--- a/iopsys-brcm63xx-arm/config/panda/config
+++ b/iopsys-brcm63xx-arm/config/panda/config
@@ -1,5 +1,5 @@
 CONFIG_TARGET_FAMILY="PANDA"
-CONFIG_BCM_KERNEL_PROFILE="96856GWOV"
+CONFIG_BCM_KERNEL_PROFILE="96856GWO_WL20D1D1"
 CONFIG_BCM_CHIP_ID="6856"
 
 CONFIG_BCM_FIRMWARE_TYPE_NAND_SQUASHFS=y
diff --git a/iopsys-brcm63xx-arm/config/smarthub3/config b/iopsys-brcm63xx-arm/config/smarthub3/config
index 43563335c7f75d80f32f555bfd8fd198d4bece06..49e306e0153c8929abdbb9c37c9f6887848d51dd 100644
--- a/iopsys-brcm63xx-arm/config/smarthub3/config
+++ b/iopsys-brcm63xx-arm/config/smarthub3/config
@@ -1,5 +1,5 @@
 CONFIG_TARGET_FAMILY="SMARTHUB3"
-CONFIG_BCM_KERNEL_PROFILE="963158GWV"
+CONFIG_BCM_KERNEL_PROFILE="963158GW_WL20D1D1"
 CONFIG_BCM_CHIP_ID="63158"
 
 CONFIG_BCM_FIRMWARE_TYPE_EMMC_SQUASHFS=y
diff --git a/iopsys-brcm63xx-arm/config/tiger/config b/iopsys-brcm63xx-arm/config/tiger/config
index fc557f5da57bb43af84b4dcf8e25a67a6df44d8e..25ff185c77cb624c2c0c466c95cc156198bdc8f4 100644
--- a/iopsys-brcm63xx-arm/config/tiger/config
+++ b/iopsys-brcm63xx-arm/config/tiger/config
@@ -1,5 +1,5 @@
 CONFIG_TARGET_FAMILY="TIGER"
-CONFIG_BCM_KERNEL_PROFILE="96858GWO"
+CONFIG_BCM_KERNEL_PROFILE="96858GWO_WL20D1D1"
 CONFIG_BCM_CHIP_ID="6858"
 CONFIG_BCM_FIRMWARE_TYPE_NAND_SQUASHFS=y
 
diff --git a/iopsys-brcm63xx-arm/config/xug534/config b/iopsys-brcm63xx-arm/config/xug534/config
index 380908f2679e8f17c47a3bab0a81f5c7adda8015..e5b26f55ce39359d954dcc358f02a07159eb6934 100644
--- a/iopsys-brcm63xx-arm/config/xug534/config
+++ b/iopsys-brcm63xx-arm/config/xug534/config
@@ -1,5 +1,5 @@
 CONFIG_TARGET_FAMILY="XUG534"
-CONFIG_BCM_KERNEL_PROFILE="96856GWO"
+CONFIG_BCM_KERNEL_PROFILE="96856GWO_WL20D1D1"
 CONFIG_BCM_CHIP_ID="6856"
 CONFIG_BCM_FIRMWARE_TYPE_NAND_SQUASHFS=y
 
diff --git a/iopsys-brcm63xx-arm/config/zebra/config b/iopsys-brcm63xx-arm/config/zebra/config
index 6222e6c221aaf5b641e70f3b58ad85eac6d76ddd..c9b36552b707af082b8e7b23ff414a2d2ffb21d5 100644
--- a/iopsys-brcm63xx-arm/config/zebra/config
+++ b/iopsys-brcm63xx-arm/config/zebra/config
@@ -1,5 +1,5 @@
 CONFIG_TARGET_FAMILY="ZEBRA"
-CONFIG_BCM_KERNEL_PROFILE="96750GWV"
+CONFIG_BCM_KERNEL_PROFILE="96750GW_WL20D1D1"
 CONFIG_BCM_CHIP_ID="63178"
 
 CONFIG_BCM_FIRMWARE_TYPE_NAND_SQUASHFS=y