diff --git a/README b/README
index d4844814b8..11c114edea 100644
--- a/README
+++ b/README
@@ -35,7 +35,7 @@ Quick Start Guide
 See the i.MX Yocto Project User's Guide for instructions on installing repo.
 
 First install the i.MX Linux BSP repo
-$: repo init -u git://source.codeaurora.org/external/imx/imx-manifest.git -b imx-linux-zeus -m imx-5.4.3-2.0.0.xml
+$: repo init -u git://github.com/nxp-imx/imx-manifest.git -b imx-linux-zeus -m imx-5.4.3-2.0.0.xml
 
 Download the Yocto Project Layers:
 $: repo sync
diff --git a/meta-bsp/conf/layer.conf b/meta-bsp/conf/layer.conf
index 3c2d3baa61..1d6e881411 100644
--- a/meta-bsp/conf/layer.conf
+++ b/meta-bsp/conf/layer.conf
@@ -418,3 +418,9 @@ KERNEL_DEVICETREE_imx8qxpc0mek = " \
 
 # Create a mirror for unreliable packages
 MIRRORS += "http://sourceforge.net/.* http://www.nxp.com/lgfiles/updates/other"
+
+# NXP BSP is moved from CAF to github
+# FIXME: Drop this after meta-freescale is switched to github
+PREMIRRORS += "\
+    git://source.codeaurora.org/external/imx/ git://github.com/nxp-imx/ \
+    git://source.codeaurora.org/external/qoriq/qoriq-components/ git://github.com/nxp-qoriq/qoriq-components_"
diff --git a/meta-bsp/recipes-bsp/imx-atf/imx-atf_2.0.bbappend b/meta-bsp/recipes-bsp/imx-atf/imx-atf_2.0.bbappend
index cca835d5fd..d0f1315c87 100644
--- a/meta-bsp/recipes-bsp/imx-atf/imx-atf_2.0.bbappend
+++ b/meta-bsp/recipes-bsp/imx-atf/imx-atf_2.0.bbappend
@@ -1,5 +1,5 @@
 SRCBRANCH = "imx_5.4.3_2.0.0"
-ATF_SRC ?= "git://source.codeaurora.org/external/imx/imx-atf.git;protocol=https"
+ATF_SRC ?= "git://github.com/nxp-imx/imx-atf.git;protocol=https"
 SRC_URI = "${ATF_SRC};branch=${SRCBRANCH} \
            file://0001-Allow-BUILD_STRING-to-be-set-in-.revision-file.patch \
 "
diff --git a/meta-bsp/recipes-bsp/imx-mkimage/imx-mkimage_git.inc b/meta-bsp/recipes-bsp/imx-mkimage/imx-mkimage_git.inc
index 973d475eb9..f0445947d1 100644
--- a/meta-bsp/recipes-bsp/imx-mkimage/imx-mkimage_git.inc
+++ b/meta-bsp/recipes-bsp/imx-mkimage/imx-mkimage_git.inc
@@ -3,7 +3,7 @@
 DEPENDS = "zlib-native openssl-native"
 
 SRCBRANCH = "imx_5.4.3_2.0.0"
-IMX_MKIMAGE_SRC ?= "git://source.codeaurora.org/external/imx/imx-mkimage.git;protocol=https"
+IMX_MKIMAGE_SRC ?= "git://github.com/nxp-imx/imx-mkimage.git;protocol=https"
 SRC_URI = "${IMX_MKIMAGE_SRC};branch=${SRCBRANCH}"
 SRCREV = "0fcc82965c695f4754b87ae09b1ec79c0ce6c3b2"
 S = "${WORKDIR}/git"
diff --git a/meta-bsp/recipes-bsp/imx-test/imx-test_git.bbappend b/meta-bsp/recipes-bsp/imx-test/imx-test_git.bbappend
index 30f786be02..d2897671c4 100644
--- a/meta-bsp/recipes-bsp/imx-test/imx-test_git.bbappend
+++ b/meta-bsp/recipes-bsp/imx-test/imx-test_git.bbappend
@@ -5,7 +5,7 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
 
 SRCBRANCH = "imx_5.4.3_2.0.0"
