diff --git a/build.gradle.kts b/build.gradle.kts
index fd7d381defee31fdec55077a6c732ab1ec2483a4..8d1a35cc83fa34efbfe79077413648f9584a44a7 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -13,7 +13,6 @@ buildscript {
 
 plugins {
     alias(libs.plugins.kotlin.multiplatform) apply false
-    alias(libs.plugins.complete.kotlin)
     alias(libs.plugins.goncalossilva.resources)
 }
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 539fdf8c17d1c5abcfad1c3195cb63beeb828036..d501a28503a41a56dedb17f4d33035291b0e8d9c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,7 +3,6 @@ serialization = "1.7.3"
 coroutines = "1.9.0"
 atomicfu = "0.26.1"
 nodeWrapper = "20.11.30-pre.732"
-completeKotlin = "1.1.0"
 silvaResources = "0.4.0"
 kotlin = "2.1.0"
 shadow = "8.3.5"
@@ -20,6 +19,5 @@ goncalossilva-resources = { module = "com.goncalossilva:resources", version.ref
 [plugins]
 kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
-complete-kotlin = { id = "com.louiscad.complete-kotlin", version.ref = "completeKotlin" }
 goncalossilva-resources = { id = "com.goncalossilva.resources", version.ref = "silvaResources" }
 johnrengelman-shadow = { id = "com.gradleup.shadow", version.ref = "shadow" }
diff --git a/kmqtt-client/src/commonMain/kotlin/io/github/davidepianca98/MQTTClient.kt b/kmqtt-client/src/commonMain/kotlin/io/github/davidepianca98/MQTTClient.kt
index 4dce2ec4f14a7cad948b7c5802274201f032fa8e..5a55bb69d5cb7ec047dcc54e9d35418dfdc80b07 100644
--- a/kmqtt-client/src/commonMain/kotlin/io/github/davidepianca98/MQTTClient.kt
+++ b/kmqtt-client/src/commonMain/kotlin/io/github/davidepianca98/MQTTClient.kt
@@ -96,7 +96,6 @@ import kotlinx.coroutines.yield
  * @param publishReceived called when a PUBLISH packet has been received
  */
 public class MQTTClient(
-    private val autoInit: Boolean = true,
     private val mqttVersion: MQTTVersion,
     private val address: String,
     private val port: Int,
@@ -115,6 +114,7 @@ public class MQTTClient(
     private val willQos: Qos = Qos.AT_MOST_ONCE,
     private val connackTimeout: Int = 30,
     private val connectTimeout: Int = 30,
+    private val autoInit: Boolean = true,
     private val enhancedAuthCallback: (authenticationData: UByteArray?) -> UByteArray? = { null },
     private val onConnected: (connack: MQTTConnack) -> Unit = {},
     private val onDisconnected: (disconnect: MQTTDisconnect?) -> Unit = {},
diff --git a/kmqtt-client/src/jvmMain/kotlin/io/github/davidepianca98/TLSClientSocket.kt b/kmqtt-client/src/jvmMain/kotlin/io/github/davidepianca98/TLSClientSocket.kt
index 49b53f0b206d12cf9b03d27ec5942b23167c9cd8..d946b508c7ecd7fc218466e860ae1467382891c6 100644
--- a/kmqtt-client/src/jvmMain/kotlin/io/github/davidepianca98/TLSClientSocket.kt
+++ b/kmqtt-client/src/jvmMain/kotlin/io/github/davidepianca98/TLSClientSocket.kt
@@ -12,7 +12,9 @@ import java.security.KeyFactory
 import java.security.KeyStore
 import java.security.cert.CertificateFactory
 import java.security.cert.X509Certificate
+import java.security.interfaces.ECPrivateKey
 import java.security.interfaces.RSAPrivateKey
+import java.security.spec.InvalidKeySpecException
 import java.security.spec.PKCS8EncodedKeySpec
 import java.util.*
 import javax.net.ssl.KeyManagerFactory
@@ -77,7 +79,12 @@ public actual class TLSClientSocket actual constructor(
 
             val keyStore = KeyStore.getInstance(KeyStore.getDefaultType())
             keyStore.load(null, null)
-            val key = getPrivateKeyFromString(if (tlsSettings.clientCertificateKey!!.isValidPem()) tlsSettings.clientCertificateKey!! else FileInputStream(tlsSettings.clientCertificateKey!!).bufferedReader().readText())
+            val keyContent = if (tlsSettings.clientCertificateKey!!.isValidPem()) tlsSettings.clientCertificateKey!! else FileInputStream(tlsSettings.clientCertificateKey!!).bufferedReader().readText();
+            val key = try {
+                getRSAPrivateKeyFromString(keyContent)
+            } catch (e: InvalidKeySpecException) {
+                getECPrivateKeyFromString(keyContent)
+            }
             keyStore.setKeyEntry("client", key, tlsSettings.clientCertificatePassword?.toCharArray(), arrayOf(certificate))
 
             val kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm())
@@ -101,7 +108,7 @@ public actual class TLSClientSocket actual constructor(
     }
 
     public companion object {
-        private fun getPrivateKeyFromString(key: String): RSAPrivateKey {
+        private fun getRSAPrivateKeyFromString(key: String): RSAPrivateKey {
             val privateKeyPEM = key
                 .replace("-----BEGIN PRIVATE KEY-----", "")
                 .replace("-----END PRIVATE KEY-----", "")
@@ -111,6 +118,17 @@ public actual class TLSClientSocket actual constructor(
             val keySpec = PKCS8EncodedKeySpec(encoded)
             return kf.generatePrivate(keySpec) as RSAPrivateKey
         }
+
+        private fun getECPrivateKeyFromString(key: String): ECPrivateKey {
+            val privateKeyPEM = key
+                .replace("-----BEGIN EC PRIVATE KEY-----", "")
+                .replace("-----END EC PRIVATE KEY-----", "")
+                .replace("\n","")
+            val encoded = Base64.getDecoder().decode(privateKeyPEM)
+            val kf = KeyFactory.getInstance("EC")
+            val keySpec = PKCS8EncodedKeySpec(encoded)
+            return kf.generatePrivate(keySpec) as ECPrivateKey
+        }
     }
 
     override fun send(data: UByteArray) {