diff --git a/imx-automotive-11.0.0_2.3.0.xml b/imx-automotive-11.0.0_2.3.0.xml
index 582c430..c4d954e 100644
--- a/imx-automotive-11.0.0_2.3.0.xml
+++ b/imx-automotive-11.0.0_2.3.0.xml
@@ -3,16 +3,16 @@
 
   <include name="aosp-automotive-11.0.0_2.3.0.xml"/>
 
-  <remote  name="android-imx"
-           fetch="https://source.codeaurora.org/external/imx/aosp/"
+  <remote  name="imx-android"
+           fetch="https://github.com/nxp-imx-android"
            review="" />
 
-  <remote  name="android-imx-orig"
-           fetch="https://source.codeaurora.org/external/imx/android-imx"
+  <remote  name="imx-android-orig"
+           fetch="https://source.codeaurora.org/external/imx/imx-android"
            review="" />
 
   <remote  name="imx-linux-sdk"
-           fetch="https://source.codeaurora.org/external/imx/"
+           fetch="https://github.com/nxp-imx"
            review="" />
 
   <remote  name="imx-proprietary"
@@ -43,43 +43,46 @@
   <project path="vendor/nxp-opensource/verisilicon_sw_isp_vvcam" name="isp-vvcam" remote="imx-linux-sdk" revision="refs/tags/automotive-11.0.0_2.3.0" />
   <project path="vendor/nxp/vpu_wrapper" name="imx-vpuwrap" remote="imx-proprietary" revision="refs/tags/automotive-11.0.0_2.3.0" />
 
-  <project path="device/nxp" name="device/fsl" remote="android-imx-orig" revision="refs/tags/automotive-11.0.0_2.3.0" >
+   <project path="device/nxp" name="android-imx_device_fsl" remote="imx-android" revision="refs/tags/automotive-11.0.0_2.3.0" >
     <linkfile src="common/tools/imx-make.sh" dest="imx-make.sh" />
   </project>
-  <project path="vendor/nxp-opensource/imx" name="platform/hardware/imx" remote="android-imx-orig" revision="refs/tags/automotive-11.0.0_2.3.0" />
-  <project path="vendor/nxp-opensource/fsl_imx_demo" name="platform/packages/apps/fsl_imx_demo" remote="android-imx-orig" revision="refs/tags/automotive-11.0.0_2.3.0" />
-  <project path="hardware/nxp/libbt" name="platform/hardware/nxp/libbt" remote="android-imx-orig" revision="refs/tags/automotive-11.0.0_2.3.0" />
-  <project path="hardware/nxp/wlan" name="platform/hardware/nxp/wlan" remote="android-imx-orig" revision="refs/tags/automotive-11.0.0_2.3.0" />
+  <project path="vendor/nxp-opensource/imx" name="android-imx_platform_hardware_imx" remote="imx-android" revision="refs/tags/automotive-11.0.0_2.3.0" />
+  <project path="vendor/nxp-opensource/fsl_imx_demo" name="android-imx_platform_packages_apps_fsl_imx_demo" remote="imx-android" revision="refs/tags/automotive-11.0.0_2.3.0" />
+  <project path="hardware/nxp/libbt" name="android-imx_platform_hardware_nxp_libbt" remote="imx-android" revision="refs/tags/automotive-11.0.0_2.3.0" />
+  <project path="hardware/nxp/wlan" name="android-imx_platform_hardware_nxp_wlan" remote="imx-android" revision="refs/tags/automotive-11.0.0_2.3.0" />
 
 
   <!-- For imx changed aosp git. -->
