diff --git a/meta-digi-arm/recipes-bsp/imx-bootlets-del/imx-bootlets-del_git.bb b/meta-digi-arm/recipes-bsp/imx-bootlets-del/imx-bootlets-del_git.bb
index 80c1366ca..e739d0aad 100644
--- a/meta-digi-arm/recipes-bsp/imx-bootlets-del/imx-bootlets-del_git.bb
+++ b/meta-digi-arm/recipes-bsp/imx-bootlets-del/imx-bootlets-del_git.bb
@@ -7,16 +7,13 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425
 
 PR = "${DISTRO}.r0"
 
-# Uncomment to build from internal GIT repository
-# IMX_BOOTLETS_USE_INTERNAL_REPO ?= "1"
-
 SRCREV_external = "9ffdf8cc253ba8d46fc4d8286ea054fa4c28c9af"
 SRCREV_internal = "cc3b1eb94dda62aa737f2289b7a2d3936492a53b"
-SRCREV = "${@base_conditional('IMX_BOOTLETS_USE_INTERNAL_REPO', '1' , '${SRCREV_internal}', '${SRCREV_external}', d)}"
+SRCREV = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCREV_internal}', '${SRCREV_external}', d)}"
 
 SRC_URI_external = "git://github.com/dgii/imx-bootlets.git;protocol=git"
 SRC_URI_internal = "${DIGI_MTK_GIT}del/imx-bootlets.git;protocol=git"
-SRC_URI = "${@base_conditional('IMX_BOOTLETS_USE_INTERNAL_REPO', '1' , '${SRC_URI_internal}', '${SRC_URI_external}', d)}"
+SRC_URI = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRC_URI_internal}', '${SRC_URI_external}', d)}"
 
 S = "${WORKDIR}/git"
 
diff --git a/meta-digi-arm/recipes-bsp/nvram/nvram.bb b/meta-digi-arm/recipes-bsp/nvram/nvram.bb
index a137c6d9a..27539e7b1 100644
--- a/meta-digi-arm/recipes-bsp/nvram/nvram.bb
+++ b/meta-digi-arm/recipes-bsp/nvram/nvram.bb
@@ -9,16 +9,13 @@ PR = "${DISTRO}.r0"
 
 DEPENDS = "libdigi"
 
-# Uncomment to build the from sources (internal use only)
-# UBOOT_USE_INTERNAL_REPO ?= "1"
-
 SRCREV_external = "107e05c6fff8ccae6d5eeb6a39d7efd57694e544"
 SRCREV_internal = "4af0b5f73215c6f075e17f866d831a948d777a2a"
-SRCREV = "${@base_conditional('UBOOT_USE_INTERNAL_REPO', '1' , '${SRCREV_internal}', '${SRCREV_external}', d)}"
+SRCREV = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCREV_internal}', '${SRCREV_external}', d)}"
 
 SRC_URI_external = "git://github.com/dgii/yocto-uboot.git;protocol=git"
 SRC_URI_internal = "${DIGI_LOG_GIT}u-boot-denx.git;protocol=git"
-SRC_URI = "${@base_conditional('UBOOT_USE_INTERNAL_REPO', '1' , '${SRC_URI_internal}', '${SRC_URI_external}', d)}"
+SRC_URI = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRC_URI_internal}', '${SRC_URI_external}', d)}"
 SRC_URI += " \
     file://main.c \
     file://nvram_priv_linux.c \
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-del_2009.08.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-del_2009.08.bb
index 1f3557a2a..943759ed9 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-del_2009.08.bb
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-del_2009.08.bb
@@ -10,16 +10,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4c6cde5df68eff615d36789dc18edd3b"
 
 PR = "r0"
 
-# Uncomment to build the from sources (internal use only)
-# UBOOT_USE_INTERNAL_REPO ?= "1"
-
 SRCREV_external = "107e05c6fff8ccae6d5eeb6a39d7efd57694e544"
 SRCREV_internal = "4af0b5f73215c6f075e17f866d831a948d777a2a"
-SRCREV = "${@base_conditional('UBOOT_USE_INTERNAL_REPO', '1' , '${SRCREV_internal}', '${SRCREV_external}', d)}"
+SRCREV = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCREV_internal}', '${SRCREV_external}', d)}"
 
 SRC_URI_external = "git://github.com/dgii/yocto-uboot.git;protocol=git"
 SRC_URI_internal = "${DIGI_LOG_GIT}u-boot-denx.git;protocol=git"
