diff --git a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/PreparePrefabHeadersTask.kt b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/PreparePrefabHeadersTask.kt
index 6b07391768308c..4d650e0337a201 100644
--- a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/PreparePrefabHeadersTask.kt
+++ b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/PreparePrefabHeadersTask.kt
@@ -50,8 +50,8 @@ abstract class PreparePrefabHeadersTask : DefaultTask() {
           // We don't want to copy all the boost headers as they are 250Mb+
           it.include("boost/config.hpp")
           it.include("boost/config/**/*.hpp")
-          it.include("boost/core/*.hpp")
-          it.include("boost/detail/workaround.hpp")
+          it.include("boost/core/**/*.hpp")
+          it.include("boost/detail/**/*.hpp")
           it.include("boost/operators.hpp")
           it.include("boost/preprocessor/**/*.hpp")
           // Headers needed for exposing rrc_text and rrc_textinput
@@ -74,6 +74,19 @@ abstract class PreparePrefabHeadersTask : DefaultTask() {
           it.include("boost/config.hpp")
           it.include("boost/utility.hpp")
           it.include("boost/version.hpp")
+          // Extra files for kv-storage
+          it.include("boost/*.hpp")
+          it.include("boost/align/**/*.hpp")
+          it.include("boost/container/**/*.hpp")
+          it.include("boost/intrusive/**/*.hpp")
+          it.include("boost/iterator/**/*.hpp")
+          it.include("boost/lockfree/**/*.hpp")
+          it.include("boost/move/**/*.hpp")
+          it.include("boost/mp11/**/*.hpp")
+          it.include("boost/mpl/**/*.hpp")
+          it.include("boost/parameter/**/*.hpp")
+          it.include("boost/type_traits/**/*.hpp")
+          it.include("boost/utility/**/*.hpp")
           it.into(File(outputFolder.asFile, headerPrefix))
         }
       }