diff --git a/iOS/Podspecs/Flipper-Folly.podspec b/iOS/Podspecs/Flipper-Folly.podspec
index fd33bcea5..2b3a5230a 100644
--- a/iOS/Podspecs/Flipper-Folly.podspec
+++ b/iOS/Podspecs/Flipper-Folly.podspec
@@ -29,133 +29,63 @@ Pod::Spec.new do |spec|
     -Wno-comment
     -Wno-return-type
     -Wno-global-constructors'
-  spec.source_files = "folly/system/*.cpp",
-                      "folly/portability/Config.h",
-                      "folly/Executor.h",
-                      "folly/Function.h",
-                      "folly/Utility.h",
-                      "folly/Portability.h",
-                      "folly/Traits.h",
-                      "folly/functional/Invoke.h",
-                      "folly/CPortability.h",
-                      "folly/dynamic.h",
-                      "folly/json_pointer.h",
-                      "folly/Expected.h",
-                      "folly/Preprocessor.h",
-                      "folly/Optional.h",
-                      "folly/Unit.h",
-                      "folly/Utility.h",
-                      "folly/lang/ColdClass.h",
-                      "folly/CppAttributes.h",
-                      "folly/json.h",
-                      "folly/Range.h",
-                      "folly/hash/SpookyHashV2.h",
-                      "folly/lang/Exception.h",
-                      "folly/portability/Constexpr.h",
-                      "folly/CpuId.h",
-                      "folly/Likely.h",
-                      "folly/detail/RangeCommon.h",
-                      "folly/detail/RangeSse42.h",
-                      "folly/portability/String.h",
-                      "folly/dynamic-inl.h",
-                      "folly/Conv.h",
-                      "folly/Demangle.h",
-                      "folly/FBString.h",
-                      "folly/hash/Hash.h",
-                      "folly/memory/Malloc.h",
-                      "folly/io/async/AsyncTimeout.h",
-                      "folly/**/*.h",
-                      "folly/memory/detail/MallocImpl.h",
-                      "folly/String.h",
-                      "folly/*.h",
-                      "folly/portability/PThread.h",
+  spec.source_files = "folly/*.h",
+                      "folly/concurrency/*.h",
+                      "folly/container/*.h",
+                      "folly/container/detail/*.h",
+                      "folly/detail/*.h",
+                      "folly/executors/**/*.h",
+                      "folly/experimental/*.h",
+                      "folly/functional/*.h",
                       "folly/futures/*.h",
                       "folly/futures/detail/*.h",
-                      "folly/Executor.cpp",
-                      "folly/memory/detail/MallocImpl.cpp",
-                      "folly/String.cpp",
+                      "folly/gen/*.h",
+                      "folly/hash/*.h",
+                      "folly/hash/detail/*.h",
+                      "folly/init/*.h",
+                      "folly/io/*.h",
+                      "folly/io/async/*.h",
+                      "folly/io/async/ssl/*.h",
+                      "folly/lang/*.h",
+                      "folly/memory/*.h",
+                      "folly/memory/detail/*.h",
+                      "folly/net/*.h",
+                      "folly/net/detail/*.h",
+                      "folly/portability/*.h",
+                      "folly/ssl/*.h",
+                      "folly/ssl/detail/*.h",
+                      "folly/synchronization/*.h",
+                      "folly/synchronization/detail/*.h",
+                      "folly/system/*.h",
+                      "folly/tracing/*.h",
                       "folly/*.cpp",
-                      "folly/net/*.cpp",
+                      "folly/concurrency/*.cpp",
+                      "folly/container/detail/*.cpp",
                       "folly/detail/*.cpp",
