diff --git a/meta-digi-arm/conf/layer.conf b/meta-digi-arm/conf/layer.conf
index b1a44b08a..18f1aa174 100644
--- a/meta-digi-arm/conf/layer.conf
+++ b/meta-digi-arm/conf/layer.conf
@@ -42,9 +42,6 @@ DIGI_OPEN_EULA_FILE = "${LAYERDIR}/DIGI_OPEN_EULA"
 # Additional license directories
 LICENSE_PATH += "${LAYERDIR}/custom-licenses"
 
-DIGI_LOG_GIT ?= "git://log-sln-git.digi.com"
 DIGI_MTK_GIT ?= "git://stash.digi.com"
-DIGI_GIT	 ?= "${DIGI_LOG_GIT}"
 DIGI_PKG_SRC ?= "https://ftp1.digi.com/support/digiembeddedyocto/source"
-
 DIGI_GITHUB_GIT ?= "git://github.com/digi-embedded"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc
index fedfee68c..b44d81226 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc
+++ b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc
@@ -15,18 +15,12 @@ PROVIDES += "u-boot"
 S = "${WORKDIR}/git"
 
 # Select internal or Github U-Boot repo
-DIGI_LOG_REPO = "u-boot-denx.git"
-DIGI_MTK_REPO = "uboot/u-boot-denx.git"
-GITHUB_REPO = "u-boot.git"
-UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , \
-					oe.utils.conditional('DIGI_GIT', '${DIGI_LOG_GIT}', '${DIGI_GIT}/${DIGI_LOG_REPO}', '${DIGI_GIT}/${DIGI_MTK_REPO};protocol=ssh', d), \
-					'${DIGI_GITHUB_GIT}/${GITHUB_REPO};protocol=https', d)}"
+UBOOT_URI_STASH = "${DIGI_MTK_GIT}/uboot/u-boot-denx.git;protocol=ssh"
+UBOOT_URI_GITHUB = "${DIGI_GITHUB_GIT}/u-boot.git;protocol=https"
+UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${UBOOT_URI_STASH}', '${UBOOT_URI_GITHUB}', d)}"
 
 SRC_URI = " \
     ${UBOOT_GIT_URI};branch=${SRCBRANCH} \
-"
-
-SRC_URI:append = " \
     file://boot.txt \
     file://install_linux_fw_sd.txt \
     file://install_linux_fw_usb.txt \
diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb
index 5bdd58f16..12af04c6d 100644
--- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb
+++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb
@@ -13,12 +13,9 @@ SRCREV = "${AUTOREV}"
 S = "${WORKDIR}"
 
 # Select internal or Github U-Boot repo
-DIGI_LOG_REPO = "u-boot-denx.git"
-DIGI_MTK_REPO = "uboot/u-boot-denx.git"
-GITHUB_REPO = "u-boot.git"
-UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , \
-					oe.utils.conditional('DIGI_GIT', '${DIGI_LOG_GIT}', '${DIGI_GIT}/${DIGI_LOG_REPO}', '${DIGI_GIT}/${DIGI_MTK_REPO};protocol=ssh', d), \
-					'${DIGI_GITHUB_GIT}/${GITHUB_REPO};protocol=https', d)}"
+UBOOT_URI_STASH = "${DIGI_MTK_GIT}/uboot/u-boot-denx.git;protocol=ssh"
+UBOOT_URI_GITHUB = "${DIGI_GITHUB_GIT}/u-boot.git;protocol=https"
+UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${UBOOT_URI_STASH}', '${UBOOT_URI_GITHUB}', d)}"
 
 SRC_URI = " \
     ${UBOOT_GIT_URI};branch=${SRCBRANCH} \