diff --git a/Podfile b/Podfile
index 9196ab02f..3d900769d 100644
--- a/Podfile
+++ b/Podfile
@@ -4,6 +4,7 @@ platform :ios, '13.0'
 source 'https://cdn.cocoapods.org/'
 
 project 'edX.xcodeproj'
+use_modular_headers!
 
 target 'edX' do
   pod 'Analytics', '= 4.1.8'
@@ -11,19 +12,19 @@ target 'edX' do
   pod 'DateTools', '= 2.0.0'
   pod 'FBSDKCoreKit', '= 16.0.0'
   pod 'FBSDKLoginKit', '= 16.0.0'
-  pod 'Firebase', '= 10.5.0', :modular_headers => true
+  pod 'Firebase', '= 10.5.0'
   pod 'FirebaseAnalytics', '= 10.5.0'
-  pod 'FirebaseCore', '= 10.5.0', :modular_headers => true
-  pod 'FirebaseCoreInternal', '= 10.5.0', :modular_headers => true
+  pod 'FirebaseCore', '= 10.5.0'
+  pod 'FirebaseCoreInternal', '= 10.5.0'
   pod 'FirebaseCrashlytics', '= 10.5.0'
   pod 'FirebaseInAppMessaging', '= 10.5.0-beta'
   pod 'FirebaseMessaging', '= 10.5.0'
   pod 'FirebasePerformance', '= 10.5.0'
   pod 'google-cast-sdk-no-bluetooth-xcframework', '~> 4.8.0'
   pod 'GoogleSignIn', '~> 7.0.0'
-  pod 'GoogleUtilities', '= 7.11.0', :modular_headers => true
+  pod 'GoogleUtilities', '= 7.11.0'
   pod 'Masonry', '= 1.1.0'
-  pod 'MSAL', '= 1.2.5', :modular_headers => true
+  pod 'MSAL', '= 1.2.5'
   pod 'NewRelicAgent', '= 7.4.2'
   pod 'Segment-Appboy', '= 4.6.0'
   pod 'Smartling.i18n', '~> 1.0.14'
@@ -33,8 +34,8 @@ end
 target 'edXTests' do
   use_frameworks!
   pod 'iOSSnapshotTestCase', '= 6.2.0'
-  pod 'OHHTTPStubs', '~> 4.0', :modular_headers => true
-  pod 'OCMock', '~> 3.9.3', :modular_headers => true
+  pod 'OHHTTPStubs', '~> 4.0'
+  pod 'OCMock', '~> 3.9.3'
 end
 
 dynamic_frameworks = ['MSAL']
diff --git a/Pods/Target Support Files/Pods-edX/Pods-edX-frameworks.sh b/Pods/Target Support Files/Pods-edX/Pods-edX-frameworks.sh
index 286b9369d..4dd4a83f4 100755
--- a/Pods/Target Support Files/Pods-edX/Pods-edX-frameworks.sh	
+++ b/Pods/Target Support Files/Pods-edX/Pods-edX-frameworks.sh	
@@ -18,7 +18,7 @@ echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
 mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
 
 COCOAPODS_PARALLEL_CODE_SIGN="${COCOAPODS_PARALLEL_CODE_SIGN:-false}"
-SWIFT_STDLIB_PATH="${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}"
+SWIFT_STDLIB_PATH="${TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}"
 BCSYMBOLMAP_DIR="BCSymbolMaps"
 
 
diff --git a/edX.xcodeproj/project.pbxproj b/edX.xcodeproj/project.pbxproj
index 688abb9b1..a8d8f4d86 100644
--- a/edX.xcodeproj/project.pbxproj
+++ b/edX.xcodeproj/project.pbxproj
@@ -5588,7 +5588,7 @@
 				EXCLUDED_ARCHS = "$(inherited)";
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "$(inherited)";
 				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)/**",
+					"$(inherited)",
 					"$(PROJECT_DIR)",
 					"$(PROJECT_DIR)/Libraries/",
 					"$(PROJECT_DIR)/Libraries/SwiftyStoreKit",
@@ -6066,7 +6066,7 @@
 				EXCLUDED_ARCHS = "$(inherited)";
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "$(inherited)";
 				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)/**",
+					"$(inherited)",
 					"$(PROJECT_DIR)",
 					"$(PROJECT_DIR)/Libraries/",
 					"$(PROJECT_DIR)/Libraries/SwiftyStoreKit",
@@ -6156,7 +6156,7 @@
 				EXCLUDED_ARCHS = "$(inherited)";
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "$(inherited)";
 				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)/**",
+					"$(inherited)",
 					"$(PROJECT_DIR)",
 					"$(PROJECT_DIR)/Libraries/",
 					"$(PROJECT_DIR)/Libraries/SwiftyStoreKit",