-IMXTEST_SRC ?= "git://source.codeaurora.org/external/imx/imx-test.git;protocol=https"
+IMXTEST_SRC ?= "git://github.com/nxp-imx/imx-test.git;protocol=https"
 SRC_URI = " \
     ${IMXTEST_SRC};branch=${SRCBRANCH} \
     file://0001-pxp-test-Fix-format-security-error.patch \
diff --git a/meta-bsp/recipes-bsp/u-boot/u-boot-imx_2019.04.bb b/meta-bsp/recipes-bsp/u-boot/u-boot-imx_2019.04.bb
index 68ac4bc399..989c7ec8a0 100644
--- a/meta-bsp/recipes-bsp/u-boot/u-boot-imx_2019.04.bb
+++ b/meta-bsp/recipes-bsp/u-boot/u-boot-imx_2019.04.bb
@@ -14,7 +14,7 @@ DEPENDS_append = " dtc-native"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-UBOOT_SRC ?= "git://source.codeaurora.org/external/imx/uboot-imx.git;protocol=https"
+UBOOT_SRC ?= "git://github.com/nxp-imx/uboot-imx.git;protocol=https"
 SRCBRANCH = "imx_v2019.04_5.4.3_2.0.0"
 SRC_URI = "${UBOOT_SRC};branch=${SRCBRANCH} \
 "
diff --git a/meta-bsp/recipes-connectivity/bluez5/files/0001-bluetooth-Add-bluetooth-support-for-QCA6174-chip.patch b/meta-bsp/recipes-connectivity/bluez5/files/0001-bluetooth-Add-bluetooth-support-for-QCA6174-chip.patch
index 5ae3c9891b..4afafd4105 100644
--- a/meta-bsp/recipes-connectivity/bluez5/files/0001-bluetooth-Add-bluetooth-support-for-QCA6174-chip.patch
+++ b/meta-bsp/recipes-connectivity/bluez5/files/0001-bluetooth-Add-bluetooth-support-for-QCA6174-chip.patch
@@ -11,7 +11,7 @@ download the firmware patches:
         hciattach /dev/ttyHS0 qca 3000000 -t120 flow -f0
 
 cherry-pick and merged from:
-	https://source.codeaurora.org/quic/la/platform/external/bluetooth/bluez
+	https://git.codelinaro.org/clo/la/platform/external/bluetooth/bluez
 	branch: LNX.LE.5.3
 	commit: commit bb96f3b759e0b99db70014302ca12929fb42f554
 
diff --git a/meta-bsp/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_9.0.0.bb b/meta-bsp/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_9.0.0.bb
index 8da9992532..8d64e0b79e 100644
--- a/meta-bsp/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_9.0.0.bb
+++ b/meta-bsp/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_9.0.0.bb
@@ -4,7 +4,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=aeb969185a143c3c25130bc2c3ef9a50"
 DEPENDS = "imx-gpu-viv zlib libpng procps"
 
-APITRACE_SRC ?= "git://source.codeaurora.org/external/imx/apitrace-imx.git;protocol=https"
+APITRACE_SRC ?= "git://github.com/nxp-imx/apitrace-imx.git;protocol=https"
 SRCBRANCH = "imx_9.0"
 SRC_URI = "${APITRACE_SRC};branch=${SRCBRANCH}"
 SRCREV = "8636fa989d8e914a7986916b058878761a981a6f"
diff --git a/meta-bsp/recipes-graphics/nn-imx/nn-imx_1.0.4.bb b/meta-bsp/recipes-graphics/nn-imx/nn-imx_1.0.4.bb
index 3591ef025e..63f48d9a3c 100644
--- a/meta-bsp/recipes-graphics/nn-imx/nn-imx_1.0.4.bb
+++ b/meta-bsp/recipes-graphics/nn-imx/nn-imx_1.0.4.bb
@@ -4,7 +4,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=bba6cdb9c2b03c849ed4975ed9ed90dc"
 
 DEPENDS = "imx-gpu-viv"
-NN-IMX_SRC ?= "git://source.codeaurora.org/external/imx/nn-imx.git;protocol=https"
+NN-IMX_SRC ?= "git://github.com/nxp-imx/nn-imx.git;protocol=https"
 SRCBRANCH = "nn-1.0.4"
 SRCREV = "9e871f65f62155bf8388d79c2e2bbda63cb01ed6"
 
diff --git a/meta-bsp/recipes-graphics/wayland/wayland-protocols_1.18.imx.bb b/meta-bsp/recipes-graphics/wayland/wayland-protocols_1.18.imx.bb
index 8ba8f9ee8a..0127adb0ac 100644
--- a/meta-bsp/recipes-graphics/wayland/wayland-protocols_1.18.imx.bb
+++ b/meta-bsp/recipes-graphics/wayland/wayland-protocols_1.18.imx.bb
@@ -1,6 +1,6 @@
 require recipes-graphics/wayland/wayland-protocols_1.17.imx.bb
 