-                      "folly/hash/*.cpp",
-                      "folly/portability/*.cpp",
-                      "folly/ScopeGuard.h",
-                      "folly/lang/ColdClass.cpp",
-                      "folly/lang/Assume.h",
-                      "folly/lang/Assume.cpp",
-                      "folly/io/async/*.cpp",
-                      "folly/io/async/ssl/*.cpp",
-                      "folly/io/*.cpp",
-                      "folly/synchronization/*.cpp",
-                      "folly/lang/*.cpp",
-                      "folly/memory/*.cpp",
+                      "folly/executors/*.cpp",
+                      "folly/experimental/hazptr/*.cpp",
                       "folly/futures/*.cpp",
                       "folly/futures/detail/*.cpp",
-                      "folly/experimental/hazptr/*.cpp",
-                      "folly/executors/*.cpp",
-                      "folly/concurrency/*.cpp",
+                      "folly/hash/*.cpp",
+                      "folly/io/*.cpp",
+                      "folly/io/async/*.cpp",
+                      "folly/io/async/ssl/*.cpp",
+                      "folly/lang/*.cpp",
+                      "folly/memory/*.cpp",
+                      "folly/memory/detail/*.cpp",
+                      "folly/net/*.cpp",
+                      "folly/portability/*.cpp",
                       "folly/ssl/*.cpp",
                       "folly/ssl/detail/*.cpp",
-                      "folly/container/detail/*.cpp"
-  # workaround for https://github.com/facebook/react-native/issues/14326
-  spec.preserve_paths =   'folly/*.h',
-                          'folly/portability/*.h',
-                          'folly/lang/*.h',
-                          'folly/functional/*.h',
-                          'folly/detail/*.h',
-                          'folly/hash/*.h',
-                          'folly/memory/*.h',
-                          'folly/**/*.h',
-                          'folly/futures/detail/*.h',
-                          'folly/futures/*.h'
+                      "folly/String.cpp",
+                      "folly/synchronization/*.cpp",
+                      "folly/system/*.cpp"
 
   spec.header_mappings_dir = 'folly'
-  spec.header_dir = 'folly'
+  spec.header_dir          = 'folly'
   spec.libraries           = "stdc++"
-  spec.private_header_files = "folly/portability/Stdlib.h",
-                              "folly/portability/Stdio.h"
 
-  spec.public_header_files =  "folly/portability/Config.h",
-                              "folly/Executor.h",
-                              "folly/Function.h",
-                              "folly/Utility.h",
-                              "folly/Portability.h",
-                              "folly/Traits.h",
-                              "folly/functional/Invoke.h",
-                              "folly/CPortability.h",
-                              "folly/dynamic.h",
-                              "folly/json_pointer.h",
-                              "folly/Expected.h",
-                              "folly/Preprocessor.h",
-                              "folly/Optional.h",
-                              "folly/Unit.h",
-                              "folly/Utility.h",
-                              "folly/lang/ColdClass.h",
-                              "folly/CppAttributes.h",
-                              "folly/json.h",
-                              "folly/Range.h",
-                              "folly/hash/SpookyHashV2.h",
-                              "folly/lang/Exception.h",
-                              "folly/portability/Constexpr.h",
-                              "folly/CpuId.h",
-                              "folly/Likely.h",
-                              "folly/detail/RangeCommon.h",
-                              "folly/detail/RangeSse42.h",
-                              "folly/portability/String.h",
-                              "folly/dynamic-inl.h",
-                              "folly/Conv.h",
-                              "folly/Demangle.h",
-                              "folly/FBString.h",
-                              "folly/hash/Hash.h",
-                              "folly/memory/Malloc.h",
-                              "folly/io/async/AsyncTimeout.h",
-                              "folly/**/*.h",
-                              "folly/memory/detail/MallocImpl.h",
-                              "folly/String.h",
-                              "folly/*.h",
-                              "folly/portability/PThread.h",
-                              "folly/futures/*.h",
-                              "folly/futures/detail/*.h"
+  spec.public_header_files =  "folly/**/*.h"
 
   spec.pod_target_xcconfig = {  "USE_HEADERMAP" => "NO",
                                 "ARCHS" => "${ARCHS_STANDARD_64_BIT}",