diff --git a/recipes-core/packagegroups/packagegroup-core-eclipse-debug.bbappend b/recipes-core/packagegroups/packagegroup-core-eclipse-debug.bbappend
new file mode 100644
index 0000000..177bcbd
--- /dev/null
+++ b/recipes-core/packagegroups/packagegroup-core-eclipse-debug.bbappend
@@ -0,0 +1 @@
+EXCLUDE_FROM_WORLD = "1"
diff --git a/recipes-core/packagegroups/packagegroup-self-hosted.bbappend b/recipes-core/packagegroups/packagegroup-self-hosted.bbappend
new file mode 100644
index 0000000..1478603
--- /dev/null
+++ b/recipes-core/packagegroups/packagegroup-self-hosted.bbappend
@@ -0,0 +1,3 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+RDEPENDS_packagegroup-self-hosted-debug_remove_riscv32 = "strace tcf-agent"