-WAYLAND_PROTOCOLS_SRC ?= "git://source.codeaurora.org/external/imx/wayland-protocols-imx.git;protocol=https"
+WAYLAND_PROTOCOLS_SRC ?= "git://github.com/nxp-imx/wayland-protocols-imx.git;protocol=https"
 SRCBRANCH = "wayland-protocols-imx-1.18"
 SRC_URI = "${WAYLAND_PROTOCOLS_SRC};branch=${SRCBRANCH} "
 SRCREV = "ee18c1f66877f7fb652467c349108395c20d4f9a"
diff --git a/meta-bsp/recipes-graphics/wayland/weston_8.0.0.imx.bb b/meta-bsp/recipes-graphics/wayland/weston_8.0.0.imx.bb
index f296bf19ca..67a2f9b347 100644
--- a/meta-bsp/recipes-graphics/wayland/weston_8.0.0.imx.bb
+++ b/meta-bsp/recipes-graphics/wayland/weston_8.0.0.imx.bb
@@ -1,7 +1,7 @@
 require recipes-graphics/wayland/weston_7.0.0.bb
 
 SRC_URI_remove = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz"
-WESTON_SRC ?= "git://source.codeaurora.org/external/imx/weston-imx.git;protocol=https"
+WESTON_SRC ?= "git://github.com/nxp-imx/weston-imx.git;protocol=https"
 SRC_URI_prepend = "${WESTON_SRC};branch=weston-imx-8.0 "
 SRCREV = "f6a7d35650121fbe7c20d4cbe0eaac730fab3b2a"
 S = "${WORKDIR}/git"
diff --git a/meta-bsp/recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.4.0.p0.0.bb b/meta-bsp/recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.4.0.p0.0.bb
index 6c7d5d32e4..48dc25885c 100644
--- a/meta-bsp/recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.4.0.p0.0.bb
+++ b/meta-bsp/recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.4.0.p0.0.bb
@@ -2,7 +2,7 @@ FILESEXTRAPATHS_prepend := "${BSPDIR}/sources/meta-freescale/recipes-graphics/xo
 
 require recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.2.4.p4.0.bb
 
-XF86_VIDEO_IMX_VIVANTE_SRC ?= "git://source.codeaurora.org/external/imx/xf86-video-imx-vivante.git;protocol=https"
+XF86_VIDEO_IMX_VIVANTE_SRC ?= "git://github.com/nxp-imx/xf86-video-imx-vivante.git;protocol=https"
 SRC_URI = " \
     ${XF86_VIDEO_IMX_VIVANTE_SRC};branch=${SRCBRANCH} \
     file://rc.autohdmi \
diff --git a/meta-bsp/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.0.p2.2.bb b/meta-bsp/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.0.p2.2.bb
index f849c57b93..a08052d22b 100644
--- a/meta-bsp/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.0.p2.2.bb
+++ b/meta-bsp/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.0.p2.2.bb
@@ -4,6 +4,6 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425
 
 SRCBRANCH = "imx_5.4.3_2.0.0"
 LOCALVERSION = "-2.0.0"
-KERNEL_SRC ?= "git://source.codeaurora.org/external/imx/linux-imx.git;protocol=https"
+KERNEL_SRC ?= "git://github.com/nxp-imx/linux-imx.git;protocol=https"
 
 SRCREV = "7867389eae778ea70fe5c56c9f4ca3a37b2dd4aa"
diff --git a/meta-bsp/recipes-kernel/kernel-modules/kernel-module-mwifiex_git.inc b/meta-bsp/recipes-kernel/kernel-modules/kernel-module-mwifiex_git.inc
index 7bba594260..13fb029882 100644
--- a/meta-bsp/recipes-kernel/kernel-modules/kernel-module-mwifiex_git.inc
+++ b/meta-bsp/recipes-kernel/kernel-modules/kernel-module-mwifiex_git.inc
@@ -2,7 +2,7 @@ SUMMARY = "Marvell WiFi driver for PCIE8997"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://mwifiex_8997/gpl-2.0.txt;md5=ab04ac0f249af12befccb94447c08b77;"
 
