diff --git a/pgpainless-core/build.gradle b/pgpainless-core/build.gradle
index e6947458..6cb6faa5 100644
--- a/pgpainless-core/build.gradle
+++ b/pgpainless-core/build.gradle
@@ -15,8 +15,9 @@ dependencies {
     api "org.slf4j:slf4j-api:$slf4jVersion"
     testImplementation "ch.qos.logback:logback-classic:$logbackVersion"
 
-    api "org.bouncycastle:bcprov-jdk15on:$bouncyCastleVersion"
-    api "org.bouncycastle:bcpg-jdk15on:$bouncyCastleVersion"
+    // Bouncy Castle
+    api "org.bouncycastle:bcprov-jdk15to18:$bouncyCastleVersion"
+    api "org.bouncycastle:bcpg-jdk15to18:$bouncyCastleVersion"
 
     // https://mvnrepository.com/artifact/com.google.code.findbugs/jsr305
     implementation group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2'
diff --git a/version.gradle b/version.gradle
index 3b633561..2d2d8941 100644
--- a/version.gradle
+++ b/version.gradle
@@ -8,6 +8,6 @@ allprojects {
         isSnapshot = true
         pgpainlessMinAndroidSdk = 10
         javaSourceCompatibility = 1.8
-        bouncyCastleVersion = '1.70'
+        bouncyCastleVersion = '1.71'
     }
 }