diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 27e630b..8bcd0e5 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -2,8 +2,6 @@ name: Build and Test
 
 on:
   pull_request:
-    branches:
-      - main
   push:
     branches:
       - main
diff --git a/Flinky.xcodeproj/project.pbxproj b/Flinky.xcodeproj/project.pbxproj
index a49a52e..96f92a5 100644
--- a/Flinky.xcodeproj/project.pbxproj
+++ b/Flinky.xcodeproj/project.pbxproj
@@ -1860,7 +1860,7 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/getsentry/sentry-cocoa";
 			requirement = {
-				branch = "philprime/spm-sample";
+				branch = "main";
 				kind = branch;
 			};
 		};
diff --git a/Flinky.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Flinky.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 6c9d061..31c9759 100644
--- a/Flinky.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/Flinky.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -15,8 +15,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/getsentry/sentry-cocoa",
       "state" : {
-        "branch" : "philprime/spm-sample",
-        "revision" : "833280e65ad3d142fc555f270c8ea730baa49683"
+        "branch" : "main",
+        "revision" : "e8cc4e76a3f66e322c2cc2cb39b73b61f4f0c0d8"
       }
     },
     {
diff --git a/Targets/App/Sources/Main/FlinkyApp.swift b/Targets/App/Sources/Main/FlinkyApp.swift
index f047611..6367860 100644
--- a/Targets/App/Sources/Main/FlinkyApp.swift
+++ b/Targets/App/Sources/Main/FlinkyApp.swift
@@ -1,6 +1,6 @@
 import FlinkyCore
 import OnLaunch
-import SentrySPM
+import SentrySwift
 import SwiftData
 import SwiftUI
 import os.log
diff --git a/Targets/App/Sources/Services/AppHealthObserver.swift b/Targets/App/Sources/Services/AppHealthObserver.swift
index 81726aa..49979e0 100644
--- a/Targets/App/Sources/Services/AppHealthObserver.swift
+++ b/Targets/App/Sources/Services/AppHealthObserver.swift
@@ -1,7 +1,7 @@
 import Foundation
 import Network
 import os.log
-import SentrySPM
+import SentrySwift
 import UIKit
 
 /// Observes app health signals and reports them as Sentry metrics.
diff --git a/Targets/App/Sources/Services/DataSeedingService.swift b/Targets/App/Sources/Services/DataSeedingService.swift
index 35d03f2..2212cd1 100644
--- a/Targets/App/Sources/Services/DataSeedingService.swift
+++ b/Targets/App/Sources/Services/DataSeedingService.swift
@@ -1,6 +1,6 @@
 import FlinkyCore
 import Foundation
-import SentrySPM
+import SentrySwift
 import SwiftData
 import os.log
 
diff --git a/Targets/App/Sources/Services/QRCodeCache.swift b/Targets/App/Sources/Services/QRCodeCache.swift
index 22d56c2..9a315d2 100644
--- a/Targets/App/Sources/Services/QRCodeCache.swift
+++ b/Targets/App/Sources/Services/QRCodeCache.swift
@@ -1,6 +1,6 @@
 import FlinkyCore
 import Foundation
-import SentrySPM
+import SentrySwift
 import UIKit
 import os.log
 
diff --git a/Targets/App/Sources/UI/CreateLinkEditor/CreateLinkEditorContainerView.swift b/Targets/App/Sources/UI/CreateLinkEditor/CreateLinkEditorContainerView.swift
index c05ddc9..de5214d 100644
--- a/Targets/App/Sources/UI/CreateLinkEditor/CreateLinkEditorContainerView.swift
+++ b/Targets/App/Sources/UI/CreateLinkEditor/CreateLinkEditorContainerView.swift
@@ -1,5 +1,5 @@
 import FlinkyCore
-import SentrySPM
+import SentrySwift
 import SwiftUI
 import os.log
 
diff --git a/Targets/App/Sources/UI/CreateLinkWithoutListEditor/CreateLinkWithListPickerEditorContainerView.swift b/Targets/App/Sources/UI/CreateLinkWithoutListEditor/CreateLinkWithListPickerEditorContainerView.swift
index e232d05..467e7ec 100644
--- a/Targets/App/Sources/UI/CreateLinkWithoutListEditor/CreateLinkWithListPickerEditorContainerView.swift
+++ b/Targets/App/Sources/UI/CreateLinkWithoutListEditor/CreateLinkWithListPickerEditorContainerView.swift
@@ -1,5 +1,5 @@
 import FlinkyCore
-import SentrySPM
+import SentrySwift
 import SwiftData
 import SwiftUI
 import os.log
diff --git a/Targets/App/Sources/UI/CreateLinkWithoutListEditor/LinkListPickerContainerView.swift b/Targets/App/Sources/UI/CreateLinkWithoutListEditor/LinkListPickerContainerView.swift
index d31f95c..81c6548 100644
--- a/Targets/App/Sources/UI/CreateLinkWithoutListEditor/LinkListPickerContainerView.swift
+++ b/Targets/App/Sources/UI/CreateLinkWithoutListEditor/LinkListPickerContainerView.swift
@@ -1,5 +1,5 @@
 import FlinkyCore
-import SentrySPM
+import SentrySwift
 import SwiftData
 import SwiftUI
 import os.log
diff --git a/Targets/App/Sources/UI/CreateListEditor/CreateLinkListEditorContainerView.swift b/Targets/App/Sources/UI/CreateListEditor/CreateLinkListEditorContainerView.swift
index 44388ac..07c5e91 100644
--- a/Targets/App/Sources/UI/CreateListEditor/CreateLinkListEditorContainerView.swift
+++ b/Targets/App/Sources/UI/CreateListEditor/CreateLinkListEditorContainerView.swift
@@ -1,5 +1,5 @@
 import FlinkyCore
-import SentrySPM
+import SentrySwift
 import SwiftUI
 import os.log
 
diff --git a/Targets/App/Sources/UI/LinkDetail/LinkDetailContainerView.swift b/Targets/App/Sources/UI/LinkDetail/LinkDetailContainerView.swift
index 4b58ca3..10caf20 100644
--- a/Targets/App/Sources/UI/LinkDetail/LinkDetailContainerView.swift
+++ b/Targets/App/Sources/UI/LinkDetail/LinkDetailContainerView.swift
@@ -1,7 +1,7 @@
 import CoreNFC
 import FlinkyCore
 import Photos
-import SentrySPM
+import SentrySwift
 import SwiftUI
 import os.log
 
diff --git a/Targets/App/Sources/UI/LinkDetail/LinkDetailRenderView.swift b/Targets/App/Sources/UI/LinkDetail/LinkDetailRenderView.swift
index fce67ba..99a0ee8 100644
--- a/Targets/App/Sources/UI/LinkDetail/LinkDetailRenderView.swift
+++ b/Targets/App/Sources/UI/LinkDetail/LinkDetailRenderView.swift
@@ -2,7 +2,7 @@ import CoreImage.CIFilterBuiltins
 import FlinkyCore
 import Photos
 import SFSafeSymbols
-import SentrySPM
+import SentrySwift
 import SwiftUI
 
 struct LinkDetailRenderView: View {
diff --git a/Targets/App/Sources/UI/LinkDetailNFCSharing/LinkDetailNFCSharingContainerView.swift b/Targets/App/Sources/UI/LinkDetailNFCSharing/LinkDetailNFCSharingContainerView.swift
index 19eed07..11a8b8a 100644
--- a/Targets/App/Sources/UI/LinkDetailNFCSharing/LinkDetailNFCSharingContainerView.swift
+++ b/Targets/App/Sources/UI/LinkDetailNFCSharing/LinkDetailNFCSharingContainerView.swift
@@ -1,5 +1,5 @@
 import FlinkyCore
-import SentrySPM
+import SentrySwift
 import SwiftUI
 import os.log
 
diff --git a/Targets/App/Sources/UI/LinkDetailNFCSharing/LinkDetailNFCSharingViewModel.swift b/Targets/App/Sources/UI/LinkDetailNFCSharing/LinkDetailNFCSharingViewModel.swift
index a0ec7d8..6e72df5 100644
--- a/Targets/App/Sources/UI/LinkDetailNFCSharing/LinkDetailNFCSharingViewModel.swift
+++ b/Targets/App/Sources/UI/LinkDetailNFCSharing/LinkDetailNFCSharingViewModel.swift
@@ -1,7 +1,7 @@
 import CoreNFC
 import FlinkyCore
 import Foundation
-import SentrySPM
+import SentrySwift
 
 final class LinkDetailNFCSharingViewModel: ObservableObject {
     @Published private(set) var state: NFCSharingState = .ready
diff --git a/Targets/App/Sources/UI/LinkInfo/LinkInfoContainerView.swift b/Targets/App/Sources/UI/LinkInfo/LinkInfoContainerView.swift
index 8112409..7626246 100644
--- a/Targets/App/Sources/UI/LinkInfo/LinkInfoContainerView.swift
+++ b/Targets/App/Sources/UI/LinkInfo/LinkInfoContainerView.swift
@@ -1,5 +1,5 @@
 import FlinkyCore
-import SentrySPM
+import SentrySwift
 import SwiftUI
 import os.log
 
diff --git a/Targets/App/Sources/UI/LinkListDetail/LinkListDetailContainerView.swift b/Targets/App/Sources/UI/LinkListDetail/LinkListDetailContainerView.swift
index a8914f0..198f1b5 100644
--- a/Targets/App/Sources/UI/LinkListDetail/LinkListDetailContainerView.swift
+++ b/Targets/App/Sources/UI/LinkListDetail/LinkListDetailContainerView.swift
@@ -1,5 +1,5 @@
 import FlinkyCore
-import SentrySPM
+import SentrySwift
 import SwiftUI
 import os.log
 
diff --git a/Targets/App/Sources/UI/LinkListInfo/LinkListInfoContainerView.swift b/Targets/App/Sources/UI/LinkListInfo/LinkListInfoContainerView.swift
index 8b9f7b8..477524f 100644
--- a/Targets/App/Sources/UI/LinkListInfo/LinkListInfoContainerView.swift
+++ b/Targets/App/Sources/UI/LinkListInfo/LinkListInfoContainerView.swift
@@ -1,5 +1,5 @@
 import FlinkyCore
-import SentrySPM
+import SentrySwift
 import SwiftUI
 import os.log
 
diff --git a/Targets/App/Sources/UI/LinkLists/LinkListsContainerView.swift b/Targets/App/Sources/UI/LinkLists/LinkListsContainerView.swift
index 8d3fe9f..aa6e67f 100644
--- a/Targets/App/Sources/UI/LinkLists/LinkListsContainerView.swift
+++ b/Targets/App/Sources/UI/LinkLists/LinkListsContainerView.swift
@@ -1,6 +1,6 @@
 import FlinkyCore
 import SFSafeSymbols
-import SentrySPM
+import SentrySwift
 import SwiftData
 import SwiftUI
 import os.log
diff --git a/Targets/App/Sources/UI/MainContainerView.swift b/Targets/App/Sources/UI/MainContainerView.swift
index 822555c..7bd9229 100644
--- a/Targets/App/Sources/UI/MainContainerView.swift
+++ b/Targets/App/Sources/UI/MainContainerView.swift
@@ -1,5 +1,5 @@
 import FlinkyCore
-import SentrySPM
+import SentrySwift
 import SwiftData
 import SwiftUI
 
diff --git a/Targets/App/Sources/Utils/SentryMetricsHelper.swift b/Targets/App/Sources/Utils/SentryMetricsHelper.swift
index ea24113..34fdba4 100644
--- a/Targets/App/Sources/Utils/SentryMetricsHelper.swift
+++ b/Targets/App/Sources/Utils/SentryMetricsHelper.swift
@@ -1,7 +1,7 @@
 // swiftlint:disable type_body_length file_length
 import FlinkyCore
 import Foundation
-import SentrySPM
+import SentrySwift
 
 // MARK: - SentryMetricsHelper
 
diff --git a/Targets/ShareExtension/Sources/ShareViewController.swift b/Targets/ShareExtension/Sources/ShareViewController.swift
index 1eca12f..95a245f 100644
--- a/Targets/ShareExtension/Sources/ShareViewController.swift
+++ b/Targets/ShareExtension/Sources/ShareViewController.swift
@@ -4,7 +4,7 @@ import UIKit
 import Social
 import SwiftData
 import FlinkyCore
-import SentrySPM
+import SentrySwift
 import os.log
 import UniformTypeIdentifiers