-MRVL_SRC ?= "git://source.codeaurora.org/external/imx/mwifiex.git;protocol=https"
+MRVL_SRC ?= "git://github.com/nxp-imx/mwifiex.git;protocol=https"
 
 # Kernel 5.4
 SRC_URI = "${MRVL_SRC};branch=master"
diff --git a/meta-bsp/recipes-kernel/kernel-modules/kernel-module-qcacld-lea.inc b/meta-bsp/recipes-kernel/kernel-modules/kernel-module-qcacld-lea.inc
index 67a07d4a9a..ed49a6c941 100644
--- a/meta-bsp/recipes-kernel/kernel-modules/kernel-module-qcacld-lea.inc
+++ b/meta-bsp/recipes-kernel/kernel-modules/kernel-module-qcacld-lea.inc
@@ -2,7 +2,7 @@ SUMMARY = "Qualcomm WiFi driver for QCA module 9377 and 6174"
 LICENSE = "BSD & GPLv2"
 LIC_FILES_CHKSUM = "file://CORE/HDD/src/wlan_hdd_main.c;beginline=1;endline=20;md5=ec8d62116b13db773825ebf7cf91be1d;"
 
-QCACLD_SRC ?= "git://source.codeaurora.org/external/imx/qcacld-2.0-imx.git;protocol=https"
+QCACLD_SRC ?= "git://github.com/nxp-imx/qcacld-2.0-imx.git;protocol=https"
 
 SRC_URI = "${QCACLD_SRC};branch=IMX_CNSS.LEA.NRT_3.0"
 SRCREV = "7dc91e5977f31d60741c55682564788c0f930163"
diff --git a/meta-bsp/recipes-kernel/kernel-modules/kernel-module-qcacld_3.1.inc b/meta-bsp/recipes-kernel/kernel-modules/kernel-module-qcacld_3.1.inc
index d6e481c025..44eb8f70b0 100644
--- a/meta-bsp/recipes-kernel/kernel-modules/kernel-module-qcacld_3.1.inc
+++ b/meta-bsp/recipes-kernel/kernel-modules/kernel-module-qcacld_3.1.inc
@@ -3,7 +3,7 @@ LICENSE = "BSD & GPLv2"
 LIC_FILES_CHKSUM = "file://CORE/HDD/src/wlan_hdd_main.c;beginline=1;endline=20;md5=ec8d62116b13db773825ebf7cf91be1d;"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/kernel-module-qca:"
-QCACLD_SRC ?= "git://source.codeaurora.org/external/imx/qcacld-2.0-imx.git;protocol=https"
+QCACLD_SRC ?= "git://github.com/nxp-imx/qcacld-2.0-imx.git;protocol=https"
 
 #Kernel 5.4
 SRC_URI = "${QCACLD_SRC};branch=IMX_CNSS.LEA.NRT_3.0_KRL5.4"
diff --git a/meta-bsp/recipes-kernel/linux/linux-imx-headers_5.4.bb b/meta-bsp/recipes-kernel/linux/linux-imx-headers_5.4.bb
index 73407f8869..88ead49ff1 100644
--- a/meta-bsp/recipes-kernel/linux/linux-imx-headers_5.4.bb
+++ b/meta-bsp/recipes-kernel/linux/linux-imx-headers_5.4.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
 
 KERNEL_BRANCH ?= "imx_5.4.3_2.0.0"
 LOCALVERSION = "-2.0.0"
-KERNEL_SRC ?= "git://source.codeaurora.org/external/imx/linux-imx.git;protocol=https"
+KERNEL_SRC ?= "git://github.com/nxp-imx/linux-imx.git;protocol=https"
 SRC_URI = "${KERNEL_SRC};branch=${KERNEL_BRANCH}"
 
 SRCREV = "dea2fede7e024ee7029b13e8d82a00ec14427777"
diff --git a/meta-bsp/recipes-kernel/linux/linux-imx_5.4.bb b/meta-bsp/recipes-kernel/linux/linux-imx_5.4.bb
index 214647abb0..274855d2cf 100644
--- a/meta-bsp/recipes-kernel/linux/linux-imx_5.4.bb
+++ b/meta-bsp/recipes-kernel/linux/linux-imx_5.4.bb
@@ -14,7 +14,7 @@ DEPENDS += "lzop-native bc-native"
 
 KERNEL_BRANCH ?= "imx_5.4.3_2.0.0"
 LOCALVERSION = "-2.0.0"