-SRC_URI = "${@base_conditional('UBOOT_USE_INTERNAL_REPO', '1' , '${SRC_URI_internal}', '${SRC_URI_external}', d)}"
+SRC_URI = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRC_URI_internal}', '${SRC_URI_external}', d)}"
 
 S = "${WORKDIR}/git"
 
diff --git a/meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros.bb b/meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros.bb
index 0d677c053..96c73f33b 100644
--- a/meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros.bb
+++ b/meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros.bb
@@ -8,16 +8,13 @@ inherit module
 
 PR = "r0"
 
-# Uncomment to build the driver from internal GIT repository
-# ATHEROS_USE_INTERNAL_REPO ?= "1"
-
 SRCREV_external = "9b21b4508d08a2fb3bf3c55aaac182bb9c1210f2"
 SRCREV_internal = "15bae2c4e330ea6d9289217d3c38ebf63aa8ff15"
-SRCREV = "${@base_conditional('ATHEROS_USE_INTERNAL_REPO', '1' , '${SRCREV_internal}', '${SRCREV_external}', d)}"
+SRCREV = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCREV_internal}', '${SRCREV_external}', d)}"
 
 SRC_URI_external = "git://github.com/dgii/atheros.git;protocol=git"
 SRC_URI_internal = "${DIGI_LOG_GIT}linux-modules/atheros.git;protocol=git"
-SRC_URI = "${@base_conditional('ATHEROS_USE_INTERNAL_REPO', '1' , '${SRC_URI_internal}', '${SRC_URI_external}', d)}"
+SRC_URI = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRC_URI_internal}', '${SRC_URI_external}', d)}"
 SRC_URI += " \
 	file://atheros \
 	file://atheros.conf \
diff --git a/meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14.bb b/meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14.bb
index c097d8737..402e70b7c 100644
--- a/meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14.bb
+++ b/meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14.bb
@@ -4,12 +4,9 @@ include linux-del.inc
 
 PR = "${DISTRO}.${INC_PR}.0"
 
-# Uncomment to build from internal GIT repository
-# KERNEL_USE_INTERNAL_REPO ?= "1"
-
 SRCREV_external = "c3f3fa8f819f83e77fc0e0c339f12a6fe2a52fef"
 SRCREV_internal = "d615e9350f4d14e8a0177ff4a3da8639046657eb"
-SRCREV = "${@base_conditional('KERNEL_USE_INTERNAL_REPO', '1' , '${SRCREV_internal}', '${SRCREV_external}', d)}"
+SRCREV = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCREV_internal}', '${SRCREV_external}', d)}"
 
 LOCALVERSION_mx5 = "mx5"
 LOCALVERSION_mxs = "mxs"
@@ -17,7 +14,7 @@ LOCALVERSION_cpx2_mxs = "mxs+gateways"
 
 SRC_URI_external = "git://github.com/dgii/yocto-linux.git;protocol=git"
 SRC_URI_internal = "${DIGI_LOG_GIT}linux-2.6.git;protocol=git"
-SRC_URI = "${@base_conditional('KERNEL_USE_INTERNAL_REPO', '1' , '${SRC_URI_internal}', '${SRC_URI_external}', d)}"
+SRC_URI = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRC_URI_internal}', '${SRC_URI_external}', d)}"
 SRC_URI += " \
     file://defconfig \
     ${KERNEL_CFG_FRAGS} \
diff --git a/sdk/build.sh b/sdk/build.sh
index ffffc72f5..e6fddde43 100755
--- a/sdk/build.sh
+++ b/sdk/build.sh
@@ -138,9 +138,12 @@ for platform in ${DY_PLATFORMS}; do
 				sed -i  -e "/^#DL_DIR ?=/cDL_DIR ?= \"${YOCTO_PROJ_DIR}/downloads\"" \
 					-e "/^#SSTATE_DIR ?=/cSSTATE_DIR ?= \"${YOCTO_PROJ_DIR}/sstate-cache\"" \
 					conf/local.conf
-				# Set the specified distro if different from del.
+				# Set the specified distro if different from del
 				[ "${DY_DISTRO}" != "del" ] && sed -i -e "/^DISTRO ?=/cDISTRO ?= \"${DY_DISTRO}\"" conf/local.conf
