diff --git a/meta-filesystems/recipes-filesystems/packageconfigs/packagegroup-meta-filesystems.bb b/meta-filesystems/recipes-filesystems/packageconfigs/packagegroup-meta-filesystems.bb
index 40f851364d..3a4b87a206 100644
--- a/meta-filesystems/recipes-filesystems/packageconfigs/packagegroup-meta-filesystems.bb
+++ b/meta-filesystems/recipes-filesystems/packageconfigs/packagegroup-meta-filesystems.bb
@@ -33,6 +33,8 @@ RDEPENDS:packagegroup-meta-filesystems = "\
     sshfs-fuse \
 "
 
+RDEPENDS:packagegroup-meta-filesystems:remove:riscv32 = "smbnetfs"
+
 RDEPENDS:packagegroup-meta-filesystems-support = "\
     fuse3 \
     fuse \
diff --git a/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb b/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb
index 1fa95dcc8e..cc0445aaed 100644
--- a/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb
+++ b/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb
@@ -68,6 +68,7 @@ RDEPENDS:packagegroup-meta-networking-connectivity = "\
 "
 
 RDEPENDS:packagegroup-meta-networking-connectivity:remove:libc-musl = "rdist"
+RDEPENDS:packagegroup-meta-networking-connectivity:remove:riscv32 = "samba"
 
 RDEPENDS:packagegroup-meta-networking-daemons = "\
     atftp \
@@ -246,6 +247,7 @@ RDEPENDS:packagegroup-meta-networking-support = "\
 "
 RDEPENDS:packagegroup-meta-networking-support:remove:mipsarch = "memcached"
 RDEPENDS:packagegroup-meta-networking-support:remove:riscv64 = "memcached"
+RDEPENDS:packagegroup-meta-networking-support:remove:riscv32 = "memcached"
 RDEPENDS:packagegroup-meta-networking-support:remove:libc-musl = "ypbind-mt"
 
 EXCLUDE_FROM_WORLD = "1"
diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
index d873a7b817..50b897181f 100644
--- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
@@ -212,6 +212,7 @@ RDEPENDS:packagegroup-meta-oe-dbs = "\
     soci \
 "
 RDEPENDS:packagegroup-meta-oe-dbs:remove:libc-musl:powerpc = "rocksdb"
+RDEPENDS:packagegroup-meta-oe-dbs:remove:riscv32 = "influxdb"
 
 RDEPENDS:packagegroup-meta-oe-devtools = "\
     abseil-cpp \
@@ -311,7 +312,7 @@ RDEPENDS:packagegroup-meta-oe-devtools:remove:powerpc = "android-tools breakpad
 RDEPENDS:packagegroup-meta-oe-devtools:remove:powerpc64 = "android-tools breakpad lshw luajit ply uftrace"
 RDEPENDS:packagegroup-meta-oe-devtools:remove:powerpc64le = "android-tools breakpad lshw luajit ply uftrace"
 RDEPENDS:packagegroup-meta-oe-devtools:remove:riscv64 = "breakpad concurrencykit lshw ltrace luajit nodejs ply"
-RDEPENDS:packagegroup-meta-oe-devtools:remove:riscv32 = "breakpad concurrencykit heaptrack lshw ltrace luajit nodejs ply uftrace"
+RDEPENDS:packagegroup-meta-oe-devtools:remove:riscv32 = "android-tools breakpad concurrencykit heaptrack lshw ltrace luajit nodejs ply uftrace"
 RDEPENDS:packagegroup-meta-oe-devtools:remove:libc-musl:riscv32 = "php"
 RDEPENDS:packagegroup-meta-oe-devtools:remove:aarch64 = "concurrencykit"
 RDEPENDS:packagegroup-meta-oe-devtools:remove:x86 = "ply"