diff --git a/appends/oe-core/openssh_%.bbappend b/appends/oe-core/openssh_%.bbappend
new file mode 100644
index 0000000..845414e
--- /dev/null
+++ b/appends/oe-core/openssh_%.bbappend
@@ -0,0 +1,2 @@
+RRECOMMENDS_${PN}-sshd_remove_class-target = "rng-tools"
+
diff --git a/conf/distro/mortsgna.conf b/conf/distro/mortsgna.conf
index c6ccd42..c8808c2 100644
--- a/conf/distro/mortsgna.conf
+++ b/conf/distro/mortsgna.conf
@@ -114,8 +114,10 @@ ENABLE_BINARY_LOCALE_GENERATION_ep9312 = "0"
 ENABLE_BINARY_LOCALE_GENERATION_armeb = "0"
 
 # blacklist policy
-PNBLACKLIST[pn-fso-apm]       = "regular apmd is good enough"
+PNBLACKLIST[pn-fso-apm] = "regular apmd is good enough"
 
+# warrior specific - on master there might come times they do the right thing...
+PNBLACKLIST[rng-tools] = "blocks shutdown and no issues found for openssl"
 
 ###############################################################################
 # Quality & security hardening