-  <project path="system/bt" name="platform/system/bt" groups="pdk" remote="android-imx" revision="refs/tags/automotive-11.0.0_2.3.0" />
-  <project path="device/generic/car" name="device/generic/car" groups="pdk" remote="android-imx" revision="refs/tags/automotive-11.0.0_2.3.0" />
-  <project path="development" name="platform/development" groups="developers,pdk-cw-fs,pdk-fs" remote="android-imx" revision="refs/tags/automotive-11.0.0_2.3.0"/>
-  <project path="system/hardware/interfaces" name="platform/system/hardware/interfaces" groups="pdk" remote="android-imx" revision="refs/tags/automotive-11.0.0_2.3.0"/>
-  <project path="bootable/recovery" name="platform/bootable/recovery" groups="pdk" remote="android-imx" revision="refs/tags/automotive-11.0.0_2.3.0" />
-  <project path="frameworks/base" name="platform/frameworks/base" groups="pdk-cw-fs,pdk-fs" remote="android-imx" revision="refs/tags/automotive-11.0.0_2.3.0" />
-  <project path="frameworks/av" name="platform/frameworks/av" groups="pdk" remote="android-imx" revision="refs/tags/automotive-11.0.0_2.3.0" />
-  <project path="frameworks/native" name="platform/frameworks/native" groups="pdk" remote="android-imx" revision="refs/tags/automotive-11.0.0_2.3.0" />
-  <project path="frameworks/opt/net/wifi" name="platform/frameworks/opt/net/wifi" groups="pdk" remote="android-imx" revision="refs/tags/automotive-11.0.0_2.3.0" />
-  <project path="hardware/broadcom/libbt" name="platform/hardware/broadcom/libbt" groups="pdk" remote="android-imx" revision="refs/tags/automotive-11.0.0_2.3.0" />
-  <project path="hardware/google/camera" name="platform/hardware/google/camera" groups="pdk" remote="android-imx" revision="refs/tags/automotive-11.0.0_2.3.0" />
-  <project path="hardware/interfaces" name="platform/hardware/interfaces" groups="pdk" remote="android-imx" revision="refs/tags/automotive-11.0.0_2.3.0" />
-  <project path="hardware/qcom/bt" name="platform/hardware/qcom/bt" groups="qcom,pdk-qcom" remote="android-imx" revision="refs/tags/automotive-11.0.0_2.3.0" />
-  <project path="packages/apps/Bluetooth" name="platform/packages/apps/Bluetooth" groups="pdk-cw-fs,pdk-fs" remote="android-imx" revision="refs/tags/automotive-11.0.0_2.3.0" />
-  <project path="packages/apps/Camera2" name="platform/packages/apps/Camera2" groups="pdk-fs" remote="android-imx" revision="refs/tags/automotive-11.0.0_2.3.0" />
-  <project path="packages/apps/Car/Cluster" name="platform/packages/apps/Car/Cluster" groups="pdk-fs" remote="android-imx" revision="refs/tags/automotive-11.0.0_2.3.0" />
-  <project path="packages/apps/Gallery2" name="platform/packages/apps/Gallery2" groups="pdk-fs" remote="android-imx" revision="refs/tags/automotive-11.0.0_2.3.0" />
-  <project path="packages/apps/SoundRecorder" name="platform/packages/apps/SoundRecorder" groups="pdk-fs" remote="android-imx" revision="refs/tags/automotive-11.0.0_2.3.0" />
-  <project path="packages/modules/NetworkStack" name="platform/packages/modules/NetworkStack" groups="pdk-cw-fs,pdk-fs" remote="android-imx" revision="refs/tags/automotive-11.0.0_2.3.0" />
-  <project path="packages/services/Car" name="platform/packages/services/Car" groups="pdk-cw-fs,pdk-fs" remote="android-imx" revision="refs/tags/automotive-11.0.0_2.3.0" />
-  <project path="system/core" name="platform/system/core" groups="pdk" remote="android-imx" revision="refs/tags/automotive-11.0.0_2.3.0" />
-  <project path="system/keymaster" name="platform/system/keymaster" groups="pdk" remote="android-imx" revision="refs/tags/automotive-11.0.0_2.3.0" />
-  <project path="system/sepolicy" name="platform/system/sepolicy" groups="pdk" remote="android-imx" revision="refs/tags/automotive-11.0.0_2.3.0" />
-  <project path="system/memory/libion" name="platform/system/memory/libion" groups="pdk" remote="android-imx" revision="refs/tags/automotive-11.0.0_2.3.0"/>
-  <project path="system/memory/lmkd" name="platform/system/memory/lmkd" groups="pdk" remote="android-imx" revision="refs/tags/automotive-11.0.0_2.3.0"/>
-  <project path="kernel/configs" name="kernel/configs" groups="vts,pdk" remote="android-imx" revision="refs/tags/automotive-11.0.0_2.3.0" />
-
+<project path="bootable/recovery" name="aosp_platform_bootable_recovery" remote="imx-android" revision="refs/tags/automotive-11.0.0_2.3.0" />
+  <project path="development" name="aosp_platform_development" remote="imx-android" revision="refs/tags/automotive-11.0.0_2.3.0" />
+  <project path="external/perfetto" name="aosp_platform_external_perfetto" remote="imx-android" revision="refs/tags/automotive-11.0.0_2.3.0" />
+  <project path="external/tinyalsa" name="aosp_platform_external_tinyalsa" remote="imx-android" revision="refs/tags/automotive-11.0.0_2.3.0" />
+  <project path="external/tinycompress" name="aosp_platform_external_tinycompress" remote="imx-android" revision="refs/tags/automotive-11.0.0_2.3.0" />
+  <project path="external/wpa_supplicant_8" name="aosp_platform_external_wpa_supplicant_8" remote="imx-android" revision="refs/tags/automotive-11.0.0_2.3.0" />
+  <project path="frameworks/av" name="aosp_platform_frameworks_av" remote="imx-android" revision="refs/tags/automotive-11.0.0_2.3.0" />
+  <project path="frameworks/base" name="aosp_platform_frameworks_base" remote="imx-android" revision="refs/tags/automotive-11.0.0_2.3.0" />
+  <project path="frameworks/native" name="aosp_platform_frameworks_native" remote="imx-android" revision="refs/tags/automotive-11.0.0_2.3.0"/>
+  <project path="frameworks/opt/net/wifi" name="aosp_platform_frameworks_opt_net_wifi" remote="imx-android" revision="refs/tags/automotive-11.0.0_2.3.0" />
+  <project path="hardware/google/camera" name="aosp_platform_hardware_google_camera" remote="imx-android" revision="refs/tags/automotive-11.0.0_2.3.0" />
+  <project path="hardware/interfaces" name="aosp_platform_hardware_interfaces" remote="imx-android" revision="refs/tags/automotive-11.0.0_2.3.0" />
+  <project path="kernel/configs" name="aosp_kernel_configs" remote="imx-android" revision="refs/tags/automotive-11.0.0_2.3.0" />
+  <project path="packages/apps/Calendar" name="aosp_platform_packages_apps_Calendar" remote="imx-android" revision="refs/tags/automotive-11.0.0_2.3.0" />
+  <project path="packages/apps/Camera2" name="aosp_platform_packages_apps_Camera2" remote="imx-android" revision="refs/tags/automotive-11.0.0_2.3.0" />
+  <project path="packages/apps/Contacts" name="aosp_platform_packages_apps_Contacts" remote="imx-android" revision="refs/tags/automotive-11.0.0_2.3.0" />
+  <project path="packages/apps/Launcher3" name="aosp_platform_packages_apps_Launcher3" remote="imx-android" revision="refs/tags/automotive-11.0.0_2.3.0" />
+  <project path="packages/apps/Settings" name="aosp_platform_packages_apps_Settings" remote="imx-android" revision="refs/tags/automotive-11.0.0_2.3.0" />
+  <project path="packages/modules/Connectivity" name="aosp_platform_packages_modules_Connectivity" remote="imx-android" revision="refs/tags/automotive-11.0.0_2.3.0" />
+  <project path="system/core" name="aosp_platform_system_core" remote="imx-android" revision="refs/tags/automotive-11.0.0_2.3.0" />
+  <project path="system/extras" name="aosp_platform_system_extras" remote="imx-android" revision="refs/tags/automotive-11.0.0_2.3.0" />
+  <project path="system/libvintf" name="aosp_platform_system_libvintf" remote="imx-android" revision="refs/tags/automotive-11.0.0_2.3.0" />
+  <project path="system/memory/libion" name="aosp_platform_system_memory_libion" remote="imx-android" revision="refs/tags/automotive-11.0.0_2.3.0" />
+  <project path="system/sepolicy" name="aosp_platform_system_sepolicy" remote="imx-android" revision="refs/tags/automotive-11.0.0_2.3.0" />
+  <project path="system/teeui" name="aosp_platform_system_teeui" remote="imx-android" revision="refs/tags/automotive-11.0.0_2.3.0"/>
+  <project path="packages/inputmethods/LatinIME" name="aosp_platform_packages_inputmethods_LatinIME" remote="imx-android" revision="refs/tags/automotive-11.0.0_2.3.0"/>
+  <project path="packages/apps/Car/LocalMediaPlayer" name="aosp_platform_packages_apps_Car_LocalMediaPlayer" remote="imx-android" revision="refs/tags/automotive-11.0.0_2.3.0" />
+  <project path="packages/services/Car" name="aosp_platform_packages_services_Car" remote="imx-android" revision="refs/tags/automotive-11.0.0_2.3.0_gh" />
+  <project path="packages/modules/Bluetooth" name="aosp_platform_packages_modules_Bluetooth" remote="imx-android" revision="refs/tags/automotive-11.0.0_2.3.0" />
+  <project path="packages/modules/Wifi" name="aosp_platform_packages_modules_Wifi" remote="imx-android" revision="refs/tags/automotive-11.0.0_2.3.0"/>
   <!-- For 3rd party public git. -->
   <project path="external/glm" name="g-truc/glm" remote="github" revision="bf71a834948186f4097caa076cd2663c69a10e1e" />
 </manifest>