diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f3ef7926b..e8079b0ec 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -90,7 +90,6 @@ jobs:
           echo "CC=clang" >> $GITHUB_ENV
           echo "CXX=clang++" >> $GITHUB_ENV
 
-          sudo dpkg --add-architecture i386
           sudo add-apt-repository ppa:openjdk-r/ppa
           sudo apt-get -qq update
           sudo apt-get -qq install -y --no-install-recommends \
@@ -244,7 +243,6 @@ jobs:
           echo "CC=clang" >> $GITHUB_ENV
           echo "CXX=clang++" >> $GITHUB_ENV
 
-          sudo dpkg --add-architecture i386
           sudo add-apt-repository ppa:openjdk-r/ppa
           sudo apt-get -qq update
           sudo apt-get -qq install -y --no-install-recommends \
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index e9687414e..34511211b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,13 +1,13 @@
 [versions]
 bnd = "6.4.0"
-bouncycastle = "1.67"
+bouncycastle = "1.84"
 caliper = "1.0-beta-2"
 errorprone = "2.31.0"
 jacoco = "0.8.12"
 jmh = "1.37"
 jmh-plugin = "0.7.2"
 junit = "4.13.2"
-mockito = "2.28.2"
+mockito = "4.11.0"
 netty-handler = "4.1.24.Final"
 netty-tcnative = "2.0.26.Final"
 shadow = "7.1.2"
@@ -22,8 +22,8 @@ shadow = { id = "com.github.johnrengelman.shadow", version.ref = "shadow" }
 caliper = { module = "com.google.caliper:caliper", version.ref = "caliper" }
 
 # Bouncycastle
-bouncycastle-apis = { module = "org.bouncycastle:bcpkix-jdk15on", version.ref = "bouncycastle" }
-bouncycastle-provider = { module = "org.bouncycastle:bcprov-jdk15on", version.ref = "bouncycastle" }
+bouncycastle-apis = { module = "org.bouncycastle:bcpkix-jdk18on", version.ref = "bouncycastle" }
+bouncycastle-provider = { module = "org.bouncycastle:bcprov-jdk18on", version.ref = "bouncycastle" }
 
 # Testing
 errorprone = { module = "com.google.errorprone:error_prone_core", version.ref = "errorprone" }