diff --git a/android/build.gradle b/android/build.gradle
index baf2042..d62ca07 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -4,7 +4,7 @@
 buildscript {
   ext {
     gradleVersion = "8.1.1"
-    kotlinVersion = "2.0.21"
+    kotlinVersion = "2.1.20"
   }
 
   repositories {
@@ -23,7 +23,7 @@ def isNewArchitectureEnabled() {
 }
 
 plugins {
-  id 'com.google.devtools.ksp' version "2.0.21-1.0.28"
+  id 'com.google.devtools.ksp' version "2.1.20-1.0.31"
 }
 
 apply plugin: "com.android.library"
diff --git a/android/src/main/java/com/kaleyra/video_react_native_module/VideoNativeModule.kt b/android/src/main/java/com/kaleyra/video_react_native_module/VideoNativeModule.kt
index d74b5fe..61700e4 100644
--- a/android/src/main/java/com/kaleyra/video_react_native_module/VideoNativeModule.kt
+++ b/android/src/main/java/com/kaleyra/video_react_native_module/VideoNativeModule.kt
@@ -62,39 +62,39 @@ class VideoNativeModule(
   }
 
   @ReactMethod
-  fun configure(payload: String) = reactNativeVideoHybridBridge.invoke(reactNativeVideoHybridBridge::configureBridge.name, payload)
+  fun configure(payload: String) { reactNativeVideoHybridBridge.invoke(reactNativeVideoHybridBridge::configureBridge.name, payload) }
 
   @ReactMethod
-  fun connect(payload: String) = reactNativeVideoHybridBridge.invoke(reactNativeVideoHybridBridge::connect.name, payload)
+  fun connect(payload: String) { reactNativeVideoHybridBridge.invoke(reactNativeVideoHybridBridge::connect.name, payload) }
 
   @ReactMethod
-  fun setAccessTokenResponse(payload: String) = reactNativeVideoHybridBridge.invoke(reactNativeVideoHybridBridge::setAccessTokenResponse.name, payload)
+  fun setAccessTokenResponse(payload: String) { reactNativeVideoHybridBridge.invoke(reactNativeVideoHybridBridge::setAccessTokenResponse.name, payload) }
 
   @ReactMethod
-  private fun disconnect() = reactNativeVideoHybridBridge.invoke(reactNativeVideoHybridBridge::disconnect.name)
+  private fun disconnect() { reactNativeVideoHybridBridge.invoke(reactNativeVideoHybridBridge::disconnect.name) }
 
   @ReactMethod
-  fun reset() = reactNativeVideoHybridBridge.invoke(reactNativeVideoHybridBridge::reset.name)
+  fun reset() { reactNativeVideoHybridBridge.invoke(reactNativeVideoHybridBridge::reset.name) }
 
   @ReactMethod
-  private fun clearUserCache() = reactNativeVideoHybridBridge.invoke(reactNativeVideoHybridBridge::clearUserCache.name)
+  private fun clearUserCache() { reactNativeVideoHybridBridge.invoke(reactNativeVideoHybridBridge::clearUserCache.name) }
 
   @ReactMethod
-  fun setDisplayModeForCurrentCall(payload: String) = reactNativeVideoHybridBridge.invoke(reactNativeVideoHybridBridge::setDisplayModeForCurrentCall.name, payload)
+  fun setDisplayModeForCurrentCall(payload: String) { reactNativeVideoHybridBridge.invoke(reactNativeVideoHybridBridge::setDisplayModeForCurrentCall.name, payload) }
 
   @ReactMethod
-  fun startCall(payload: String)= reactNativeVideoHybridBridge.invoke(reactNativeVideoHybridBridge::startCall.name, payload)
+  fun startCall(payload: String) { reactNativeVideoHybridBridge.invoke(reactNativeVideoHybridBridge::startCall.name, payload) }
 
   @ReactMethod
-  fun startCallUrl(payload: String) = reactNativeVideoHybridBridge.invoke(reactNativeVideoHybridBridge::startCallUrl.name, payload)
+  fun startCallUrl(payload: String) { reactNativeVideoHybridBridge.invoke(reactNativeVideoHybridBridge::startCallUrl.name, payload) }
 
   @ReactMethod
-  fun startChat(payload: String) = reactNativeVideoHybridBridge.invoke(reactNativeVideoHybridBridge::startChat.name, payload)
+  fun startChat(payload: String) { reactNativeVideoHybridBridge.invoke(reactNativeVideoHybridBridge::startChat.name, payload) }
 
   @ReactMethod
-  fun addUsersDetails(payload: String) = reactNativeVideoHybridBridge.invoke(reactNativeVideoHybridBridge::addUsersDetails.name, payload)
+  fun addUsersDetails(payload: String) { reactNativeVideoHybridBridge.invoke(reactNativeVideoHybridBridge::addUsersDetails.name, payload) }
 
   @ReactMethod
-  fun removeUsersDetails() = reactNativeVideoHybridBridge.invoke(reactNativeVideoHybridBridge::removeUserDetails.name)
+  fun removeUsersDetails() { reactNativeVideoHybridBridge.invoke(reactNativeVideoHybridBridge::removeUserDetails.name) }
 
 }
diff --git a/native-bridge/android/src/main/java/com/kaleyra/video_hybrid_native_bridge/utils/TLSSocketFactoryCompat.kt b/native-bridge/android/src/main/java/com/kaleyra/video_hybrid_native_bridge/utils/TLSSocketFactoryCompat.kt
index 8ac5333..366ed58 100644
--- a/native-bridge/android/src/main/java/com/kaleyra/video_hybrid_native_bridge/utils/TLSSocketFactoryCompat.kt
+++ b/native-bridge/android/src/main/java/com/kaleyra/video_hybrid_native_bridge/utils/TLSSocketFactoryCompat.kt
@@ -60,13 +60,11 @@ internal class TLSSocketFactoryCompat : SSLSocketFactory {
         if (socket !is SSLSocket) return null
         //Create list of supported protocols
         val supportedProtocols = ArrayList<String>()
-        for (protocol in socket.enabledProtocols) {
-            //Only add TLS protocols (don't want ot support older SSL versions)
-            if (protocol.toUpperCase().contains("TLS")) supportedProtocols.add(protocol)
+        for (protocol in socket.supportedProtocols) {
+            //Only add TLS protocols (don't want to support older SSL versions)
+            if (protocol.uppercase().contains("TLS")) supportedProtocols.add(protocol)
         }
-        //Force add TLSv1.1 and 1.2 if not already added
-        if (!supportedProtocols.contains("TLSv1.1")) supportedProtocols.add("TLSv1.1")
-        if (!supportedProtocols.contains("TLSv1.2")) supportedProtocols.add("TLSv1.2")
+
         val protocolArray = supportedProtocols.toTypedArray()
 
         //enable protocols in our list