diff --git a/meta-oniro-blueprints-eddie/recipes-apps/eddie/eddie_git.bb b/meta-oniro-blueprints-eddie/recipes-apps/eddie/eddie_git.bb
index 69756c37204a0ff06e50fde782dd781a3ca4dc3c..7a425f606f2c560e6c7dc49a67b52c8b6b734ee2 100644
--- a/meta-oniro-blueprints-eddie/recipes-apps/eddie/eddie_git.bb
+++ b/meta-oniro-blueprints-eddie/recipes-apps/eddie/eddie_git.bb
@@ -8,12 +8,12 @@ LICENSE = "Apache-2.0"
 
 LIC_FILES_CHKSUM = "file://LICENSES/Apache-2.0.txt;md5=ef3dabb8f39493f4ea410bebc1d01755"
 
-DEPENDS += "coap glib-2.0"
+DEPENDS += "libcoap glib-2.0"
 
 SRC_URI += "git://gitlab.eclipse.org/eclipse/oniro-core/eddie.git;protocol=https;branch=main \
             file://eddie-server.service"
 
-SRCREV = "9ba361241aabb6fe383e44e64b9f16d3f3740a63"
+SRCREV = "faa80b95fabdbf01f406ed3c41451cd8b1f16457"
 
 S = "${WORKDIR}/git"
 
diff --git a/meta-oniro-blueprints-eddie/recipes-apps/eddie/files/eddie-server.service b/meta-oniro-blueprints-eddie/recipes-apps/eddie/files/eddie-server.service
index b03d87f3eca44f4899a36687a76f651000375424..72791293e725a82d920b67159d63c479464020f1 100644
--- a/meta-oniro-blueprints-eddie/recipes-apps/eddie/files/eddie-server.service
+++ b/meta-oniro-blueprints-eddie/recipes-apps/eddie/files/eddie-server.service
@@ -3,12 +3,12 @@
 # SPDX-License-Identifier: Apache-2.0
 
 [Unit]
-Description=Eddie communication server
+Description=Eddie virtualization server
 After=network-online.target
 Wants=network-online.target
 
 [Service]
-ExecStart=eddie-server
+ExecStart=eddie-virt-server
 Restart=always
 RestartSec=5
 
diff --git a/meta-oniro-blueprints-eddie/recipes-apps/zenoh-c-examples/zenoh-c-examples_git.bb b/meta-oniro-blueprints-eddie/recipes-apps/zenoh-c-examples/zenoh-c-examples_git.bb
index 3ea777cfc2eb6cf7b86be547c7fad76280ffc0ad..eed1421123303b923b9f3968c74fb4ae2688e2fb 100644
--- a/meta-oniro-blueprints-eddie/recipes-apps/zenoh-c-examples/zenoh-c-examples_git.bb
+++ b/meta-oniro-blueprints-eddie/recipes-apps/zenoh-c-examples/zenoh-c-examples_git.bb
@@ -12,7 +12,7 @@ SRC_OPT_CLONE_DIR = "git/apps/zenoh-c-examples"
 SRC_OPT_DEST = "destsuffix=${SRC_OPT_CLONE_DIR}"
 
 SRC_OPTIONS = "${SRC_OPT_PROTO};${SRC_OPT_DEST};${SRC_OPT_BRANCH}"
-SRC_URI += "git://booting.oniroproject.org/francesco.pham/zenoh-c-client-example.git;${SRC_OPTIONS}"
+SRC_URI += "git://gitlab.eclipse.org/mrfrank/zenoh-c-client-example.git;${SRC_OPTIONS}"
 
 SRCREV = "43465198e8c9c21056ad734ee0f15ea0a5badaf8"
 
diff --git a/meta-oniro-blueprints-eddie/recipes-kernel/zephyr-kernel/zephyr-blueprint-eddie_git.bb b/meta-oniro-blueprints-eddie/recipes-kernel/zephyr-kernel/zephyr-blueprint-eddie_git.bb
index 5f95bdcfa2f74159963fcf24bff7618130ceecc9..b4f9c18223d5e14a8d89ebbda3c4d5dd7c0e9ddd 100644
--- a/meta-oniro-blueprints-eddie/recipes-kernel/zephyr-kernel/zephyr-blueprint-eddie_git.bb
+++ b/meta-oniro-blueprints-eddie/recipes-kernel/zephyr-kernel/zephyr-blueprint-eddie_git.bb
@@ -14,11 +14,11 @@ SRC_OPT_NAME = "name=eddie"
 SRC_OPT_BRANCH = "branch=main"
 
 SRC_OPTIONS = "${SRC_OPT_PROTO};${SRC_OPT_DEST};${SRC_OPT_NAME};${SRC_OPT_BRANCH}"
-SRC_URI += "git://gitlab.eclipse.org/mrfrank/eddie-zephyr.git;${SRC_OPTIONS}"
+SRC_URI += "git://gitlab.eclipse.org/eclipse/oniro-core/eddie.git;${SRC_OPTIONS}"
 
-SRCREV_eddie = "2a28abf6928f0aa76005335a378bbe695875dcdc"
+SRCREV_eddie = "faa80b95fabdbf01f406ed3c41451cd8b1f16457"
 
-ZEPHYR_SRC_DIR = "${S}/apps/eddie"
+ZEPHYR_SRC_DIR = "${S}/apps/eddie/zephyr"
 
 
 # The overlay config and OpenThread itself imposes some specific requirements