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
index 90ad81e..6b047fb 100644
--- 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
@@ -1 +1 @@
-GO_IMPORT = "github.com/aosedge/aos_communicationmanager"
+SRC_URI := "${@d.getVar('SRC_URI').replace('git@github.com/aoscloud', 'git@github.com/aosedge')}"
diff --git a/application_cpu/meta-rcar-whitebox/meta-domd/recipes-aos/aos-dnsname/aos-dnsname.bbappend b/application_cpu/meta-rcar-whitebox/meta-domd/recipes-aos/aos-dnsname/aos-dnsname.bbappend
index e58dbf1..6b047fb 100644
--- a/application_cpu/meta-rcar-whitebox/meta-domd/recipes-aos/aos-dnsname/aos-dnsname.bbappend
+++ b/application_cpu/meta-rcar-whitebox/meta-domd/recipes-aos/aos-dnsname/aos-dnsname.bbappend
@@ -1,2 +1 @@
-GO_IMPORT = "github.com/aosedge/aos_cni_dns"
-# GO_IMPORT = "github.com/aosedge/aos_dnsname"
+SRC_URI := "${@d.getVar('SRC_URI').replace('git@github.com/aoscloud', 'git@github.com/aosedge')}"
diff --git a/application_cpu/meta-rcar-whitebox/meta-domd/recipes-aos/aos-firewall/aos-firewall.bbappend b/application_cpu/meta-rcar-whitebox/meta-domd/recipes-aos/aos-firewall/aos-firewall.bbappend
index 519f8da..6b047fb 100644
--- a/application_cpu/meta-rcar-whitebox/meta-domd/recipes-aos/aos-firewall/aos-firewall.bbappend
+++ b/application_cpu/meta-rcar-whitebox/meta-domd/recipes-aos/aos-firewall/aos-firewall.bbappend
@@ -1,2 +1 @@
-# GO_IMPORT = "github.com/aosedge/aos_firewall"
-GO_IMPORT = "github.com/aosedge/aos_cni_firewall"
+SRC_URI := "${@d.getVar('SRC_URI').replace('git@github.com/aoscloud', 'git@github.com/aosedge')}"
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 c78dc8c..a97c3b2 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,4 +6,4 @@ do_install_append() {
     fi
 }
 
-GO_IMPORT = "github.com/aosedge/aos_iamanager"
+SRC_URI := "${@d.getVar('SRC_URI').replace('git@github.com/aoscloud', 'git@github.com/aosedge')}"
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
index 6957287..6b047fb 100644
--- 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
@@ -1 +1 @@
-GO_IMPORT = "github.com/aosedge/aos_servicemanager"
+SRC_URI := "${@d.getVar('SRC_URI').replace('git@github.com/aoscloud', 'git@github.com/aosedge')}"
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 a92bf50..4296e0a 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,16 +6,5 @@ do_install_append() {
     fi
 }
 
-GO_IMPORT = "github.com/aosedge/aos_updatemanager"
-
-do_prepare_modules() {
-   file="${S}/src/${GO_IMPORT}/updatemodules/modules.go"
-
-   echo 'package updatemodules' > ${file}
-   echo 'import (' >> ${file}
-   for module in ${AOS_UM_UPDATE_MODULES}; do
-       echo "\t_ \"github.com/aoscloud/aos_updatemanager/${module}\"" >> ${file}
-   done
-   echo ')' >> ${file}
-}
+SRC_URI := "${@d.getVar('SRC_URI').replace('git@github.com/aoscloud', 'git@github.com/aosedge')}"
 
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
index 06ff58c..6b047fb 100644
--- 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
@@ -1 +1 @@
-GO_IMPORT = "github.com/aosedge/aos_vis"
+SRC_URI := "${@d.getVar('SRC_URI').replace('git@github.com/aoscloud', 'git@github.com/aosedge')}"