diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/hv-daemons/files/hv_fcopy_uio_daemon.service b/sdk_container/src/third_party/coreos-overlay/app-emulation/hv-daemons/files/hv_fcopy_uio_daemon.service
new file mode 100644
index 0000000000..f12c7ea1bd
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/hv-daemons/files/hv_fcopy_uio_daemon.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Hyper-V FCOPY UIO daemon
+ConditionPathExists=/sys/bus/vmbus/devices/eb765408-105f-49b6-b4aa-c123b64d17d4/uio
+
+[Service]
+ExecStart=/usr/bin/hv_fcopy_uio_daemon --no-daemon
+
+[Install]
+WantedBy=multi-user.target
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/hv-daemons/hv-daemons-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/hv-daemons/hv-daemons-9999.ebuild
index 9b6b44dba9..30efe5edc9 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/hv-daemons/hv-daemons-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/hv-daemons/hv-daemons-9999.ebuild
@@ -13,20 +13,19 @@ if [[ "${PV}" == 9999 ]]; then
 fi
 
 src_compile() {
-    # Build hv_vss_daemon, hv_kvp_daemon, hv_fcopy_daemon 
+    # Build hv_vss_daemon, hv_kvp_daemon, hv_fcopy_daemon
     kmake tools/hv
 }
 
 src_install() {
-    dobin "${S}/build/tools/hv/hv_fcopy_daemon"
-    dobin "${S}/build/tools/hv/hv_kvp_daemon"
-    dobin "${S}/build/tools/hv/hv_vss_daemon"
-
-    systemd_dounit "${FILESDIR}/hv_fcopy_daemon.service"
-    systemd_dounit "${FILESDIR}/hv_kvp_daemon.service"
-    systemd_dounit "${FILESDIR}/hv_vss_daemon.service"
-
-    systemd_enable_service "multi-user.target" "hv_fcopy_daemon.service"
-    systemd_enable_service "multi-user.target" "hv_kvp_daemon.service"
-    systemd_enable_service "multi-user.target" "hv_vss_daemon.service"
+    local -a HV_DAEMONS=(hv_vss_daemon hv_kvp_daemon hv_fcopy_daemon hv_fcopy_uio_daemon)
+    local HV_DAEMON
+    for HV_DAEMON in "$HV_DAEMONS[@]"
+    do
+        if [ -f "${S}/build/tools/hv/${HV_DAEMON}" ]; then
+            dobin "${S}/build/tools/hv/${HV_DAEMON}"
+            systemd_dounit "${FILESDIR}/${HV_DAEMON}.service"
+            systemd_enable_service "multi-user.target" "${HV_DAEMON}.service"
+        fi
+    done
 }
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-6.12.20.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-6.12.20.ebuild
index a5813f4c46..5e33b6ee4d 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-6.12.20.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-6.12.20.ebuild
@@ -42,4 +42,5 @@ UNIPATCH_LIST="
 	${PATCH_DIR}/z0005-efi-lock-down-the-kernel-if-booted-in-secure-boot-mo.patch \
 	${PATCH_DIR}/z0006-mtd-disable-slram-and-phram-when-locked-down.patch \
 	${PATCH_DIR}/z0007-arm64-add-kernel-config-option-to-lock-down-when.patch \
+	${PATCH_DIR}/z0008-tools-hv-fix-cross-compilation-for-ARM64.patch \
 "