diff --git a/README.md b/README.md
index 496e9f7..1d26f19 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,9 @@ Changelog
 ---------
 
 ### main
+  * rpki-commons 1.39.1
+  * Updated gradle plugins (to fix build warnings)
+  * Updated gradle version in gradle wrapper
 
 ### v0.4.0
   * **hotfix** fix bug in manifest this/nextUpdate calculation
diff --git a/build.gradle b/build.gradle
index 76ad408..5d685db 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,9 +1,9 @@
 plugins {
     id 'application'
     id 'jacoco'
-    id 'io.freefair.lombok' version '8.1.0'
-    id 'org.sonarqube' version '3.5.0.2730'
-    id 'com.google.cloud.tools.jib' version '3.3.2'
+    id 'io.freefair.lombok' version '8.6'
+    id 'org.sonarqube' version '5.0.0.4638'
+    id 'com.google.cloud.tools.jib' version '3.4.2'
 }
 
 repositories {
@@ -35,7 +35,7 @@ version = ENV['RELEASE_VERSION'] ?: gitRef()
 description = 'RIPE NCC Trust Anchor'
 
 dependencies {
-    implementation 'net.ripe.rpki:rpki-commons:1.35'
+    implementation 'net.ripe.rpki:rpki-commons:1.39.1'
     implementation 'commons-cli:commons-cli:1.6.0'
     implementation 'org.slf4j:slf4j-api:2.0.7'
     runtimeOnly 'org.slf4j:slf4j-simple:2.0.7'
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 9f4197d..b82aa23 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/src/main/java/net/ripe/rpki/ta/TA.java b/src/main/java/net/ripe/rpki/ta/TA.java
index 9452a0c..9a2e1f6 100644
--- a/src/main/java/net/ripe/rpki/ta/TA.java
+++ b/src/main/java/net/ripe/rpki/ta/TA.java
@@ -454,8 +454,7 @@ private X509Crl createNewCrl(final SignCtx signCtx) {
                 .withAuthorityKeyIdentifier(signCtx.keyPair.getPublic())
                 .withNumber(nextCrlNumber(signCtx.taState))
                 .withIssuerDN(issuer)
-                .withThisUpdateTime(validityPeriod.getNotValidBefore())
-                .withNextUpdateTime(validityPeriod.getNotValidAfter())
+                .withValidityPeriod(validityPeriod)
                 .withSignatureProvider(getSignatureProvider());
         fillRevokedObjects(builder, signCtx.taState.getSignedProductionCertificates());
         fillRevokedObjects(builder, signCtx.taState.getPreviousTaCertificates());
@@ -548,8 +547,7 @@ private ManifestCmsBuilder createBasicManifestBuilder(X509ResourceCertificate ee
         ValidityPeriod validityPeriod = validityPeriods.manifest();
         return new ManifestCmsBuilder().
                 withCertificate(eeCertificate)
-                .withThisUpdateTime(validityPeriod.getNotValidBefore())
-                .withNextUpdateTime(validityPeriod.getNotValidAfter())
+                .withValidityPeriod(validityPeriod)
                 .withManifestNumber(nextManifestNumber(signCtx.taState))
                 .withSignatureProvider(getSignatureProvider());
     }