diff --git a/iopsys-brcm63xx-arm/Config.in b/iopsys-brcm63xx-arm/Config.in
index 10b37c5ab353747d64f0624b6d7997435588c0b2..c3e26ed1469b11ed6aef4c3a36663b1a5c7ae090 100644
--- a/iopsys-brcm63xx-arm/Config.in
+++ b/iopsys-brcm63xx-arm/Config.in
@@ -16,14 +16,14 @@ menu "Target options Brcm63xx (ARM)"
 
     menuconfig KERNEL_GIT_CLONE_URI
         string "Kernel clone URL"
-        default "https://dev.iopsys.eu/broadcom/bcmlinux.git" if BRCM_SDK_VER_502002 || BRCM_SDK_VER_502003 || BRCM_SDK_VER_502006 || BRCM_SDK_VER_502007 || BRCM_SDK_VER_504001
-        default "git@dev.iopsys.eu:broadcom/bcmkernel" if BRCM_SDK_VER_416050
+        default "https://dev.iopsys.eu/broadcom/bcmlinux.git" if BRCM_SDK_VER_504001
 
 
+	# BUG: this is the branch in the kernel used for openwrt part of the build. It should also be updated for the new sdk.
     config KERNEL_GIT_BRANCH
         string
-        default "bcm_5.02L.02" if BRCM_SDK_VER_502002 || BRCM_SDK_VER_502003 || BRCM_SDK_VER_502006 || BRCM_SDK_VER_502007 || BRCM_SDK_VER_504001
-        default "4.16L.05" if BRCM_SDK_VER_416050
+        default "bcm_5.02L.02" if BRCM_SDK_VER_504001
+
 
 
     # brcm has it's own brctl
@@ -35,10 +35,8 @@ menu "Target options Brcm63xx (ARM)"
         string
         prompt "Broadcom kernel profile"
 
-	default "963138GWV" if TARGET_iopsys_brcm63xx_arm_brcm_ref138_p502  && !BRCM_SDK_VER_504001
-	default "963138GW" if TARGET_iopsys_brcm63xx_arm_brcm_ref138_p502 && BRCM_SDK_VER_504001
-	default "963138GWV" if TARGET_iopsys_brcm63xx_arm_dg400 && !BRCM_SDK_VER_504001
-	default "963138GW"  if TARGET_iopsys_brcm63xx_arm_dg400	&& BRCM_SDK_VER_504001
+	default "963138GW" if TARGET_iopsys_brcm63xx_arm_brcm_ref138_p502
+	default "963138GW"  if TARGET_iopsys_brcm63xx_arm_dg400
 	default "963138GWV" if TARGET_iopsys_brcm63xx_arm_f104w
         default "963138GWV" if TARGET_iopsys_brcm63xx_arm_eg400
 	default "963138GWV" if TARGET_iopsys_brcm63xx_arm_dg400prime
@@ -71,8 +69,7 @@ menu "Target options Brcm63xx (ARM)"
 
     menuconfig BCM_TOOLTUPLE
         string "Broadcom toolchain tuple"
-        default "arm-buildroot-linux-gnueabi-" if TARGET_iopsys_brcm63xx_arm && (BRCM_SDK_VER_502003 || BRCM_SDK_VER_502006 || BRCM_SDK_VER_502007 || BRCM_SDK_VER_504001)
-        default "arm-buildroot-linux-uclibcgnueabi-" if TARGET_iopsys_brcm63xx_arm && BRCM_SDK_VER_502002
+        default "arm-buildroot-linux-gnueabi-" if TARGET_iopsys_brcm63xx_arm && (BRCM_SDK_VER_504001)
 
 
     menuconfig TARGET_FAMILY