diff --git a/BUILDING.md b/BUILDING.md
index 40691bb9c..2ccfc4123 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -59,11 +59,6 @@ Build and Run and you are ready to go!
 
 ## Known issues
 
-### PureLayout
-The PureLayout post install hook doesn't get applied correctly upon running
-`pod install` if you're on Xcode 12. See https://github.com/CocoaPods/CocoaPods/issues/10087 
-for more information.
-
 ### Push Notifications
 Features related to push notifications are known to be not working for
 third-party contributors since Apple's Push Notification service pushes
diff --git a/Podfile b/Podfile
index 8ff2cf577..56340c659 100644
--- a/Podfile
+++ b/Podfile
@@ -9,7 +9,7 @@ target 'Session' do
   pod 'Mantle', git: 'https://github.com/signalapp/Mantle', branch: 'signal-master', :inhibit_warnings => true
   pod 'NVActivityIndicatorView', :inhibit_warnings => true
   pod 'PromiseKit', :inhibit_warnings => true
-  pod 'PureLayout', '~> 3.1.4', :inhibit_warnings => true
+  pod 'PureLayout', '~> 3.1.8', :inhibit_warnings => true
   pod 'Reachability', :inhibit_warnings => true
   pod 'Sodium', '~> 0.8.0', :inhibit_warnings => true
   pod 'YapDatabase/SQLCipher', :git => 'https://github.com/loki-project/session-ios-yap-database.git', branch: 'signal-release', :inhibit_warnings => true
@@ -23,7 +23,7 @@ target 'SessionShareExtension' do
   pod 'Curve25519Kit', git: 'https://github.com/signalapp/Curve25519Kit.git', :inhibit_warnings => true
   pod 'Mantle', git: 'https://github.com/signalapp/Mantle', branch: 'signal-master', :inhibit_warnings => true
   pod 'PromiseKit', :inhibit_warnings => true
-  pod 'PureLayout', '~> 3.1.4', :inhibit_warnings => true
+  pod 'PureLayout', '~> 3.1.8', :inhibit_warnings => true
   pod 'SignalCoreKit', git: 'https://github.com/signalapp/SignalCoreKit.git', :inhibit_warnings => true
   pod 'YapDatabase/SQLCipher', :git => 'https://github.com/loki-project/session-ios-yap-database.git', branch: 'signal-release', :inhibit_warnings => true
 end
@@ -43,7 +43,7 @@ target 'SignalUtilitiesKit' do
   pod 'Mantle', git: 'https://github.com/signalapp/Mantle', branch: 'signal-master', :inhibit_warnings => true
   pod 'NVActivityIndicatorView', :inhibit_warnings => true
   pod 'PromiseKit', :inhibit_warnings => true
-  pod 'PureLayout', '~> 3.1.4', :inhibit_warnings => true
+  pod 'PureLayout', '~> 3.1.8', :inhibit_warnings => true
   pod 'Reachability', :inhibit_warnings => true
   pod 'SAMKeychain', :inhibit_warnings => true
   pod 'SignalCoreKit', git: 'https://github.com/signalapp/SignalCoreKit.git', :inhibit_warnings => true
@@ -63,7 +63,7 @@ target 'SessionMessagingKit' do
   pod 'HKDFKit', :inhibit_warnings => true
   pod 'Mantle', git: 'https://github.com/signalapp/Mantle', branch: 'signal-master', :inhibit_warnings => true
   pod 'PromiseKit', :inhibit_warnings => true
-  pod 'PureLayout', '~> 3.1.4', :inhibit_warnings => true
+  pod 'PureLayout', '~> 3.1.8', :inhibit_warnings => true
   pod 'Reachability', :inhibit_warnings => true
   pod 'SAMKeychain', :inhibit_warnings => true
   pod 'SignalCoreKit', git: 'https://github.com/signalapp/SignalCoreKit.git', :inhibit_warnings => true
@@ -87,7 +87,7 @@ target 'SessionUtilitiesKit' do
   pod 'Curve25519Kit', git: 'https://github.com/signalapp/Curve25519Kit.git', :inhibit_warnings => true
   pod 'Mantle', git: 'https://github.com/signalapp/Mantle', branch: 'signal-master', :inhibit_warnings => true
   pod 'PromiseKit', :inhibit_warnings => true
-  pod 'PureLayout', '~> 3.1.4', :inhibit_warnings => true
+  pod 'PureLayout', '~> 3.1.8', :inhibit_warnings => true
   pod 'SAMKeychain', :inhibit_warnings => true
   pod 'SignalCoreKit', git: 'https://github.com/signalapp/SignalCoreKit.git', :inhibit_warnings => true
   pod 'YapDatabase/SQLCipher', :git => 'https://github.com/loki-project/session-ios-yap-database.git', branch: 'signal-release', :inhibit_warnings => true
@@ -110,18 +110,6 @@ def enable_whole_module_optimization_for_crypto_swift(installer)
   end
 end
 
-def enable_extension_support_for_pure_layout(installer)
-  installer.pods_project.targets.each do |target|
-    if target.name.end_with? "PureLayout"
-      target.build_configurations.each do |build_configuration|
-        if build_configuration.build_settings['APPLICATION_EXTENSION_API_ONLY'] == 'YES'
-          build_configuration.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] = [ '$(inherited)', 'PURELAYOUT_APP_EXTENSIONS=1' ]
-        end
-      end
-    end
-  end
-end
-
 def set_minimum_deployment_target(installer)
   installer.pods_project.targets.each do |target|
     target.build_configurations.each do |build_configuration|