-KERNEL_SRC ?= "git://source.codeaurora.org/external/imx/linux-imx.git;protocol=https"
+KERNEL_SRC ?= "git://github.com/nxp-imx/linux-imx.git;protocol=https"
 SRC_URI = "${KERNEL_SRC};branch=${KERNEL_BRANCH}"
 
 SRCREV = "fd263a3edd95dfe812397fabf1059b5f99bba2ab"
diff --git a/meta-bsp/recipes-multimedia/alsa/imx-alsa-plugins_git.bb b/meta-bsp/recipes-multimedia/alsa/imx-alsa-plugins_git.bb
index 725969d046..b322b2eb35 100644
--- a/meta-bsp/recipes-multimedia/alsa/imx-alsa-plugins_git.bb
+++ b/meta-bsp/recipes-multimedia/alsa/imx-alsa-plugins_git.bb
@@ -17,7 +17,7 @@ LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=94d55d512a9ba36caa9b7df079bae19f"
 
 inherit autotools pkgconfig use-imx-headers
 
-IMXALSA_SRC ?= "git://source.codeaurora.org/external/imx/imx-alsa-plugins.git;protocol=https"
+IMXALSA_SRC ?= "git://github.com/nxp-imx/imx-alsa-plugins.git;protocol=https"
 SRCBRANCH = "MM_04.05.04_2002_L5.4.3"
 
 SRC_URI = "${IMXALSA_SRC};branch=${SRCBRANCH}"
diff --git a/meta-bsp/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.imx.bb b/meta-bsp/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.imx.bb
index aea9c30190..56a4747b99 100644
--- a/meta-bsp/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.imx.bb
+++ b/meta-bsp/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.imx.bb
@@ -8,7 +8,7 @@ PV = "1.16.0.imx"
 FILESEXTRAPATHS_prepend := "${BSPDIR}/sources/poky/meta/recipes-multimedia/gstreamer/${PN}:"
 FILESEXTRAPATHS_prepend := "${BSPDIR}/sources/poky/meta/recipes-multimedia/gstreamer/files:"
 
-GST1.0-PLUGINS-BAD_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-bad.git;protocol=https"
+GST1.0-PLUGINS-BAD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-bad.git;protocol=https"
 SRCBRANCH = "MM_04.05.04_2002_L5.4.3"
 SRCREV = "eea4cfe9315a9c648d116cfff3cd532e9a31237d" 
 SRC_URI = " \
diff --git a/meta-bsp/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.imx.bb b/meta-bsp/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.imx.bb
index 3f759af3b2..31324127d4 100644
--- a/meta-bsp/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.imx.bb
+++ b/meta-bsp/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.imx.bb
@@ -6,7 +6,7 @@ FILESEXTRAPATHS_prepend := "${BSPDIR}/sources/poky/meta/recipes-multimedia/gstre
 FILESEXTRAPATHS_prepend := "${BSPDIR}/sources/poky/meta/recipes-multimedia/gstreamer/${PN}:"
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-GST1.0-PLUGINS-BASE_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-base.git;protocol=https"
+GST1.0-PLUGINS-BASE_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-base.git;protocol=https"
 SRCBRANCH = "MM_04.05.04_2002_L5.4.3"
 SRCREV = "5221bd72a116341738ab060b195b38a2cbed1c58" 
 SRC_URI = " \
diff --git a/meta-bsp/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.imx.bb b/meta-bsp/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.imx.bb
index 127d7f9fdc..1be39eee9a 100644
--- a/meta-bsp/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.imx.bb
+++ b/meta-bsp/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.imx.bb
@@ -5,7 +5,7 @@ PV = "1.16.0.imx"
 FILESEXTRAPATHS_prepend := "${BSPDIR}/sources/poky/meta/recipes-multimedia/gstreamer/${PN}:"
 FILESEXTRAPATHS_prepend := "${BSPDIR}/sources/poky/meta/recipes-multimedia/gstreamer/files:"
 
-GST1.0-PLUGINS-GOOD_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-good.git;protocol=https"
+GST1.0-PLUGINS-GOOD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-good.git;protocol=https"
 SRCBRANCH = "MM_04.05.04_2002_L5.4.3"
 SRCREV = "3bcc85705695ee629ac3fb687411bb196d231918" 
 
