diff --git a/meta-ohos-blueprints/conf/distro/allscenarios-linux-blueprint-gateway.conf b/meta-ohos-blueprints/conf/distro/allscenarios-linux-blueprint-gateway.conf
index 9ac8e6743bdc04e0379fdcbf66683e31df6d8e72..ac4dff75c318764d64c79e7802b4ae2b0e28acb0 100644
--- a/meta-ohos-blueprints/conf/distro/allscenarios-linux-blueprint-gateway.conf
+++ b/meta-ohos-blueprints/conf/distro/allscenarios-linux-blueprint-gateway.conf
@@ -12,6 +12,13 @@ DISTRO_NAME = "All Scenarios OS Gateway Blueprint Linux Distro"
 # Custom hostnames for easy DNS resolution for this blueprint.
 hostname_base-files = "blueprint-gateway"
 
+#DISTRO_FEATURES_append = " thread-client"
+DISTRO_FEATURES_append = " thread-border-router"
+
+IMAGE_INSTALL_append = "\
+    packagegroup-thread-br \
+    packagegroup-thread-client \
+    "
 # Avoid build warning(s) for ununsed extra partitions.
 ST_VENDORFS = "0"
 ST_USERFS = "0"
diff --git a/meta-ohos-blueprints/recipes-core/images/blueprint-gateway-image.bb b/meta-ohos-blueprints/recipes-core/images/blueprint-gateway-image.bb
index 08ba5664bcbea56030ce053369b06dfe0dab6c22..2c31d8e6b02337447f045af3df82af54b00f77d4 100644
--- a/meta-ohos-blueprints/recipes-core/images/blueprint-gateway-image.bb
+++ b/meta-ohos-blueprints/recipes-core/images/blueprint-gateway-image.bb
@@ -7,10 +7,3 @@ require recipes-core/images/allscenarios-image-base.bb
 SUMMARY = "Gateway blueprint image"
 DESCRIPTION = "Smart home gateway device"
 LICENSE = "Apache-2.0"
-
-IMAGE_INSTALL_append = "\
-        ot-br-posix \
-        wpantund \
-        hostapd \
-        iptables \
-	"
diff --git a/meta-ohos-blueprints/recipes-core/packagegroups/packagegroup-connectivity.bbappend b/meta-ohos-blueprints/recipes-core/packagegroups/packagegroup-connectivity.bbappend
new file mode 100644
index 0000000000000000000000000000000000000000..d011e3ee2789e87b134ddd7a03ba56b437a754a0
--- /dev/null
+++ b/meta-ohos-blueprints/recipes-core/packagegroups/packagegroup-connectivity.bbappend
@@ -0,0 +1,19 @@
+# SPDX-FileCopyrightText: Huawei Inc.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+PACKAGES_append = "\
+    packagegroup-thread-br \
+    packagegroup-thread-client \
+    "
+
+RDEPENDS_packagegroup-thread-br = "\
+    ${@bb.utils.contains("DISTRO_FEATURES", "thread-border-router", "ot-br-posix", "", d)} \
+    ${@bb.utils.contains("DISTRO_FEATURES", "thread-border-router", "wpantund", "", d)} \
+    hostapd \
+    iptables \
+    "
+
+RDEPENDS_packagegroup-thread-client = "\
+    ${@bb.utils.contains("DISTRO_FEATURES", "thread-client", "ot-daemon", "", d)} \
+    "