diff --git a/meta-oniro-core/conf/distro/oniro-linux.conf b/meta-oniro-core/conf/distro/oniro-linux.conf
index 1667d080ffec036d62cf80649fb4de9647b2bf7b..0ce27d0bcc4a05c6de23939b05988b81b8029727 100644
--- a/meta-oniro-core/conf/distro/oniro-linux.conf
+++ b/meta-oniro-core/conf/distro/oniro-linux.conf
@@ -122,3 +122,6 @@ ROOTFS_RO_UNNEEDED:remove = "shadow"
 
 # Set default hostname to reflect the DISTRO
 hostname:pn-base-files = "${DISTRO}-${MACHINE}"
+
+# Workaround for https://bugzilla.yoctoproject.org/show_bug.cgi?id=14858
+PACKAGE_EXCLUDE_COMPLEMENTARY:append = " openssh"
diff --git a/meta-oniro-core/recipes-core/images/oniro-image-extra-tests.bb b/meta-oniro-core/recipes-core/images/oniro-image-extra-tests.bb
index 3d8d30e7dbd2847a3a69a4f020ac0b40b08ebfef..480956cb9e4440567b27611ea4653719b3ffb190 100644
--- a/meta-oniro-core/recipes-core/images/oniro-image-extra-tests.bb
+++ b/meta-oniro-core/recipes-core/images/oniro-image-extra-tests.bb
@@ -18,5 +18,3 @@ EXTRA_IMAGE_FEATURES:append = " ptest-pkgs debug-tweaks"
 # filesystem.
 IMAGE_FSTYPES:append = " ext4"
 
-# Workaround for https://bugzilla.yoctoproject.org/show_bug.cgi?id=14858
-PACKAGE_EXCLUDE_COMPLEMENTARY:append = " openssh "
diff --git a/meta-oniro-core/recipes-core/packagegroups/packagegroup-connectivity.bb b/meta-oniro-core/recipes-core/packagegroups/packagegroup-connectivity.bb
index 70b5db7f4fa03903a2b239690b569071dd41a3a9..1e84b6d4d5fa18dd796f4a42740613b72e010053 100644
--- a/meta-oniro-core/recipes-core/packagegroups/packagegroup-connectivity.bb
+++ b/meta-oniro-core/recipes-core/packagegroups/packagegroup-connectivity.bb
@@ -14,6 +14,7 @@ PACKAGES = "\
 
 RDEPENDS:packagegroup-net-essentials = "\
 	dropbear \
+	openssh-sftp-server \
 	${@bb.utils.contains("COMBINED_FEATURES", "wifi", "packagegroup-base-wifi iw", "", d)} \
 	networkmanager \
 	networkmanager-nmcli \