-				[ "${DY_USE_MIRROR}" = "true" ] && printf "${DIGI_PREMIRROR_CFG}" >> conf/local.conf
+				if [ "${DY_USE_MIRROR}" = "true" ]; then
+					sed -i -e "s,^#DIGI_INTERNAL_GIT,DIGI_INTERNAL_GIT,g" conf/local.conf
+					printf "${DIGI_PREMIRROR_CFG}" >> conf/local.conf
+				fi
 				[ "${DY_BUILD_VARIANTS}" = "true" ] && printf "\nINHERIT += \"rm_work\"\n" >> conf/local.conf
 				time bitbake ${DY_TARGET}
 			)
diff --git a/sdk/config/ccardimx28js/local.conf.sample b/sdk/config/ccardimx28js/local.conf.sample
index 2593887ea..b8b307b83 100644
--- a/sdk/config/ccardimx28js/local.conf.sample
+++ b/sdk/config/ccardimx28js/local.conf.sample
@@ -53,6 +53,11 @@
 MACHINE = "ccardimx28js"
 MACHINE_VARIANT = "wb"
 
+#
+# Use Digi's internal git repositories
+#
+#DIGI_INTERNAL_GIT ?= "1"
+
 #
 # Where to place downloads
 #
diff --git a/sdk/config/ccimx51js/local.conf.sample b/sdk/config/ccimx51js/local.conf.sample
index 8cb55a65d..832ca5097 100644
--- a/sdk/config/ccimx51js/local.conf.sample
+++ b/sdk/config/ccimx51js/local.conf.sample
@@ -53,6 +53,11 @@
 MACHINE = "ccimx51js"
 MACHINE_VARIANT = "wagv"
 
+#
+# Use Digi's internal git repositories
+#
+#DIGI_INTERNAL_GIT ?= "1"
+
 #
 # Where to place downloads
 #
diff --git a/sdk/config/ccimx53js/local.conf.sample b/sdk/config/ccimx53js/local.conf.sample
index cfa434618..e071f55ef 100644
--- a/sdk/config/ccimx53js/local.conf.sample
+++ b/sdk/config/ccimx53js/local.conf.sample
@@ -53,6 +53,11 @@
 MACHINE = "ccimx53js"
 MACHINE_VARIANT = "w"
 
+#
+# Use Digi's internal git repositories
+#
+#DIGI_INTERNAL_GIT ?= "1"
+
 #
 # Where to place downloads
 #
diff --git a/sdk/config/cpx2/local.conf.sample b/sdk/config/cpx2/local.conf.sample
index 95b29d4e2..ecad8dfe5 100644
--- a/sdk/config/cpx2/local.conf.sample
+++ b/sdk/config/cpx2/local.conf.sample
@@ -53,6 +53,11 @@
 MACHINE = "cpx2"
 MACHINE_VARIANT = ""
 
+#
+# Use Digi's internal git repositories
+#
+#DIGI_INTERNAL_GIT ?= "1"
+
 #
 # Where to place downloads
 #
diff --git a/sdk/config/wr21/local.conf.sample b/sdk/config/wr21/local.conf.sample
index 9962f3f89..9fe27a66a 100644
--- a/sdk/config/wr21/local.conf.sample
+++ b/sdk/config/wr21/local.conf.sample
@@ -53,6 +53,11 @@
 MACHINE = "wr21"
 MACHINE_VARIANT = ""
 
+#
+# Use Digi's internal git repositories
+#
+#DIGI_INTERNAL_GIT ?= "1"
+
 #
 # Where to place downloads
 #
diff --git a/sdk/mkproject.sh b/sdk/mkproject.sh
index 416dc46b7..bfc057d42 100755
--- a/sdk/mkproject.sh
+++ b/sdk/mkproject.sh
@@ -73,7 +73,7 @@ do_mkproject() {
 	if [ -z "${MKP_OLD_PROJECT}" ]; then
 		NCPU="$(grep -c processor /proc/cpuinfo)"
 		chmod 644 ${MKP_PROJECTPATH}/conf/bblayers.conf ${MKP_PROJECTPATH}/conf/local.conf
-		sed -i  -e"s,##DIGIBASE##,${MKP_SCRIPTPATH}/sources,g" ${MKP_PROJECTPATH}/conf/bblayers.conf
+		sed -i  -e "s,##DIGIBASE##,${MKP_SCRIPTPATH}/sources,g" ${MKP_PROJECTPATH}/conf/bblayers.conf
 		sed -i  -e "/^#BB_NUMBER_THREADS =/cBB_NUMBER_THREADS = \"${NCPU}\"" \
 			-e "/^#PARALLEL_MAKE =/cPARALLEL_MAKE = \"-j ${NCPU}\"" \
 			${MKP_PROJECTPATH}/conf/local.conf