diff --git a/meta-bsp/recipes-multimedia/gstreamer/gstreamer1.0_1.16.imx.bb b/meta-bsp/recipes-multimedia/gstreamer/gstreamer1.0_1.16.imx.bb
index e15109ff93..b14089b8f3 100644
--- a/meta-bsp/recipes-multimedia/gstreamer/gstreamer1.0_1.16.imx.bb
+++ b/meta-bsp/recipes-multimedia/gstreamer/gstreamer1.0_1.16.imx.bb
@@ -5,7 +5,7 @@ PV = "1.16.0.imx"
 FILESEXTRAPATHS_prepend := "${BSPDIR}/sources/poky/meta/recipes-multimedia/gstreamer/files:"
 
 # Use i.MX fork of GST for customizations
-GST1.0_SRC ?= "gitsm://source.codeaurora.org/external/imx/gstreamer.git;protocol=https"
+GST1.0_SRC ?= "gitsm://github.com/nxp-imx/gstreamer.git;protocol=https"
 SRCBRANCH = "MM_04.05.04_2002_L5.4.3"
 SRCREV = "a4c220605ac0923596b89f4f07c05d235bc09259" 
 SRC_URI = " \
diff --git a/meta-bsp/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.5.4.bb b/meta-bsp/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.5.4.bb
index 6b56c4d067..b3187ff391 100644
--- a/meta-bsp/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.5.4.bb
+++ b/meta-bsp/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.5.4.bb
@@ -20,7 +20,7 @@ RCONFLICTS_${PN} = "gst1.0-fsl-plugin"
 LIC_FILES_CHKSUM = "file://COPYING-LGPL-2;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
                     file://COPYING-LGPL-2.1;md5=fbc093901857fcd118f065f900982c24"
 
-IMXGST_SRC ?= "git://source.codeaurora.org/external/imx/imx-gst1.0-plugin.git;protocol=https"
+IMXGST_SRC ?= "git://github.com/nxp-imx/imx-gst1.0-plugin.git;protocol=https"
 SRCBRANCH = "MM_04.05.04_2002_L5.4.3"
 
 SRC_URI = "${IMXGST_SRC};branch=${SRCBRANCH} \
diff --git a/meta-bsp/recipes-support/opencv/opencv_4.2.0.imx.bb b/meta-bsp/recipes-support/opencv/opencv_4.2.0.imx.bb
index 7268c6a7a4..59af10e4d1 100644
--- a/meta-bsp/recipes-support/opencv/opencv_4.2.0.imx.bb
+++ b/meta-bsp/recipes-support/opencv/opencv_4.2.0.imx.bb
@@ -15,7 +15,7 @@ SRC_URI_remove = " \
     git://github.com/opencv/opencv.git;name=opencv \
     file://0002-Make-opencv-ts-create-share-library-intead-of-static.patch \
 "
-OPENCV_SRC ?= "git://source.codeaurora.org/external/imx/opencv-imx.git;protocol=https"
+OPENCV_SRC ?= "git://github.com/nxp-imx/opencv-imx.git;protocol=https"
 SRCBRANCH = "4.2.0_imx"
 SRC_URI =+ "${OPENCV_SRC};branch=${SRCBRANCH};name=opencv"
 SRC_URI += " \
diff --git a/meta-bsp/recipes-utils/simg2img/simg2img_git.bb b/meta-bsp/recipes-utils/simg2img/simg2img_git.bb
index 6557dbde64..489fa664ea 100644
--- a/meta-bsp/recipes-utils/simg2img/simg2img_git.bb
+++ b/meta-bsp/recipes-utils/simg2img/simg2img_git.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b433a746dd6fe8862028b1d7fc412a4d"
 
 DEPENDS = "zlib"
 
-SIMG2IMG_SRC ?= "git://source.codeaurora.org/external/imx/simg2img.git;protocol=https"
+SIMG2IMG_SRC ?= "git://github.com/nxp-imx/simg2img.git;protocol=https"
 SRC_BRANCH = "master"
 
 SRC_URI = "${SIMG2IMG_SRC};branch=${SRC_BRANCH}"
diff --git a/meta-ml/recipes-libraries/arm-compute-library/arm-compute-library_git-imx.bb b/meta-ml/recipes-libraries/arm-compute-library/arm-compute-library_git-imx.bb
index 96f515bf78..af203647c2 100644
--- a/meta-ml/recipes-libraries/arm-compute-library/arm-compute-library_git-imx.bb
+++ b/meta-ml/recipes-libraries/arm-compute-library/arm-compute-library_git-imx.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8948bc85114b3b716576ef8d732f034f \
 
 PV = "19.08+git${SRCPV}"
 
