diff --git a/meta-digi-arm/conf/layer.conf b/meta-digi-arm/conf/layer.conf
index 616c9cf64..4e3cc9837 100644
--- a/meta-digi-arm/conf/layer.conf
+++ b/meta-digi-arm/conf/layer.conf
@@ -18,4 +18,4 @@ DIGI_MTK_GIT ?= "git://stash.digi.com/"
 DIGI_GIT	 ?= "${DIGI_LOG_GIT}"
 DIGI_PKG_SRC ?= "ftp://ftp1.digi.com/support/digiembeddedyocto/source"
 
-DIGI_GITHUB_GIT ?= "git://github.com/digidotcom"
+DIGI_GITHUB_GIT ?= "git://github.com/digi-embedded"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc
index ad456faf9..709bbd97a 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc
@@ -1,14 +1,11 @@
 # Copyright (C) 2013 Digi International
 
-# Internal repo branch
 SRCBRANCH = "v2013.01/dub-2.0/maint"
+SRCREV = "${AUTOREV}"
 
-SRCREV_external = ""
-SRCREV_internal = "${AUTOREV}"
-SRCREV = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCREV_internal}', '${SRCREV_external}', d)}"
+# Select internal or Github U-Boot repo
+UBOOT_GIT_URI = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git', d)}"
 
-SRC_URI_external = "${DIGI_GITHUB_GIT}/yocto-uboot.git;protocol=git;nobranch=1"
-SRC_URI_internal = "${DIGI_GIT}u-boot-denx.git;protocol=git;branch=${SRCBRANCH}"
-SRC_URI = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRC_URI_internal}', '${SRC_URI_external}', d)}"
+SRC_URI = "${UBOOT_GIT_URI};branch=${SRCBRANCH}"
 
 UBOOT_NVRAM_LIBPATH = "git/board/digi/common/cmd_nvram/lib"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb
index 80b5c6110..b00acc421 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb
@@ -10,17 +10,14 @@ DEPENDS += "dtc-native u-boot-mkimage-native"
 
 PROVIDES += "u-boot"
 
-# Internal repo branch
 SRCBRANCH = "v2015.04/master"
+SRCREV = "${AUTOREV}"
 
-SRCREV_external = ""
-SRCREV_internal = "${AUTOREV}"
-SRCREV = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCREV_internal}', '${SRCREV_external}', d)}"
+# Select internal or Github U-Boot repo
+UBOOT_GIT_URI = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git', d)}"
 
-SRC_URI_external = "${DIGI_GITHUB_GIT}/yocto-uboot.git;protocol=git;nobranch=1"
-SRC_URI_internal = "${DIGI_GIT}u-boot-denx.git;protocol=git;branch=${SRCBRANCH}"
 SRC_URI = " \
-    ${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRC_URI_internal}', '${SRC_URI_external}', d)} \
+    ${UBOOT_GIT_URI};branch=${SRCBRANCH} \
     file://boot.txt \
 "
 
diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc
index 1b9808182..f663f0d8e 100644
--- a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc
+++ b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc
@@ -10,10 +10,11 @@ inherit kernel fsl-kernel-localversion
 
 LOCALVERSION = "-dey"
 
-SRC_URI_external = "${DIGI_GITHUB_GIT}/yocto-linux.git;protocol=git;nobranch=1"
-SRC_URI_internal = "${DIGI_GIT}linux-2.6.git;protocol=git;branch=${SRCBRANCH}"
+# Select internal or Github Linux repo
+LINUX_GIT_URI = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}linux-2.6.git', '${DIGI_GITHUB_GIT}/linux.git', d)}"
+
 SRC_URI = " \
-    ${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRC_URI_internal}', '${SRC_URI_external}', d)} \
+    ${LINUX_GIT_URI};branch=${SRCBRANCH} \
     file://defconfig \
 "
 
diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb
index c1822eb12..bc82533ed 100644
--- a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb
+++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb
@@ -3,12 +3,8 @@
 require recipes-kernel/linux/linux-dey.inc
 require recipes-kernel/linux/linux-dtb.inc
 
-# Internal repo branch
 SRCBRANCH = "v3.10/dey-1.4/maint"
-
-SRCREV_external = ""
-SRCREV_internal = "${AUTOREV}"
-SRCREV = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCREV_internal}', '${SRCREV_external}', d)}"
+SRCREV = "${AUTOREV}"
 
 config_dts() {
 	for DTB in ${KERNEL_DEVICETREE}; do
diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb
index 7c4bd0513..023241b1b 100644
--- a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb
+++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb
@@ -5,11 +5,7 @@ require recipes-kernel/linux/linux-dtb.inc
 
 inherit fsl-vivante-kernel-driver-handler
 
-# Internal repo branch
 SRCBRANCH = "v3.14/dey-2.0/maint"
-
-SRCREV_external = ""
-SRCREV_internal = "${AUTOREV}"
-SRCREV = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCREV_internal}', '${SRCREV_external}', d)}"
+SRCREV = "${AUTOREV}"
 
 COMPATIBLE_MACHINE = "(ccimx6)"