diff --git a/version.gradle b/version.gradle
index 34b53bb..6e2a3c4 100644
--- a/version.gradle
+++ b/version.gradle
@@ -16,10 +16,10 @@ allprojects {
         slf4jVersion = '1.7.36'
         logbackVersion = '1.2.11'
         mockitoVersion = '4.5.1'
-        pgpainlessVersion = '1.2.1'
-        pgpainlessCertDVersion = '0.1.2'
+        pgpainlessVersion = '1.3.12'
+        pgpainlessCertDVersion = '0.2.1'
         picocliVersion = '4.6.3'
-        certDJavaVersion = '0.1.1'
+        certDJavaVersion = '0.2.1'
         zbase32Version = '1.0.0'
     }
 }
diff --git a/wkd-java-cli/src/main/java/pgp/wkd/cli/PGPainlessCertificateParser.java b/wkd-java-cli/src/main/java/pgp/wkd/cli/PGPainlessCertificateParser.java
index 8aeb723..15a89fa 100644
--- a/wkd-java-cli/src/main/java/pgp/wkd/cli/PGPainlessCertificateParser.java
+++ b/wkd-java-cli/src/main/java/pgp/wkd/cli/PGPainlessCertificateParser.java
@@ -10,7 +10,7 @@ import org.bouncycastle.openpgp.PGPPublicKeyRingCollection;
 import org.pgpainless.PGPainless;
 import org.pgpainless.certificate_store.CertificateFactory;
 import org.pgpainless.key.info.KeyRingInfo;
-import pgp.certificate_store.Certificate;
+import pgp.certificate_store.certificate.Certificate;
 import pgp.wkd.CertificateAndUserIds;
 import pgp.wkd.discovery.CertificateParser;
 
@@ -27,7 +27,7 @@ public class PGPainlessCertificateParser implements CertificateParser {
             PGPPublicKeyRingCollection certificates = PGPainless.readKeyRing().publicKeyRingCollection(inputStream);
             for (PGPPublicKeyRing certificate : certificates) {
                 KeyRingInfo info = PGPainless.inspectKeyRing(certificate);
-                Certificate parsedCert = CertificateFactory.certificateFromPublicKeyRing(certificate);
+                Certificate parsedCert = CertificateFactory.certificateFromPublicKeyRing(certificate, 0L);
                 List<String> userIds = info.getValidAndExpiredUserIds();
                 certificatesAndUserIds.add(new CertificateAndUserIds(parsedCert, userIds));
             }
diff --git a/wkd-java/src/main/java/pgp/wkd/CertificateAndUserIds.java b/wkd-java/src/main/java/pgp/wkd/CertificateAndUserIds.java
index 5c0b606..f964805 100644
--- a/wkd-java/src/main/java/pgp/wkd/CertificateAndUserIds.java
+++ b/wkd-java/src/main/java/pgp/wkd/CertificateAndUserIds.java
@@ -4,7 +4,7 @@
 
 package pgp.wkd;
 
-import pgp.certificate_store.Certificate;
+import pgp.certificate_store.certificate.Certificate;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/wkd-java/src/main/java/pgp/wkd/RejectedCertificate.java b/wkd-java/src/main/java/pgp/wkd/RejectedCertificate.java
index 7a227b4..f96b85e 100644
--- a/wkd-java/src/main/java/pgp/wkd/RejectedCertificate.java
+++ b/wkd-java/src/main/java/pgp/wkd/RejectedCertificate.java
@@ -4,7 +4,8 @@
 
 package pgp.wkd;
 
-import pgp.certificate_store.Certificate;
+
+import pgp.certificate_store.certificate.Certificate;
 
 /**
  * A rejected OpenPGP certificate.
diff --git a/wkd-java/src/main/java/pgp/wkd/discovery/DiscoveryResponse.java b/wkd-java/src/main/java/pgp/wkd/discovery/DiscoveryResponse.java
index dc2ab99..d48a2ce 100644
--- a/wkd-java/src/main/java/pgp/wkd/discovery/DiscoveryResponse.java
+++ b/wkd-java/src/main/java/pgp/wkd/discovery/DiscoveryResponse.java
@@ -4,7 +4,7 @@
 
 package pgp.wkd.discovery;
 
-import pgp.certificate_store.Certificate;
+import pgp.certificate_store.certificate.Certificate;
 import pgp.wkd.RejectedCertificate;
 import pgp.wkd.WKDAddress;
 import pgp.wkd.exception.MissingPolicyFileException;
diff --git a/wkd-java/src/main/java/pgp/wkd/discovery/DiscoveryResult.java b/wkd-java/src/main/java/pgp/wkd/discovery/DiscoveryResult.java
index 0030812..6946891 100644
--- a/wkd-java/src/main/java/pgp/wkd/discovery/DiscoveryResult.java
+++ b/wkd-java/src/main/java/pgp/wkd/discovery/DiscoveryResult.java
@@ -4,7 +4,7 @@
 
 package pgp.wkd.discovery;
 
-import pgp.certificate_store.Certificate;
+import pgp.certificate_store.certificate.Certificate;
 import pgp.wkd.exception.CertNotFetchableException;
 
 import javax.annotation.Nonnull;
diff --git a/wkd-java/src/main/java/pgp/wkd/discovery/ValidatingCertificateDiscoverer.java b/wkd-java/src/main/java/pgp/wkd/discovery/ValidatingCertificateDiscoverer.java
index 2613ce8..09f6984 100644
--- a/wkd-java/src/main/java/pgp/wkd/discovery/ValidatingCertificateDiscoverer.java
+++ b/wkd-java/src/main/java/pgp/wkd/discovery/ValidatingCertificateDiscoverer.java
@@ -4,7 +4,7 @@
 
 package pgp.wkd.discovery;
 
-import pgp.certificate_store.Certificate;
+import pgp.certificate_store.certificate.Certificate;
 import pgp.wkd.CertificateAndUserIds;
 import pgp.wkd.exception.MissingPolicyFileException;
 import pgp.wkd.exception.RejectedCertificateException;
diff --git a/wkd-test-suite/src/main/java/pgp/wkd/test_suite/AbstractTestSuiteGenerator.java b/wkd-test-suite/src/main/java/pgp/wkd/test_suite/AbstractTestSuiteGenerator.java
index a27af24..99ad9b5 100644
--- a/wkd-test-suite/src/main/java/pgp/wkd/test_suite/AbstractTestSuiteGenerator.java
+++ b/wkd-test-suite/src/main/java/pgp/wkd/test_suite/AbstractTestSuiteGenerator.java
@@ -38,7 +38,7 @@ public class AbstractTestSuiteGenerator {
     }
 
     protected PGPSecretKeyRing secretKey(String userId) throws PGPException, InvalidAlgorithmParameterException, NoSuchAlgorithmException {
-        PGPSecretKeyRing secretKeys = PGPainless.generateKeyRing().modernKeyRing(userId, null);
+        PGPSecretKeyRing secretKeys = PGPainless.generateKeyRing().modernKeyRing(userId);
         return secretKeys;
     }