-ARM_COMPUTELIBRARY_SRC ?= "git://source.codeaurora.org/external/imx/arm-computelibrary-imx.git;protocol=https"
+ARM_COMPUTELIBRARY_SRC ?= "git://github.com/nxp-imx/arm-computelibrary-imx.git;protocol=https"
 SRCBRANCH = "imx_19.08"
 
 SRC_URI = "${ARM_COMPUTELIBRARY_SRC};branch=${SRCBRANCH}"
diff --git a/meta-ml/recipes-libraries/armnn/armnn_git.bb b/meta-ml/recipes-libraries/armnn/armnn_git.bb
index 832acba428..274ab44275 100644
--- a/meta-ml/recipes-libraries/armnn/armnn_git.bb
+++ b/meta-ml/recipes-libraries/armnn/armnn_git.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3e14a924c16f7d828b8335a59da64074 \
 PR = "r1"
 PV = "19.08"
 
-ARMNN_SRC ?= "git://source.codeaurora.org/external/imx/armnn-imx.git;protocol=https"
+ARMNN_SRC ?= "git://github.com/nxp-imx/armnn-imx.git;protocol=https"
 SRCBRANCH = "branches/armnn_19_08"
 SRCREV = "985e414c581005b3b80276b26bb021d8f7175aa2"
 
diff --git a/meta-ml/recipes-libraries/onnxruntime/onnxruntime_1.0.0.bb b/meta-ml/recipes-libraries/onnxruntime/onnxruntime_1.0.0.bb
index b8285e5657..93f459d7a1 100644
--- a/meta-ml/recipes-libraries/onnxruntime/onnxruntime_1.0.0.bb
+++ b/meta-ml/recipes-libraries/onnxruntime/onnxruntime_1.0.0.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=980784f0a7f667becbed133924b263bf"
 
 DEPENDS = "libpng zlib ${BPN}-native"
 
-ONNXRUNTIME_SRC ?= "gitsm://source.codeaurora.org/external/imx/onnxruntime-imx.git;protocol=https"
+ONNXRUNTIME_SRC ?= "gitsm://github.com/nxp-imx/onnxruntime-imx.git;protocol=https"
 SRCBRANCH = "master"
 SRCREV = "2ddd64c357771120bd6717032d4d01839ca9b9ee"
 
diff --git a/meta-ml/recipes-libraries/tensorflow-lite/tensorflow-lite_2.1.0.bb b/meta-ml/recipes-libraries/tensorflow-lite/tensorflow-lite_2.1.0.bb
index 4add71f322..a228b898bf 100644
--- a/meta-ml/recipes-libraries/tensorflow-lite/tensorflow-lite_2.1.0.bb
+++ b/meta-ml/recipes-libraries/tensorflow-lite/tensorflow-lite_2.1.0.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=64a34301f8e355f57ec992c2af3e5157"
 
 DEPENDS = "zlib unzip-native swig-native python3 python3-numpy-native python3-pip-native python3-wheel-native"
 
-TENSORFLOW_LITE_SRC ?= "git://source.codeaurora.org/external/imx/tensorflow-imx.git;protocol=https"
+TENSORFLOW_LITE_SRC ?= "git://github.com/nxp-imx/tensorflow-imx.git;protocol=https"
 SRCBRANCH = "imx-v2.1.0"
 SRC_URI = "${TENSORFLOW_LITE_SRC};branch=${SRCBRANCH}"
 SRCREV = "f6a5a19e996746c6b852700cac77c16ca9e7b168"
diff --git a/meta-sdk/dynamic-layers/qt5-layer/recipes-qt/qt5/gstreamer1.0-plugins-good-qt_1.16.imx.bb b/meta-sdk/dynamic-layers/qt5-layer/recipes-qt/qt5/gstreamer1.0-plugins-good-qt_1.16.imx.bb
index 324feaa580..8cb3a1316b 100644
--- a/meta-sdk/dynamic-layers/qt5-layer/recipes-qt/qt5/gstreamer1.0-plugins-good-qt_1.16.imx.bb
+++ b/meta-sdk/dynamic-layers/qt5-layer/recipes-qt/qt5/gstreamer1.0-plugins-good-qt_1.16.imx.bb
@@ -7,7 +7,7 @@ DEPENDS += "gstreamer1.0-plugins-base virtual/kernel libcap zlib bzip2 \
             ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland', '', d)} \
 "
 
