diff --git a/splitio/CHANGELOG.md b/splitio/CHANGELOG.md
index 65f5688..f0b5d1f 100644
--- a/splitio/CHANGELOG.md
+++ b/splitio/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 0.1.7+1-rc.2 (Feb 7, 2023)
+
+# 0.1.7+1-rc.1 (Feb 7, 2023)
+
 # 0.1.7 (Nov 9, 2023)
 * Added support for Flag Sets, which enables grouping feature flags and interacting with the group rather than individually (more details in our documentation):
   * Added new variations of the get treatment methods to support evaluating flags in given flag set/s.
diff --git a/splitio/example/ios/Podfile b/splitio/example/ios/Podfile
index 313ea4a..2c068c4 100644
--- a/splitio/example/ios/Podfile
+++ b/splitio/example/ios/Podfile
@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-platform :ios, '11.0'
+platform :ios, '12.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
diff --git a/splitio/example/ios/Podfile.lock b/splitio/example/ios/Podfile.lock
index 51ab010..06aad74 100644
--- a/splitio/example/ios/Podfile.lock
+++ b/splitio/example/ios/Podfile.lock
@@ -1,9 +1,9 @@
 PODS:
   - Flutter (1.0.0)
-  - Split (2.21.0)
-  - splitio_ios (0.3.0):
+  - Split (2.24.3)
+  - splitio_ios (0.4.0):
     - Flutter
-    - Split (~> 2.21.0)
+    - Split (~> 2.24.2)
 
 DEPENDENCIES:
   - Flutter (from `Flutter`)
@@ -21,9 +21,9 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
-  Split: e4324a8fe3fcb19c36a9e4fd84a893fc6d4bbeb0
-  splitio_ios: 8293cb4e46661f9403f92a0d143c5bf6ad5053d4
+  Split: 49b2d7a93a57062f4de8f210071b30cc86727937
+  splitio_ios: a2e051130df42c320c500d90b3005999af7eefe8
 
-PODFILE CHECKSUM: 7368163408c647b7eb699d0d788ba6718e18fb8d
+PODFILE CHECKSUM: 4e8f8b2be68aeea4c0d5beb6ff1e79fface1d048
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.15.0
diff --git a/splitio/example/pubspec.lock b/splitio/example/pubspec.lock
index bf2b499..c608653 100644
--- a/splitio/example/pubspec.lock
+++ b/splitio/example/pubspec.lock
@@ -150,28 +150,30 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "0.1.6"
+    version: "0.1.7+1-rc.1"
   splitio_android:
     dependency: transitive
     description:
       path: "../../splitio_android"
       relative: true
     source: path
-    version: "0.1.6"
+    version: "0.1.7+1-rc.1"
   splitio_ios:
     dependency: transitive
     description:
-      path: "../../splitio_ios"
-      relative: true
-    source: path
-    version: "0.1.6"
+      name: splitio_ios
+      sha256: "0550cb6718a5314ef333e0440b4d1a52f6f7abaccc610dfb6a827cd876c572a7"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.7+1-rc.1"
   splitio_platform_interface:
     dependency: transitive
     description:
-      path: "../../splitio_platform_interface"
-      relative: true
-    source: path
-    version: "1.3.0"
+      name: splitio_platform_interface
+      sha256: eb0ec278e782bb403856f0921d2023ed8ed1a9e97eafb0f3de5cc4a107d1e04f
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.4.0"
   stack_trace:
     dependency: transitive
     description:
diff --git a/splitio/pubspec.yaml b/splitio/pubspec.yaml
index 8f2c101..ab4ed63 100644
--- a/splitio/pubspec.yaml
+++ b/splitio/pubspec.yaml
@@ -1,6 +1,6 @@
 name: splitio
 description: Official plugin for split.io, the platform for controlled rollouts, which serves features to your users via feature flags to manage your complete customer experience.
-version: 0.1.7
+version: 0.1.7+1-rc.2
 homepage: https://split.io/
 repository: https://github.com/splitio/flutter-sdk-plugin/tree/main/splitio/
 
@@ -19,8 +19,8 @@ flutter:
 dependencies:
   flutter:
     sdk: flutter
