diff --git a/conf/layer.conf b/conf/layer.conf
index ffe1550..dd36045 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -23,7 +23,6 @@ BBFILES_DYNAMIC += " \
 
 LAYERSERIES_COMPAT_riscv-layer = "gatesgarth hardknott"
 
-INSANE_SKIP_append_pn-cmocka_riscv64 = " textrel"
 INSANE_SKIP_append_pn-eudev_riscv64 = " textrel"
 INSANE_SKIP_append_pn-gdb_riscv64 = " textrel"
 INSANE_SKIP_append_pn-perf_riscv64 = " textrel"
@@ -38,37 +37,39 @@ INSANE_SKIP_append_pn-tipcutils_riscv64 = " textrel"
 INSANE_SKIP_append_pn-zabbix_riscv64 = " textrel"
 INSANE_SKIP_append_pn-xfsdump_riscv64 = " textrel"
 INSANE_SKIP_append_pn-capnproto_riscv64 = " textrel"
-INSANE_SKIP_append_pn-monkey_riscv64 = " textrel"
 INSANE_SKIP_append_pn-netdata_riscv64 = " textrel"
 INSANE_SKIP_append_pn-ltp_riscv64 = " textrel"
 INSANE_SKIP_append_pn-opensaf_riscv64 = " textrel"
 INSANE_SKIP_append_pn-rdma-core_riscv64 = " textrel"
-INSANE_SKIP_append_pn-util-linux_riscv64 = " textrel"
 INSANE_SKIP_append_pn-doxygen_riscv64 = " textrel"
 INSANE_SKIP_append_pn-poppler_riscv64 = " textrel"
+# Only seen when build with gcc
+INSANE_SKIP_append_pn-util-linux_riscv64 = " textrel"
+# Only seen when build with gcc
+INSANE_SKIP_append_pn-cmocka_riscv64 = " textrel"
 
-INSANE_SKIP_append_pn-cmocka_riscv32 = " textrel"
 INSANE_SKIP_append_pn-xfsdump_riscv32 = " textrel"
 INSANE_SKIP_append_pn-zabbix_riscv32 = " textrel"
 INSANE_SKIP_append_pn-netdata_riscv32 = " textrel"
 INSANE_SKIP_append_pn-tipcutils_riscv32 = " textrel"
 INSANE_SKIP_append_pn-tvheadend_riscv32 = " textrel"
-INSANE_SKIP_append_pn-monkey_riscv32 = " textrel"
 INSANE_SKIP_append_pn-eudev_riscv32 = " textrel"
 INSANE_SKIP_append_pn-dracut_riscv32 = " textrel"
 INSANE_SKIP_append_pn-rt-tests_riscv32 = " textrel"
 INSANE_SKIP_append_pn-gdb_riscv32 = " textrel"
 INSANE_SKIP_append_pn-capnproto_riscv32 = " textrel"
 INSANE_SKIP_append_pn-rdma-core_riscv32 = " textrel"
-INSANE_SKIP_append_pn-util-linux_riscv32 = " textrel"
 INSANE_SKIP_append_pn-ltp_riscv32 = " textrel"
 INSANE_SKIP_append_pn-poppler_riscv32 = " textrel"
 INSANE_SKIP_append_pn-qtbase_riscv32 = " textrel"
-INSANE_SKIP_append_pn-gerbera_riscv32 = " textrel"
 INSANE_SKIP_append_pn-opensaf_riscv32 = " textrel"
 INSANE_SKIP_append_pn-doxygen_riscv32 = " textrel"
 INSANE_SKIP_append_pn-opengl-es-cts_riscv32 = " textrel"
 INSANE_SKIP_append_pn-perf_riscv32 = " textrel"
+# Only seen when build with gcc
+INSANE_SKIP_append_pn-cmocka_riscv32 = " textrel"
+# Only seen when build with gcc
+INSANE_SKIP_append_pn-util-linux_riscv32 = " textrel"
 
 # These recipe dont _yet_ build for rv32
 COMPATIBLE_HOST_pn-openh264_riscv32 = "null"