diff --git a/src/JavaFileStorageBindings/Jars/okhttp-3.9.0.jar b/src/JavaFileStorageBindings/Jars/okhttp-3.9.0.jar
deleted file mode 100644
index 58ad4beb..00000000
Binary files a/src/JavaFileStorageBindings/Jars/okhttp-3.9.0.jar and /dev/null differ
diff --git a/src/JavaFileStorageBindings/Jars/okhttp-4.2.2.jar b/src/JavaFileStorageBindings/Jars/okhttp-4.2.2.jar
new file mode 100644
index 00000000..5b448ef7
Binary files /dev/null and b/src/JavaFileStorageBindings/Jars/okhttp-4.2.2.jar differ
diff --git a/src/JavaFileStorageBindings/Jars/okhttp-digest-1.15.jar b/src/JavaFileStorageBindings/Jars/okhttp-digest-1.15.jar
new file mode 100644
index 00000000..d0f3b0f3
Binary files /dev/null and b/src/JavaFileStorageBindings/Jars/okhttp-digest-1.15.jar differ
diff --git a/src/JavaFileStorageBindings/Jars/okhttp-digest-1.7.jar b/src/JavaFileStorageBindings/Jars/okhttp-digest-1.7.jar
deleted file mode 100644
index 51940394..00000000
Binary files a/src/JavaFileStorageBindings/Jars/okhttp-digest-1.7.jar and /dev/null differ
diff --git a/src/JavaFileStorageBindings/Jars/okio-1.13.0.jar b/src/JavaFileStorageBindings/Jars/okio-1.13.0.jar
deleted file mode 100644
index 02c302f8..00000000
Binary files a/src/JavaFileStorageBindings/Jars/okio-1.13.0.jar and /dev/null differ
diff --git a/src/JavaFileStorageBindings/Jars/okio-2.2.2.jar b/src/JavaFileStorageBindings/Jars/okio-2.2.2.jar
new file mode 100644
index 00000000..3bbf00fe
Binary files /dev/null and b/src/JavaFileStorageBindings/Jars/okio-2.2.2.jar differ
diff --git a/src/JavaFileStorageBindings/JavaFileStorageBindings.csproj b/src/JavaFileStorageBindings/JavaFileStorageBindings.csproj
index 3474aa6e..c7bba096 100644
--- a/src/JavaFileStorageBindings/JavaFileStorageBindings.csproj
+++ b/src/JavaFileStorageBindings/JavaFileStorageBindings.csproj
@@ -84,9 +84,6 @@
   <ItemGroup>
     <ProjectReference Include="..\PCloudBindings\PCloudBindings.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedReferenceJar Include="Jars\okhttp-digest-1.7.jar" />
-  </ItemGroup>
   <ItemGroup>
     <EmbeddedReferenceJar Include="Jars\msa-auth-0.8.6\classes-msa-auth.jar" />
   </ItemGroup>
@@ -141,16 +138,19 @@
   <ItemGroup>
     <EmbeddedReferenceJar Include="Jars\jackson-core-2.7.4.jar" />
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedReferenceJar Include="Jars\okhttp-3.9.0.jar" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedReferenceJar Include="Jars\okio-1.13.0.jar" />
-  </ItemGroup>
   <ItemGroup>
     <EmbeddedJar Include="Jars\dropbox-core-sdk-3.1.1.jar" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedReferenceJar Include="Jars\gson-2.8.1.jar" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedReferenceJar Include="Jars\okhttp-4.2.2.jar" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedReferenceJar Include="Jars\okhttp-digest-1.15.jar" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedReferenceJar Include="Jars\okio-2.2.2.jar" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/java/JavaFileStorage/app/build.gradle b/src/java/JavaFileStorage/app/build.gradle
