diff --git a/conf/distro/include/rdkv.inc b/conf/distro/include/rdkv.inc
index af18e2e4..8e7d944f 100644
--- a/conf/distro/include/rdkv.inc
+++ b/conf/distro/include/rdkv.inc
@@ -141,3 +141,7 @@ DISTRO_FEATURES:append = " ENABLE_NETWORKMANAGER"
 
 #Distro feature for WPEFramework SecurityUtility Disable
 DISTRO_FEATURES:append = " wpe_security_util_disable"
+
+#RDK-SSA Generic daemon and ca provider with PKCS11 support
+DISTRO_FEATURES:remove = "ssacertifier"
+DISTRO_FEATURES:append = " rdkvgenericssa"