diff --git a/meta-signing-key/classes/user-key-store.bbclass b/meta-signing-key/classes/user-key-store.bbclass
index c3ed1cf..6d749c0 100644
--- a/meta-signing-key/classes/user-key-store.bbclass
+++ b/meta-signing-key/classes/user-key-store.bbclass
@@ -29,10 +29,6 @@ def uks_ima_keys_dir(d):
     return d.getVar('IMA_KEYS_DIR', True) + '/'
 
 def uks_rpm_keys_dir(d):
-    # XXX: currently the user rpm pubkey is not supported.
-    if uks_signing_model(d) != 'sample':
-        return ''
-
     set_keys_dir('RPM', d)
     return d.getVar('RPM_KEYS_DIR', True) + '/'