diff --git a/board/beacon/imx8mm/README b/board/beacon/imx8mm/README
index c65acef22d8..32b24bc03eb 100644
--- a/board/beacon/imx8mm/README
+++ b/board/beacon/imx8mm/README
@@ -11,7 +11,7 @@ Get and Build the ARM Trusted firmware
 ======================================
 Note: $(srctree) is U-Boot source directory
 
-$ git clone https://source.codeaurora.org/external/imx/imx-atf
+$ git clone https://github.com/nxp-imx/imx-atf
 $ git lf-5.10.72-2.2.0
 $ make PLAT=imx8mm bl31 CROSS_COMPILE=aarch64-linux-gnu-
 $ cp build/imx8mm/release/bl31.bin $(srctree)
diff --git a/board/beacon/imx8mn/README b/board/beacon/imx8mn/README
index 788ab1093b4..49da03c8d83 100644
--- a/board/beacon/imx8mn/README
+++ b/board/beacon/imx8mn/README
@@ -11,7 +11,7 @@ Get and Build the ARM Trusted firmware
 ======================================
 Note: $(srctree) is U-Boot source directory
 
-$ git clone https://source.codeaurora.org/external/imx/imx-atf
+$ git clone https://github.com/nxp-imx/imx-atf
 $ git lf-5.10.72-2.2.0
 $ make PLAT=imx8mn bl31 CROSS_COMPILE=aarch64-linux-gnu-
 $ cp build/imx8mn/release/bl31.bin $(srctree)
diff --git a/board/freescale/imx8qm_mek/README b/board/freescale/imx8qm_mek/README
index b1a4c6cc822..47fae3d2843 100644
--- a/board/freescale/imx8qm_mek/README
+++ b/board/freescale/imx8qm_mek/README
@@ -12,7 +12,7 @@ Quick Start
 Get and Build the ARM Trusted firmware
 ======================================
 
-$ git clone https://source.codeaurora.org/external/imx/imx-atf
+$ git clone https://github.com/nxp-imx/imx-atf
 $ cd imx-atf/
 $ git checkout origin/imx_4.14.78_1.0.0_ga -b imx_4.14.78_1.0.0_ga
 $ make PLAT=imx8qm bl31
diff --git a/board/gateworks/venice/README b/board/gateworks/venice/README
index 9f3a250bb66..ea9b8348a7d 100644
--- a/board/gateworks/venice/README
+++ b/board/gateworks/venice/README
@@ -10,7 +10,7 @@ Quick Start
 
 Get and Build the ARM Trusted firmware
 ======================================
-$ git clone https://source.codeaurora.org/external/imx/imx-atf
+$ git clone https://github.com/nxp-imx/imx-atf
 $ git checkout imx_5.4.47_2.2.0
 $ make PLAT=imx8mm CROSS_COMPILE=aarch64-linux-gnu- bl31
 $ cp build/imx8mm/release/bl31.bin .
diff --git a/board/google/imx8mq_phanbell/README b/board/google/imx8mq_phanbell/README
index 88a136b32c8..7c63fc52a73 100644
--- a/board/google/imx8mq_phanbell/README
+++ b/board/google/imx8mq_phanbell/README
@@ -10,7 +10,7 @@ Quick Start
 Get and Build the ARM Trusted firmware
 ======================================
 Note: srctree is U-Boot source directory
-Get ATF from: https://source.codeaurora.org/external/imx/imx-atf
+Get ATF from: https://github.com/nxp-imx/imx-atf
 branch: imx_4.19.35_1.0.0
 $ make PLAT=imx8mq bl31
 $ cp build/imx8mq/release/bl31.bin $(builddir)
diff --git a/board/ronetix/imx8mq-cm/README b/board/ronetix/imx8mq-cm/README
index 1d43fa5f4f8..c57ff2477ea 100644
--- a/board/ronetix/imx8mq-cm/README
+++ b/board/ronetix/imx8mq-cm/README
@@ -9,7 +9,7 @@ Quick Start
 
 Get and Build the ARM Trusted firmware
 ======================================
-$ git clone https://source.codeaurora.org/external/imx/imx-atf
+$ git clone https://github.com/nxp-imx/imx-atf
 $ cd imx-atf
 $ git checkout imx_4.19.35_1.0.0
 $ make PLAT=imx8mq bl31
diff --git a/doc/board/advantech/imx8qm-rom7720-a1.rst b/doc/board/advantech/imx8qm-rom7720-a1.rst
index 953cf01fde4..13ea2eb19e4 100644
--- a/doc/board/advantech/imx8qm-rom7720-a1.rst
+++ b/doc/board/advantech/imx8qm-rom7720-a1.rst
@@ -19,7 +19,7 @@ Get and Build the ARM Trusted firmware
 
 .. code-block:: bash
 
-     $ git clone https://source.codeaurora.org/external/imx/imx-atf
+     $ git clone https://github.com/nxp-imx/imx-atf
      $ cd imx-atf/
      $ git checkout origin/imx_4.14.78_1.0.0_ga -b imx_4.14.78_1.0.0_ga
      $ make PLAT=imx8qm bl31
diff --git a/doc/board/congatec/cgtqmx8.rst b/doc/board/congatec/cgtqmx8.rst
index 16711a844d5..a970cb82a12 100644
--- a/doc/board/congatec/cgtqmx8.rst
+++ b/doc/board/congatec/cgtqmx8.rst
@@ -19,7 +19,7 @@ Get and Build the ARM Trusted firmware
 
 .. code-block:: bash
 
