diff --git a/ReactAndroid/build.gradle b/ReactAndroid/build.gradle
index 125a0e952dd..11991fd82cf 100644
--- a/ReactAndroid/build.gradle
+++ b/ReactAndroid/build.gradle
@@ -116,6 +116,10 @@ final def preparePrefab = tasks.register("preparePrefab", PreparePrefabHeadersTa
             new PrefabPreprocessingEntry(
                 "fabricjni",
                 new Pair("src/main/jni/react/fabric", "")
+            ),
+            new PrefabPreprocessingEntry(
+                "react_render_mapbuffer",
+                new Pair("../ReactCommon/react/renderer/mapbuffer/", "react/renderer/mapbuffer/")
             )
         ]
     )
@@ -382,7 +386,8 @@ android {
                     "rrc_view",
                     "jsi",
                     "glog",
-                    "fabricjni"
+                    "fabricjni",
+                    "react_render_mapbuffer"
             }
         }
         ndk {
@@ -492,6 +497,9 @@ android {
         fabricjni {
             headers(new File(prefabHeadersDir, "fabricjni").absolutePath)
         }
+        react_render_mapbuffer {
+            headers(new File(prefabHeadersDir, "react_render_mapbuffer").absolutePath)
+        }
     }
 
     publishing {
diff --git a/ReactAndroid/cmake-utils/Android-prebuilt.cmake b/ReactAndroid/cmake-utils/Android-prebuilt.cmake
index 2e8dc172fbf..f7ad1dbfc73 100644
--- a/ReactAndroid/cmake-utils/Android-prebuilt.cmake
+++ b/ReactAndroid/cmake-utils/Android-prebuilt.cmake
@@ -114,13 +114,5 @@ set_target_properties(react_render_mounting
         ${REACT_NDK_EXPORT_DIR}/${ANDROID_ABI}/libreact_render_mounting.so)
 target_include_directories(react_render_mounting INTERFACE ${REACT_COMMON_DIR}/react/renderer/mounting)
 
-## react_render_mapbuffer
-add_library(react_render_mapbuffer SHARED IMPORTED GLOBAL)
-set_target_properties(react_render_mapbuffer
-        PROPERTIES
-        IMPORTED_LOCATION
-        ${REACT_NDK_EXPORT_DIR}/${ANDROID_ABI}/libreact_render_mapbuffer.so)
-target_include_directories(react_render_mapbuffer INTERFACE ${REACT_COMMON_DIR}/react/renderer/mapbuffer)
-
 ## fbjni
 add_subdirectory(${FIRST_PARTY_NDK_DIR}/fbjni fbjni_build)
diff --git a/ReactAndroid/cmake-utils/ReactNative-application.cmake b/ReactAndroid/cmake-utils/ReactNative-application.cmake
index 7dbd6dd33e8..7671a73ab44 100644
--- a/ReactAndroid/cmake-utils/ReactNative-application.cmake
+++ b/ReactAndroid/cmake-utils/ReactNative-application.cmake
@@ -54,6 +54,7 @@ add_library(rrc_view ALIAS ReactAndroid::rrc_view)
 add_library(jsi ALIAS ReactAndroid::jsi)
 add_library(glog ALIAS ReactAndroid::glog)
 add_library(fabricjni ALIAS ReactAndroid::fabricjni)
+add_library(react_render_mapbuffer ALIAS ReactAndroid::react_render_mapbuffer)
 
 target_link_libraries(${CMAKE_PROJECT_NAME}
         fabricjni                           # prefab ready
@@ -69,7 +70,7 @@ target_link_libraries(${CMAKE_PROJECT_NAME}
         react_render_core                   # prefab ready
         react_render_debug                  # prefab ready
         react_render_graphics               # prefab ready
-        react_render_mapbuffer
+        react_render_mapbuffer              # prefab ready
         rrc_view                            # prefab ready
         runtimeexecutor                     # prefab ready
         turbomodulejsijni                   # prefab ready