-GST1.0-PLUGINS-GOOD_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-good.git;protocol=https"
+GST1.0-PLUGINS-GOOD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-good.git;protocol=https"
 SRCBRANCH = "MM_04.05.04_2002_L5.4.3"
 
 SRC_URI = " \
diff --git a/meta-sdk/recipes-connectivity/sigma-dut/sigma-dut_git.bb b/meta-sdk/recipes-connectivity/sigma-dut/sigma-dut_git.bb
index 24adf25f04..a40a64e4ba 100644
--- a/meta-sdk/recipes-connectivity/sigma-dut/sigma-dut_git.bb
+++ b/meta-sdk/recipes-connectivity/sigma-dut/sigma-dut_git.bb
@@ -3,7 +3,7 @@ LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://README;md5=cb7b88c5098324bb9a20d2a79d76327e"
 SECTION = "base"
 
-SRC_URI = "git://source.codeaurora.org/quic/la/platform/vendor/qcom-opensource/wlan/utils/sigma-dut;protocol=https;branch=github-qca/master; \
+SRC_URI = "git://git.codelinaro.org/clo/la/platform/vendor/qcom-opensource/wlan/utils/sigma-dut;protocol=https;branch=github-qca/master; \
            file://0001-Add-handling-of-DYN_BW_SGNL-command-for-AP-mode.patch \
            file://0001-Add-handling-of-DYN_BW_SGNL-command-for-DRIVER_LINUX.patch \
 "
diff --git a/meta-sdk/recipes-extended/jailhouse/jailhouse_0.11.bb b/meta-sdk/recipes-extended/jailhouse/jailhouse_0.11.bb
index ab3595c1b2..ff054512a9 100644
--- a/meta-sdk/recipes-extended/jailhouse/jailhouse_0.11.bb
+++ b/meta-sdk/recipes-extended/jailhouse/jailhouse_0.11.bb
@@ -1,7 +1,7 @@
 require jailhouse.inc
 
 SRCBRANCH = "imx_5.4.3_2.0.0"
-IMX_JAILHOUSE_SRC ?= "git://source.codeaurora.org/external/imx/imx-jailhouse.git;protocol=ssh"
+IMX_JAILHOUSE_SRC ?= "git://github.com/nxp-imx/imx-jailhouse.git;protocol=ssh"
 
 SRC_URI = "${IMX_JAILHOUSE_SRC};branch=${SRCBRANCH} \
            file://0001-scripts-include.mk-multilib-Fix-hardcoded-lib-in-fir.patch"
diff --git a/meta-sdk/recipes-extended/xen/imx-xen_4.13.0.bb b/meta-sdk/recipes-extended/xen/imx-xen_4.13.0.bb
index cf4b872e9f..048ca84d95 100644
--- a/meta-sdk/recipes-extended/xen/imx-xen_4.13.0.bb
+++ b/meta-sdk/recipes-extended/xen/imx-xen_4.13.0.bb
@@ -2,7 +2,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 require xen.inc
 
 SRCBRANCH = "imx_5.4.3_2.0.0"
-XEN_SRC ?= "git://source.codeaurora.org/external/imx/imx-xen.git;protocol=https"
+XEN_SRC ?= "git://github.com/nxp-imx/imx-xen.git;protocol=https"
 
 SRC_URI = " \
     ${XEN_SRC};branch=${SRCBRANCH} \
diff --git a/meta-sdk/recipes-graphics/libgpuperfcnt/gputop_6.4.0.p2.2.bb b/meta-sdk/recipes-graphics/libgpuperfcnt/gputop_6.4.0.p2.2.bb
index d038b7d3c2..d3ae3bfd9d 100644
--- a/meta-sdk/recipes-graphics/libgpuperfcnt/gputop_6.4.0.p2.2.bb
+++ b/meta-sdk/recipes-graphics/libgpuperfcnt/gputop_6.4.0.p2.2.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=bcacc6777a7173f8b95b5d1e0ac341ae"
 
 DEPENDS = "libgpuperfcnt"
 
-GPUTOP_SRC ?= "git://source.codeaurora.org/external/imx/imx-gputop.git;protocol=https"
+GPUTOP_SRC ?= "git://github.com/nxp-imx/imx-gputop.git;protocol=https"
 SRCBRANCH = "release"
 SRC_URI = "${GPUTOP_SRC};branch=${SRCBRANCH} "
 SRCREV = "6b209162b907030ee28333b94d79ee35b258ab18"