-  splitio_android: ^0.1.7
-  splitio_ios: ^0.1.7
+  splitio_android: ^0.1.7+1-rc.2
+  splitio_ios: ^0.1.7+1-rc.1
   splitio_platform_interface: ^1.4.0
 
 dev_dependencies:
diff --git a/splitio_android/CHANGELOG.md b/splitio_android/CHANGELOG.md
index f1df5f4..881ef75 100644
--- a/splitio_android/CHANGELOG.md
+++ b/splitio_android/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 0.1.7+1-rc.2 (Feb 7, 2023)
+
+# 0.1.7+1-rc.1 (Feb 7, 2023)
+
 # 0.1.7 (Nov 9, 2023)
 
 * Updated Android SDK to `3.4.0`
diff --git a/splitio_android/android/build.gradle b/splitio_android/android/build.gradle
index a2871bd..e7a949b 100644
--- a/splitio_android/android/build.gradle
+++ b/splitio_android/android/build.gradle
@@ -30,14 +30,13 @@ android {
     }
 
     defaultConfig {
-        minSdk 16
+        minSdk 19
 
         consumerProguardFiles 'split-proguard-rules.pro'
     }
 
     dependencies {
-        implementation 'io.split.client:android-client:3.4.0'
-        implementation 'com.squareup.okhttp3:okhttp:3.12.13'
+        implementation 'io.split.client:android-client:4.0.0'
 
         testImplementation 'junit:junit:4.13.2'
         testImplementation 'org.mockito:mockito-core:3.12.4'
diff --git a/splitio_android/android/src/main/java/io/split/splitio/SplitFactoryProviderImpl.java b/splitio_android/android/src/main/java/io/split/splitio/SplitFactoryProviderImpl.java
index 973f840..15dff79 100644
--- a/splitio_android/android/src/main/java/io/split/splitio/SplitFactoryProviderImpl.java
+++ b/splitio_android/android/src/main/java/io/split/splitio/SplitFactoryProviderImpl.java
@@ -5,14 +5,11 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.util.concurrent.TimeoutException;
-
 import io.split.android.client.SplitClientConfig;
 import io.split.android.client.SplitFactory;
 import io.split.android.client.SplitFactoryBuilder;
 import io.split.android.client.api.Key;
+import io.split.android.client.exceptions.SplitInstantiationException;
 import io.split.android.client.utils.logger.Logger;
 
 class SplitFactoryProviderImpl implements SplitFactoryProvider {
@@ -45,7 +42,7 @@ private SplitFactory getInstance() {
                 if (mSplitFactory == null) {
                     try {
                         mSplitFactory = SplitFactoryBuilder.build(mApiKey, mKey, mSplitClientConfig, mContext);
-                    } catch (IOException | InterruptedException | TimeoutException | URISyntaxException e) {
+                    } catch (SplitInstantiationException e) {
                         Logger.e("Failed to create SplitFactory", e.getLocalizedMessage());
                     }
                 }
diff --git a/splitio_android/android/src/main/java/io/split/splitio/SplitWrapperImpl.java b/splitio_android/android/src/main/java/io/split/splitio/SplitWrapperImpl.java
index 4e765ef..1adef4e 100644
--- a/splitio_android/android/src/main/java/io/split/splitio/SplitWrapperImpl.java
+++ b/splitio_android/android/src/main/java/io/split/splitio/SplitWrapperImpl.java
@@ -9,6 +9,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 
 import io.split.android.client.SplitClient;
 import io.split.android.client.SplitFactory;
@@ -16,7 +17,6 @@
 import io.split.android.client.api.Key;
 import io.split.android.client.api.SplitView;
 import io.split.android.client.shared.UserConsent;
-import io.split.android.client.utils.ConcurrentSet;
 import io.split.android.grammar.Treatments;
 
 class SplitWrapperImpl implements SplitWrapper {
@@ -25,7 +25,7 @@ class SplitWrapperImpl implements SplitWrapper {
     private final Set<Key> mUsedKeys;
 
     SplitWrapperImpl(@NonNull SplitFactoryProvider splitFactoryProvider) {
-        this(splitFactoryProvider, new ConcurrentSet<>());
+        this(splitFactoryProvider, Collections.newSetFromMap(new ConcurrentHashMap<>()));
     }
 
     @VisibleForTesting
diff --git a/splitio_android/pubspec.yaml b/splitio_android/pubspec.yaml
index 3bcabde..66241ee 100644
--- a/splitio_android/pubspec.yaml
+++ b/splitio_android/pubspec.yaml
@@ -1,7 +1,7 @@
 name: splitio_android
 description: The official Android implementation of splitio Flutter plugin.
 repository: https://github.com/splitio/flutter-sdk-plugin/tree/main/splitio_android
-version: 0.1.7
+version: 0.1.7+1-rc.2
 
 environment:
   sdk: ">=2.16.2 <4.0.0"
diff --git a/splitio_ios/CHANGELOG.md b/splitio_ios/CHANGELOG.md
index 09be62b..d7d1dc0 100644
--- a/splitio_ios/CHANGELOG.md
+++ b/splitio_ios/CHANGELOG.md
@@ -1,3 +1,5 @@
+# 0.1.7+1-rc.1 (Feb 7, 2023)
+
 # 0.1.7 (Nov 9, 2023)
 
 * Updated iOS SDK to `2.23.0`
diff --git a/splitio_ios/example/ios/Podfile.lock b/splitio_ios/example/ios/Podfile.lock
index 6f6ec46..69856b8 100644
--- a/splitio_ios/example/ios/Podfile.lock
+++ b/splitio_ios/example/ios/Podfile.lock
@@ -1,9 +1,9 @@
 PODS:
   - Flutter (1.0.0)
-  - Split (2.23.0)
+  - Split (2.24.3)
   - splitio_ios (0.4.0):
     - Flutter
-    - Split (~> 2.23.0)
+    - Split (~> 2.24.3)
 
 DEPENDENCIES:
   - Flutter (from `Flutter`)
@@ -21,9 +21,9 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
-  Split: 8140864905cd12cb66e2cf31e6ba9052d09c086b
-  splitio_ios: 1c1d7cd88e6756b3b40cf37cdf8610b8720164b0
+  Split: 49b2d7a93a57062f4de8f210071b30cc86727937
+  splitio_ios: 173af2c0f8e068a5f96e4d13f7c661aba8e09db0
 
 PODFILE CHECKSUM: aed42fc5c94ade572556b7ed357c5c57f1bd83a2
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.15.0
diff --git a/splitio_ios/example/pubspec.lock b/splitio_ios/example/pubspec.lock
index ead8f9f..db72490 100644
--- a/splitio_ios/example/pubspec.lock
+++ b/splitio_ios/example/pubspec.lock
@@ -5,58 +5,58 @@ packages:
     dependency: transitive
     description:
       name: async
-      url: "https://pub.dartlang.org"
+      sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.8.2"
+    version: "2.11.0"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
-      url: "https://pub.dartlang.org"
+      sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   characters:
     dependency: transitive
     description:
       name: characters
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.2.0"
-  charcode:
-    dependency: transitive
-    description:
-      name: charcode
-      url: "https://pub.dartlang.org"
+      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.3.1"
+    version: "1.3.0"
   clock:
     dependency: transitive
     description:
       name: clock
-      url: "https://pub.dartlang.org"
+      sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
+      url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   collection:
     dependency: transitive
     description:
       name: collection
-      url: "https://pub.dartlang.org"
+      sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.15.0"
+    version: "1.17.1"
   cupertino_icons:
     dependency: "direct main"
     description:
       name: cupertino_icons
-      url: "https://pub.dartlang.org"
+      sha256: e35129dc44c9118cee2a5603506d823bab99c68393879edb440e0090d07586be
+      url: "https://pub.dev"
     source: hosted
     version: "1.0.5"
   fake_async:
     dependency: transitive
     description:
       name: fake_async
-      url: "https://pub.dartlang.org"
+      sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.1"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -66,7 +66,8 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      url: "https://pub.dartlang.org"
+      sha256: b543301ad291598523947dc534aaddc5aaad597b709d2426d3a0e0d44c5cb493
+      url: "https://pub.dev"
     source: hosted
     version: "1.0.4"
   flutter_test:
@@ -74,48 +75,62 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  js:
+    dependency: transitive
+    description:
+      name: js
+      sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.6.7"
   lints:
     dependency: transitive
     description:
       name: lints
-      url: "https://pub.dartlang.org"
+      sha256: a2c3d198cb5ea2e179926622d433331d8b58374ab8f29cdda6e863bd62fd369c
+      url: "https://pub.dev"
     source: hosted
     version: "1.0.1"
   matcher:
     dependency: transitive
     description:
       name: matcher
-      url: "https://pub.dartlang.org"
+      sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.12.11"
+    version: "0.12.15"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      url: "https://pub.dartlang.org"
+      sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
+      url: "https://pub.dev"
     source: hosted
-    version: "0.1.3"
+    version: "0.2.0"
   meta:
     dependency: transitive
     description:
       name: meta
-      url: "https://pub.dartlang.org"
+      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.7.0"
+    version: "1.9.1"
   path:
     dependency: transitive
     description:
       name: path
-      url: "https://pub.dartlang.org"
+      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.8.0"
+    version: "1.8.3"
   plugin_platform_interface:
     dependency: transitive
     description:
       name: plugin_platform_interface
-      url: "https://pub.dartlang.org"
+      sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.8"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -125,72 +140,73 @@ packages:
     dependency: transitive
     description:
       name: source_span
-      url: "https://pub.dartlang.org"
+      sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
+      url: "https://pub.dev"
     source: hosted
-    version: "1.8.1"
+    version: "1.9.1"
   splitio_ios:
     dependency: "direct main"
     description:
       path: ".."
       relative: true
     source: path
-    version: "0.1.2"
+    version: "0.1.7+1-rc.1"
   splitio_platform_interface:
     dependency: transitive
     description:
-      path: "../../splitio_platform_interface"
-      relative: true
-    source: path
-    version: "1.0.0"
+      name: splitio_platform_interface
+      sha256: eb0ec278e782bb403856f0921d2023ed8ed1a9e97eafb0f3de5cc4a107d1e04f
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.4.0"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
-      url: "https://pub.dartlang.org"
+      sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
+      url: "https://pub.dev"
     source: hosted
-    version: "1.10.0"
+    version: "1.11.0"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      url: "https://pub.dartlang.org"
+      sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
-      url: "https://pub.dartlang.org"
+      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.0"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
-      url: "https://pub.dartlang.org"
+      sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
+      url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.2.1"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      url: "https://pub.dartlang.org"
+      sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb
+      url: "https://pub.dev"
     source: hosted
-    version: "0.4.8"
-  typed_data:
-    dependency: transitive
-    description:
-      name: typed_data
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.3.0"
+    version: "0.5.1"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
-      url: "https://pub.dartlang.org"
+      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.4"
 sdks:
-  dart: ">=2.16.2 <3.0.0"
+  dart: ">=3.0.0 <4.0.0"
   flutter: ">=2.5.0"
diff --git a/splitio_ios/ios/splitio_ios.podspec b/splitio_ios/ios/splitio_ios.podspec
index 7371662..a723bf4 100644
--- a/splitio_ios/ios/splitio_ios.podspec
+++ b/splitio_ios/ios/splitio_ios.podspec
@@ -15,7 +15,7 @@ split.io official Flutter plugin.
   s.source           = { :path => '.' }
   s.source_files = 'Classes/**/*'
   s.dependency 'Flutter'
-  s.dependency 'Split', '~> 2.23.0'
+  s.dependency 'Split', '~> 2.24.3'
   s.platform = :ios, '9.0'
 
   # Flutter.framework does not contain a i386 slice.
diff --git a/splitio_ios/pubspec.yaml b/splitio_ios/pubspec.yaml
index 7e46f71..5279c03 100644
--- a/splitio_ios/pubspec.yaml
+++ b/splitio_ios/pubspec.yaml
@@ -1,7 +1,7 @@
 name: splitio_ios
 description: The official iOS implementation of splitio Flutter plugin.
 repository: https://github.com/splitio/flutter-sdk-plugin/tree/main/splitio_ios
-version: 0.1.7
+version: 0.1.7+1-rc.1
 
 environment:
   sdk: ">=2.16.2 <4.0.0"