diff --git a/pgpainless-sop/src/main/kotlin/org/pgpainless/sop/GenerateKeyImpl.kt b/pgpainless-sop/src/main/kotlin/org/pgpainless/sop/GenerateKeyImpl.kt
index ca9cb98a..3d914946 100644
--- a/pgpainless-sop/src/main/kotlin/org/pgpainless/sop/GenerateKeyImpl.kt
+++ b/pgpainless-sop/src/main/kotlin/org/pgpainless/sop/GenerateKeyImpl.kt
@@ -92,7 +92,7 @@ class GenerateKeyImpl(private val api: PGPainless) : GenerateKey {
         val keyBuilder: KeyRingBuilder =
             when (profile) {
                 CURVE25519_PROFILE.name ->
-                    PGPainless.buildKeyRing()
+                    api.buildKey()
                         .setPrimaryKey(
                             KeySpec.getBuilder(
                                 KeyType.EDDSA_LEGACY(EdDSALegacyCurve._Ed25519),
@@ -110,7 +110,7 @@ class GenerateKeyImpl(private val api: PGPainless) : GenerateKey {
                             }
                         }
                 RSA4096_PROFILE.name -> {
-                    PGPainless.buildKeyRing()
+                    api.buildKey()
                         .setPrimaryKey(
                             KeySpec.getBuilder(KeyType.RSA(RsaLength._4096), KeyFlag.CERTIFY_OTHER))
                         .addSubkey(