-     $ git clone https://source.codeaurora.org/external/imx/imx-atf
+     $ git clone https://github.com/nxp-imx/imx-atf
      $ cd imx-atf/
      $ git checkout origin/imx_4.14.78_1.0.0_ga -b imx_4.14.78_1.0.0_ga
      $ make PLAT=imx8qm bl31
diff --git a/doc/board/kontron/sl-mx8mm.rst b/doc/board/kontron/sl-mx8mm.rst
index 702db60fe38..09c50aa8b16 100644
--- a/doc/board/kontron/sl-mx8mm.rst
+++ b/doc/board/kontron/sl-mx8mm.rst
@@ -40,7 +40,7 @@ There are two sources for the TF-A. Mainline and NXP. Get the one you prefer
 
 **NXP's imx-atf**
 
-1. Get TF-A from: https://github.com/nxp-imx/imx-atf, branch: lf_v2.6
+1. Get TF-A from: https://github.com/nxp-imx/imx-atf, branch: imx_5.4.70_2.3.0
 2. Build
 
   .. code-block:: bash
diff --git a/doc/board/nxp/imx8mm_evk.rst b/doc/board/nxp/imx8mm_evk.rst
index 5b178d703e9..327ce6e49cc 100644
--- a/doc/board/nxp/imx8mm_evk.rst
+++ b/doc/board/nxp/imx8mm_evk.rst
@@ -17,7 +17,7 @@ Get and Build the ARM Trusted firmware
 --------------------------------------
 
 Note: builddir is U-Boot build directory (source directory for in-tree builds)
-Get ATF from: https://source.codeaurora.org/external/imx/imx-atf
+Get ATF from: https://github.com/nxp-imx/imx-atf
 branch: imx_5.4.47_2.2.0
 
 .. code-block:: bash
diff --git a/doc/board/nxp/imx8mn_evk.rst b/doc/board/nxp/imx8mn_evk.rst
index c45bb7bac7a..4f225ea6601 100644
--- a/doc/board/nxp/imx8mn_evk.rst
+++ b/doc/board/nxp/imx8mn_evk.rst
@@ -17,7 +17,7 @@ Get and Build the ARM Trusted firmware
 --------------------------------------
 
 Note: srctree is U-Boot source directory
-Get ATF from: https://source.codeaurora.org/external/imx/imx-atf
+Get ATF from: https://github.com/nxp-imx/imx-atf
 branch: imx_5.4.47_2.2.0
 
 .. code-block:: bash
diff --git a/doc/board/nxp/imx8mp_evk.rst b/doc/board/nxp/imx8mp_evk.rst
index b996ae055e6..e7cc7b396b5 100644
--- a/doc/board/nxp/imx8mp_evk.rst
+++ b/doc/board/nxp/imx8mp_evk.rst
@@ -16,7 +16,7 @@ Quick Start
 Get and Build the ARM Trusted firmware
 --------------------------------------
 
-Get ATF from: https://source.codeaurora.org/external/imx/imx-atf
+Get ATF from: https://github.com/nxp-imx/imx-atf
 branch: imx_5.4.70_2.3.0
 
 .. code-block:: bash
diff --git a/doc/board/nxp/imx8mq_evk.rst b/doc/board/nxp/imx8mq_evk.rst
index aa1ecfb47ad..4b0624e7e86 100644
--- a/doc/board/nxp/imx8mq_evk.rst
+++ b/doc/board/nxp/imx8mq_evk.rst
@@ -17,7 +17,7 @@ Get and Build the ARM Trusted firmware
 --------------------------------------
 
 Note: srctree is U-Boot source directory
-Get ATF from: https://source.codeaurora.org/external/imx/imx-atf
+Get ATF from: https://github.com/nxp-imx/imx-atf
 branch: imx_5.4.47_2.2.0
 
 .. code-block:: bash
diff --git a/doc/board/nxp/imx8qxp_mek.rst b/doc/board/nxp/imx8qxp_mek.rst
index 708db1952e9..bdd38368f1a 100644
--- a/doc/board/nxp/imx8qxp_mek.rst
+++ b/doc/board/nxp/imx8qxp_mek.rst
@@ -19,7 +19,7 @@ Get and Build the ARM Trusted firmware
 
 .. code-block:: bash
 
-   $ git clone https://source.codeaurora.org/external/imx/imx-atf
+   $ git clone https://github.com/nxp-imx/imx-atf
    $ cd imx-atf/
    $ git checkout origin/imx_4.19.35_1.1.0 -b imx_4.19.35_1.1.0
    $ make PLAT=imx8qx bl31
diff --git a/doc/board/toradex/apalis-imx8.rst b/doc/board/toradex/apalis-imx8.rst
index 29593faf1a0..849b1172bd4 100644
--- a/doc/board/toradex/apalis-imx8.rst
+++ b/doc/board/toradex/apalis-imx8.rst
@@ -18,7 +18,7 @@ Get and Build the ARM Trusted Firmware
 
 .. code-block:: bash
 
-    $ git clone -b imx_4.14.78_1.0.0_ga https://source.codeaurora.org/external/imx/imx-atf
+    $ git clone -b imx_4.14.78_1.0.0_ga https://github.com/nxp-imx/imx-atf
     $ cd imx-atf/
     $ make PLAT=imx8qm bl31