diff --git a/project-bwa.yml b/project-bwa.yml
index 368a875e72..a400501f89 100644
--- a/project-bwa.yml
+++ b/project-bwa.yml
@@ -4,42 +4,19 @@ fileGroups:
 configs:
   Debug: debug
   Release: release
+include:
+  - path: project-common.yml
 options:
-  createIntermediateGroups: true
-  deploymentTarget:
-    iOS: 15.0
-    watchOS: 8.0
-  groupSortPosition: top
-  usesTabs: false
-  indentWidth: 4
-  tabWidth: 4
   fileTypes:
     "icon":
       file: true 
 settings:
   MARKETING_VERSION: 2024.6.1
   CURRENT_PROJECT_VERSION: 1
-include:
-  - path: Configs/local-sdk.yml
-    relativePaths: false
-    enable: ${LOCAL_SDK}
 packages:
-  BitwardenSdk:
-    url: https://github.com/bitwarden/sdk-swift
-    revision: fe0f17e2c217497fe83e40c8dca324880070dea9
-    branch: unstable
-  Firebase:
-    url: https://github.com/firebase/firebase-ios-sdk
-    exactVersion: 11.14.0
-  SnapshotTesting:
-    url: https://github.com/pointfreeco/swift-snapshot-testing
-    exactVersion: 1.18.4
   SwiftProtobuf:
     url: https://github.com/apple/swift-protobuf
     exactVersion: 1.31.0
-  ViewInspector:
-    url: https://github.com/nalexn/ViewInspector
-    exactVersion: 0.10.1
 projectReferences:
   BitwardenKit:
     path: BitwardenKit.xcodeproj
diff --git a/project-bwk.yml b/project-bwk.yml
index dc6b8ef13f..c584f6b90a 100644
--- a/project-bwk.yml
+++ b/project-bwk.yml
@@ -4,39 +4,15 @@ fileGroups:
 configs:
   Debug: debug
   Release: release
-options:
-  createIntermediateGroups: true
-  deploymentTarget:
-    iOS: 15.0
-    watchOS: 8.0
-  groupSortPosition: top
-  usesTabs: false
-  indentWidth: 4
-  tabWidth: 4
+include:
+  - path: project-common.yml
 settings:
   MARKETING_VERSION: 2024.6.0    # Bump this for a new version update.
   CURRENT_PROJECT_VERSION: 1
-include:
-  - path: Configs/local-sdk.yml
-    relativePaths: false
-    enable: ${LOCAL_SDK}
 packages:
-  BitwardenSdk:
-    url: https://github.com/bitwarden/sdk-swift
-    revision: fe0f17e2c217497fe83e40c8dca324880070dea9
-    branch: unstable
-  Firebase:
-    url: https://github.com/firebase/firebase-ios-sdk
-    exactVersion: 11.14.0
   SwiftUIIntrospect:
     url: https://github.com/siteline/SwiftUI-Introspect
     exactVersion: 1.3.0
-  SnapshotTesting:
-    url: https://github.com/pointfreeco/swift-snapshot-testing
-    exactVersion: 1.18.4
-  ViewInspector:
-    url: https://github.com/nalexn/ViewInspector
-    exactVersion: 0.10.1
 schemes:
   AuthenticatorBridgeKit:
     build:
diff --git a/project-common.yml b/project-common.yml
new file mode 100644
index 0000000000..475bfe587d
--- /dev/null
+++ b/project-common.yml
@@ -0,0 +1,29 @@
+options:
+  createIntermediateGroups: true
+  deploymentTarget:
+    iOS: 15.0
+    watchOS: 8.0
+  groupSortPosition: top
+  usesTabs: false
+  indentWidth: 4
+  tabWidth: 4
+
+include:
+  - path: Configs/local-sdk.yml
+    relativePaths: false
+    enable: ${LOCAL_SDK}
+
+packages:
+  BitwardenSdk:
+    url: https://github.com/bitwarden/sdk-swift
+    revision: fe0f17e2c217497fe83e40c8dca324880070dea9
+    branch: unstable
+  Firebase:
+    url: https://github.com/firebase/firebase-ios-sdk
+    exactVersion: 11.14.0
+  SnapshotTesting:
+    url: https://github.com/pointfreeco/swift-snapshot-testing
+    exactVersion: 1.18.4
+  ViewInspector:
+    url: https://github.com/nalexn/ViewInspector
+    exactVersion: 0.10.1
diff --git a/project-pm.yml b/project-pm.yml
index 9f3604f6a5..e0ed3573fb 100644
--- a/project-pm.yml
+++ b/project-pm.yml
@@ -5,42 +5,19 @@ fileGroups:
 configs:
   Debug: debug
   Release: release
+include:
+  - path: project-common.yml
 options:
-  createIntermediateGroups: true
-  deploymentTarget:
-    iOS: 15.0
-    watchOS: 8.0
-  groupSortPosition: top
-  usesTabs: false
-  indentWidth: 4
-  tabWidth: 4
   fileTypes:
     "icon":
       file: true 
 settings:
   MARKETING_VERSION: 2024.6.0    # Bump this for a new version update.
   CURRENT_PROJECT_VERSION: 1
-include:
-  - path: Configs/local-sdk.yml
-    relativePaths: false
-    enable: ${LOCAL_SDK}
 packages:
-  BitwardenSdk:
-    url: https://github.com/bitwarden/sdk-swift
-    revision: fe0f17e2c217497fe83e40c8dca324880070dea9
-    branch: unstable
-  Firebase:
-    url: https://github.com/firebase/firebase-ios-sdk
-    exactVersion: 11.14.0
   SwiftUIIntrospect:
     url: https://github.com/siteline/SwiftUI-Introspect
     exactVersion: 1.3.0
-  SnapshotTesting:
-    url: https://github.com/pointfreeco/swift-snapshot-testing
-    exactVersion: 1.18.4
-  ViewInspector:
-    url: https://github.com/nalexn/ViewInspector
-    exactVersion: 0.10.1
 projectReferences:
   BitwardenKit:
     path: BitwardenKit.xcodeproj