index 98f2bb4a..65fc0ce7 100644
--- a/src/java/JavaFileStorage/app/build.gradle
+++ b/src/java/JavaFileStorage/app/build.gradle
@@ -26,8 +26,8 @@ NOTE: If you change dependencies here, don't forget to update the jar files in J
  */
 
 dependencies {
-    compile 'com.squareup.okhttp3:okhttp:3.9.0'
-    compile 'com.burgstaller:okhttp-digest:1.7'
+    compile 'com.squareup.okhttp3:okhttp:4.2.2'
+    compile 'com.burgstaller:okhttp-digest:1.15'
     compile 'com.google.android.gms:play-services:4.0.30'
     compile 'com.google.http-client:google-http-client-gson:1.20.0'
     compile('com.google.api-client:google-api-client-android:1.16.0-rc') {
diff --git a/src/keepass2android/keepass2android.csproj b/src/keepass2android/keepass2android.csproj
index c8216da6..83d01a02 100644
--- a/src/keepass2android/keepass2android.csproj
+++ b/src/keepass2android/keepass2android.csproj
@@ -262,6 +262,15 @@
       <HintPath>..\packages\Xamarin.GooglePlayServices.Drive.27.0.0.0\lib\MonoAndroid41\Xamarin.GooglePlayServices.Drive.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="Xamarin.Jetbrains.Annotations, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Xamarin.Jetbrains.Annotations.13.0.0.1\lib\monoandroid90\Xamarin.Jetbrains.Annotations.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.Kotlin.StdLib, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Xamarin.Kotlin.StdLib.1.3.50.1\lib\monoandroid90\Xamarin.Kotlin.StdLib.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.Kotlin.StdLib.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Xamarin.Kotlin.StdLib.Common.1.3.50.1\lib\monoandroid90\Xamarin.Kotlin.StdLib.Common.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ActivityLaunchMode.cs" />
@@ -2076,6 +2085,9 @@
     <Error Condition="!Exists('..\packages\Xamarin.Android.Support.v7.AppCompat.28.0.0.1\build\monoandroid90\Xamarin.Android.Support.v7.AppCompat.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Android.Support.v7.AppCompat.28.0.0.1\build\monoandroid90\Xamarin.Android.Support.v7.AppCompat.targets'))" />
     <Error Condition="!Exists('..\packages\Xamarin.Android.Support.v7.RecyclerView.28.0.0.1\build\monoandroid90\Xamarin.Android.Support.v7.RecyclerView.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Android.Support.v7.RecyclerView.28.0.0.1\build\monoandroid90\Xamarin.Android.Support.v7.RecyclerView.targets'))" />
     <Error Condition="!Exists('..\packages\Xamarin.Android.Support.Design.28.0.0.1\build\monoandroid90\Xamarin.Android.Support.Design.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Android.Support.Design.28.0.0.1\build\monoandroid90\Xamarin.Android.Support.Design.targets'))" />
+    <Error Condition="!Exists('..\packages\Xamarin.Jetbrains.Annotations.13.0.0.1\build\monoandroid90\Xamarin.Jetbrains.Annotations.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Jetbrains.Annotations.13.0.0.1\build\monoandroid90\Xamarin.Jetbrains.Annotations.targets'))" />
+    <Error Condition="!Exists('..\packages\Xamarin.Kotlin.StdLib.Common.1.3.50.1\build\monoandroid90\Xamarin.Kotlin.StdLib.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Kotlin.StdLib.Common.1.3.50.1\build\monoandroid90\Xamarin.Kotlin.StdLib.Common.targets'))" />
+    <Error Condition="!Exists('..\packages\Xamarin.Kotlin.StdLib.1.3.50.1\build\monoandroid90\Xamarin.Kotlin.StdLib.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Kotlin.StdLib.1.3.50.1\build\monoandroid90\Xamarin.Kotlin.StdLib.targets'))" />
   </Target>
   <Import Project="..\packages\Xamarin.Build.Download.0.4.2\build\Xamarin.Build.Download.targets" Condition="Exists('..\packages\Xamarin.Build.Download.0.4.2\build\Xamarin.Build.Download.targets')" />
   <Import Project="..\packages\Xamarin.Android.Support.Annotations.28.0.0.1\build\monoandroid90\Xamarin.Android.Support.Annotations.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Annotations.28.0.0.1\build\monoandroid90\Xamarin.Android.Support.Annotations.targets')" />
@@ -2116,4 +2128,7 @@
   <Import Project="..\packages\Xamarin.Android.Support.v7.AppCompat.28.0.0.1\build\monoandroid90\Xamarin.Android.Support.v7.AppCompat.targets" Condition="Exists('..\packages\Xamarin.Android.Support.v7.AppCompat.28.0.0.1\build\monoandroid90\Xamarin.Android.Support.v7.AppCompat.targets')" />
   <Import Project="..\packages\Xamarin.Android.Support.v7.RecyclerView.28.0.0.1\build\monoandroid90\Xamarin.Android.Support.v7.RecyclerView.targets" Condition="Exists('..\packages\Xamarin.Android.Support.v7.RecyclerView.28.0.0.1\build\monoandroid90\Xamarin.Android.Support.v7.RecyclerView.targets')" />
   <Import Project="..\packages\Xamarin.Android.Support.Design.28.0.0.1\build\monoandroid90\Xamarin.Android.Support.Design.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Design.28.0.0.1\build\monoandroid90\Xamarin.Android.Support.Design.targets')" />
+  <Import Project="..\packages\Xamarin.Jetbrains.Annotations.13.0.0.1\build\monoandroid90\Xamarin.Jetbrains.Annotations.targets" Condition="Exists('..\packages\Xamarin.Jetbrains.Annotations.13.0.0.1\build\monoandroid90\Xamarin.Jetbrains.Annotations.targets')" />
+  <Import Project="..\packages\Xamarin.Kotlin.StdLib.Common.1.3.50.1\build\monoandroid90\Xamarin.Kotlin.StdLib.Common.targets" Condition="Exists('..\packages\Xamarin.Kotlin.StdLib.Common.1.3.50.1\build\monoandroid90\Xamarin.Kotlin.StdLib.Common.targets')" />
+  <Import Project="..\packages\Xamarin.Kotlin.StdLib.1.3.50.1\build\monoandroid90\Xamarin.Kotlin.StdLib.targets" Condition="Exists('..\packages\Xamarin.Kotlin.StdLib.1.3.50.1\build\monoandroid90\Xamarin.Kotlin.StdLib.targets')" />
 </Project>
\ No newline at end of file
diff --git a/src/keepass2android/packages.config b/src/keepass2android/packages.config
index 6f41db39..e16a1b3f 100644
--- a/src/keepass2android/packages.config
+++ b/src/keepass2android/packages.config
@@ -104,4 +104,7 @@
   <package id="Xamarin.GooglePlayServices.Base" version="27.0.0.0" targetFramework="monoandroid80" />
   <package id="Xamarin.GooglePlayServices.Basement" version="27.0.0.0" targetFramework="monoandroid80" />
   <package id="Xamarin.GooglePlayServices.Drive" version="27.0.0.0" targetFramework="MonoAndroid50" />
+  <package id="Xamarin.Jetbrains.Annotations" version="13.0.0.1" targetFramework="monoandroid90" />
+  <package id="Xamarin.Kotlin.StdLib" version="1.3.50.1" targetFramework="monoandroid90" />
+  <package id="Xamarin.Kotlin.StdLib.Common" version="1.3.50.1" targetFramework="monoandroid90" />
 </packages>
\ No newline at end of file