diff --git a/application_cpu/aos-rcar-gen4.yaml b/application_cpu/aos-rcar-gen4.yaml
index e64065e..36b8db5 100644
--- a/application_cpu/aos-rcar-gen4.yaml
+++ b/application_cpu/aos-rcar-gen4.yaml
@@ -47,10 +47,10 @@ common_data:
       url: "https://github.com/xen-troops/meta-xt-common.git"
       rev: "e27c46b"
     - type: git
-      url: "https://github.com/aoscloud/meta-aos-rcar-gen4.git"
+      url: "https://github.com/aosedge/meta-aos-rcar-gen4.git"
       rev: "v1.0.0"
     - type: git
-      url: https://github.com/aoscloud/meta-aos.git
+      url: https://github.com/aosedge/meta-aos.git
       rev: "v6.0.2"
   # Common configuration options for all yocto-based domains
   conf: &COMMON_CONF
diff --git a/application_cpu/build_xenhypervisor.sh b/application_cpu/build_xenhypervisor.sh
index 9f89ffa..e677a1e 100755
--- a/application_cpu/build_xenhypervisor.sh
+++ b/application_cpu/build_xenhypervisor.sh
@@ -66,13 +66,13 @@ if [[ ! -e "${SCRIPT_DIR}/work" || "$CLEAN_BUILD_FLAG" == "true" ]]; then
     #############################################
     # Remove meta-aos-rcar-gen from repo list
     PARTERN='    - type: git
-      url: "https://github.com/aoscloud/meta-aos-rcar-gen4.git"
+      url: "https://github.com/aosedge/meta-aos-rcar-gen4.git"
       rev: "v1.0.0"'
     sed -i -z "s|${PARTERN//$'\n'/\\n}||" ./aos-rcar-gen4-wb.yaml
 
     # Prepare additional repo
     mkdir -p ./yocto
-    git clone https://github.com/aoscloud/meta-aos-rcar-gen4 \
+    git clone https://github.com/aosedge/meta-aos-rcar-gen4 \
     ./yocto/meta-aos-rcar-gen4
     cd ./yocto/meta-aos-rcar-gen4
     git checkout ${AOS_VERSION}
diff --git a/application_cpu/meta-rcar-whitebox/meta-domd/recipes-aos/aos-communicationmanager/aos-communicationmanager_git.bbappend b/application_cpu/meta-rcar-whitebox/meta-domd/recipes-aos/aos-communicationmanager/aos-communicationmanager_git.bbappend
new file mode 100644
index 0000000..90ad81e
--- /dev/null
+++ b/application_cpu/meta-rcar-whitebox/meta-domd/recipes-aos/aos-communicationmanager/aos-communicationmanager_git.bbappend
@@ -0,0 +1 @@
+GO_IMPORT = "github.com/aosedge/aos_communicationmanager"
diff --git a/application_cpu/meta-rcar-whitebox/meta-domd/recipes-aos/aos-dnsname/aos-dnsname_git.bbappend b/application_cpu/meta-rcar-whitebox/meta-domd/recipes-aos/aos-dnsname/aos-dnsname_git.bbappend
new file mode 100644
index 0000000..d82a265
--- /dev/null
+++ b/application_cpu/meta-rcar-whitebox/meta-domd/recipes-aos/aos-dnsname/aos-dnsname_git.bbappend
@@ -0,0 +1 @@
+GO_IMPORT = "github.com/aosedge/aos_dnsname"
diff --git a/application_cpu/meta-rcar-whitebox/meta-domd/recipes-aos/aos-firewall/aos-firewall_git.bbappend b/application_cpu/meta-rcar-whitebox/meta-domd/recipes-aos/aos-firewall/aos-firewall_git.bbappend
new file mode 100644
index 0000000..b5330f6
--- /dev/null
+++ b/application_cpu/meta-rcar-whitebox/meta-domd/recipes-aos/aos-firewall/aos-firewall_git.bbappend
@@ -0,0 +1 @@
+GO_IMPORT = "github.com/aosedge/aos_firewall"
diff --git a/application_cpu/meta-rcar-whitebox/meta-domd/recipes-aos/aos-iamanager/aos-iamanager_git.bbappend b/application_cpu/meta-rcar-whitebox/meta-domd/recipes-aos/aos-iamanager/aos-iamanager_git.bbappend
index 6ff7c31..c78dc8c 100644
--- a/application_cpu/meta-rcar-whitebox/meta-domd/recipes-aos/aos-iamanager/aos-iamanager_git.bbappend
+++ b/application_cpu/meta-rcar-whitebox/meta-domd/recipes-aos/aos-iamanager/aos-iamanager_git.bbappend
@@ -6,3 +6,4 @@ do_install_append() {
     fi
 }
 
+GO_IMPORT = "github.com/aosedge/aos_iamanager"
diff --git a/application_cpu/meta-rcar-whitebox/meta-domd/recipes-aos/aos-servicemanager/aos-servicemanager_git.bbappend b/application_cpu/meta-rcar-whitebox/meta-domd/recipes-aos/aos-servicemanager/aos-servicemanager_git.bbappend
new file mode 100644
index 0000000..6957287
--- /dev/null
+++ b/application_cpu/meta-rcar-whitebox/meta-domd/recipes-aos/aos-servicemanager/aos-servicemanager_git.bbappend
@@ -0,0 +1 @@
+GO_IMPORT = "github.com/aosedge/aos_servicemanager"
diff --git a/application_cpu/meta-rcar-whitebox/meta-domd/recipes-aos/aos-updatemanager/aos-updatemanager_git.bbappend b/application_cpu/meta-rcar-whitebox/meta-domd/recipes-aos/aos-updatemanager/aos-updatemanager_git.bbappend
index b535b36..2a01080 100644
--- a/application_cpu/meta-rcar-whitebox/meta-domd/recipes-aos/aos-updatemanager/aos-updatemanager_git.bbappend
+++ b/application_cpu/meta-rcar-whitebox/meta-domd/recipes-aos/aos-updatemanager/aos-updatemanager_git.bbappend
@@ -6,3 +6,4 @@ do_install_append() {
     fi
 }
 
+GO_IMPORT = "github.com/aosedge/aos_updatemanager"
diff --git a/application_cpu/meta-rcar-whitebox/meta-domd/recipes-aos/aos-vis/aos-vis_git.bbappend b/application_cpu/meta-rcar-whitebox/meta-domd/recipes-aos/aos-vis/aos-vis_git.bbappend
new file mode 100644
index 0000000..06ff58c
--- /dev/null
+++ b/application_cpu/meta-rcar-whitebox/meta-domd/recipes-aos/aos-vis/aos-vis_git.bbappend
@@ -0,0 +1 @@
+GO_IMPORT = "github.com/aosedge/aos_vis"