diff --git a/Package.resolved b/Package.resolved
index 12783ddb..70cf89d1 100644
--- a/Package.resolved
+++ b/Package.resolved
@@ -1,5 +1,5 @@
 {
-  "originHash" : "3c1107143d7c60927c6fc00f659a2b28094d832d3d52fb0ddac4e46ea04ada28",
+  "originHash" : "862ba9dae9da8bb879e98cc63b111e57a32e748ca3ededbba74967181140cdd3",
   "pins" : [
     {
       "identity" : "combine-schedulers",
@@ -15,8 +15,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/doozMen/GRDB.swift",
       "state" : {
-        "branch" : "master",
-        "revision" : "aa0079aeb82a4bf00324561a40bffe68c6fe1c26"
+        "revision" : "7b82afdecee61df975dd7af96dc0e406327f1c8f",
+        "version" : "7.9.0-fork.1"
       }
     },
     {
@@ -94,10 +94,10 @@
     {
       "identity" : "swift-perception",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/doozMen/swift-perception",
+      "location" : "https://github.com/pointfreeco/swift-perception",
       "state" : {
-        "branch" : "main",
-        "revision" : "9237a92716ccbcd4be8c5330ed372f243c9d23d9"
+        "revision" : "4f47ebafed5f0b0172cf5c661454fa8e28fb2ac4",
+        "version" : "2.0.9"
       }
     },
     {
@@ -105,8 +105,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/doozMen/swift-sharing",
       "state" : {
-        "branch" : "main",
-        "revision" : "a367f93207aa67a7a9953946ae3b8d47d223f6af"
+        "revision" : "3bfc408cc2d0bee2287c174da6b1c76768377818",
+        "version" : "2.7.4"
       }
     },
     {
@@ -123,8 +123,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/doozMen/swift-structured-queries",
       "state" : {
-        "branch" : "main",
-        "revision" : "85f39901d6c6046fa2f5119717741d9cc8a50b7f"
+        "revision" : "006528836875aed1f46ba8c95acf0983e6b22b12",
+        "version" : "0.30.0-fork.1"
       }
     },
     {
@@ -136,15 +136,6 @@
         "version" : "602.0.0"
       }
     },
-    {
-      "identity" : "swift-tagged",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/pointfreeco/swift-tagged",
-      "state" : {
-        "revision" : "3907a9438f5b57d317001dc99f3f11b46882272b",
-        "version" : "0.10.0"
-      }
-    },
     {
       "identity" : "xctest-dynamic-overlay",
       "kind" : "remoteSourceControl",
diff --git a/Package.swift b/Package.swift
index 5da66c6e..0b9ca1ef 100644
--- a/Package.swift
+++ b/Package.swift
@@ -25,18 +25,15 @@ let package = Package(
     ],
     dependencies: [
         .package(url: "https://github.com/apple/swift-collections", from: "1.0.0"),
-        // NB: Fork synced with upstream v7.9.0
-        .package(url: "https://github.com/doozMen/GRDB.swift", branch: "master"),
+        .package(url: "https://github.com/doozMen/GRDB.swift", exact: "7.9.0-fork.1"),
         .package(url: "https://github.com/pointfreeco/swift-concurrency-extras", from: "1.0.0"),
         .package(url: "https://github.com/pointfreeco/swift-custom-dump", from: "1.3.3"),
         .package(url: "https://github.com/pointfreeco/swift-dependencies", from: "1.9.0"),
-        // NB: Fork with Swift 6.3 fixes
-        .package(url: "https://github.com/doozMen/swift-sharing", branch: "fix/swift-623-optimizer-crash"),
+        .package(url: "https://github.com/doozMen/swift-sharing", from: "2.7.4"),
         .package(url: "https://github.com/pointfreeco/swift-snapshot-testing", from: "1.18.4"),
-        // NB: Fork with Swift 6.3 fixes
         .package(
             url: "https://github.com/doozMen/swift-structured-queries",
-            branch: "main",
+            exact: "0.30.0-fork.1",
             traits: [
                 .trait(
                     name: "StructuredQueriesTagged",
@@ -70,6 +67,8 @@ let package = Package(
                 "SQLiteData",
                 .product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"),
                 .product(name: "CustomDump", package: "swift-custom-dump"),
+                .product(name: "InlineSnapshotTesting", package: "swift-snapshot-testing"),
+                .product(name: "StructuredQueriesTestSupport", package: "swift-structured-queries"),
             ]
         ),
         .testTarget(