diff --git a/app/android/app/src/main/java/dev/playtorch/newarchitecture/MainApplicationReactNativeHost.java b/app/android/app/src/main/java/dev/playtorch/newarchitecture/MainApplicationReactNativeHost.java
index 3da21d2d6..3e19f9f93 100644
--- a/app/android/app/src/main/java/dev/playtorch/newarchitecture/MainApplicationReactNativeHost.java
+++ b/app/android/app/src/main/java/dev/playtorch/newarchitecture/MainApplicationReactNativeHost.java
@@ -14,22 +14,16 @@
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
 import com.facebook.react.ReactPackageTurboModuleManagerDelegate;
-import com.facebook.react.bridge.JSIModulePackage;
-import com.facebook.react.bridge.JSIModuleProvider;
-import com.facebook.react.bridge.JSIModuleSpec;
-import com.facebook.react.bridge.JSIModuleType;
-import com.facebook.react.bridge.JavaScriptContextHolder;
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.UIManager;
+import com.facebook.react.bridge.UIManagerProvider;
 import com.facebook.react.fabric.ComponentFactory;
 import com.facebook.react.fabric.CoreComponentsRegistry;
-import com.facebook.react.fabric.FabricJSIModuleProvider;
+import com.facebook.react.fabric.FabricUIManagerProviderImpl;
 import com.facebook.react.fabric.ReactNativeConfig;
 import com.facebook.react.uimanager.ViewManagerRegistry;
 import dev.playtorch.BuildConfig;
 import dev.playtorch.newarchitecture.components.MainComponentsRegistry;
 import dev.playtorch.newarchitecture.modules.MainApplicationTurboModuleManagerDelegate;
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -76,47 +70,26 @@ protected String getJSMainModuleName() {
   }
 
   @Override
-  protected JSIModulePackage getJSIModulePackage() {
-    return new JSIModulePackage() {
+  protected Function1<ReactApplicationContext, UIManagerProvider> getUIManagerProviderFunction() {
+    return new Function1<ReactApplicationContext, UIManagerProvider>() {
       @Override
-      public List<JSIModuleSpec> getJSIModules(
-          final ReactApplicationContext reactApplicationContext,
-          final JavaScriptContextHolder jsContext) {
-        final List<JSIModuleSpec> specs = new ArrayList<>();
+      public UIManagerProvider invoke(ReactApplicationContext reactApplicationContext) {
+        final ComponentFactory componentFactory = new ComponentFactory();
+        CoreComponentsRegistry.register(componentFactory);
 
-        // Here we provide a new JSIModuleSpec that will be responsible of providing the
-        // custom Fabric Components.
-        specs.add(
-            new JSIModuleSpec() {
-              @Override
-              public JSIModuleType getJSIModuleType() {
-                return JSIModuleType.UIManager;
-              }
+        // Here we register a Components Registry.
+        // The one that is generated with the template contains no components
+        // and just provides you the one from React Native core.
+        MainComponentsRegistry.register(componentFactory);
 
-              @Override
-              public JSIModuleProvider<UIManager> getJSIModuleProvider() {
-                final ComponentFactory componentFactory = new ComponentFactory();
-                CoreComponentsRegistry.register(componentFactory);
+        final ReactInstanceManager reactInstanceManager = getReactInstanceManager();
 
-                // Here we register a Components Registry.
-                // The one that is generated with the template contains no components
-                // and just provides you the one from React Native core.
-                MainComponentsRegistry.register(componentFactory);
+        ViewManagerRegistry viewManagerRegistry =
+            new ViewManagerRegistry(
+                reactInstanceManager.getOrCreateViewManagers(reactApplicationContext));
 
-                final ReactInstanceManager reactInstanceManager = getReactInstanceManager();
-
-                ViewManagerRegistry viewManagerRegistry =
-                    new ViewManagerRegistry(
-                        reactInstanceManager.getOrCreateViewManagers(reactApplicationContext));
-
-                return new FabricJSIModuleProvider(
-                    reactApplicationContext,
-                    componentFactory,
-                    ReactNativeConfig.DEFAULT_CONFIG,
-                    viewManagerRegistry);
-              }
-            });
-        return specs;
+        return new FabricUIManagerProviderImpl(
+            componentFactory, ReactNativeConfig.DEFAULT_CONFIG, viewManagerRegistry);
       }
     };
   }