diff --git a/Passepartout.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Passepartout.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 66247351..f9a6a407 100644
--- a/Passepartout.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/Passepartout.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -28,29 +28,30 @@
       }
     },
     {
-      "identity" : "passepartoutkit",
+      "identity" : "passepartoutkit-source",
       "kind" : "remoteSourceControl",
-      "location" : "git@github.com:passepartoutvpn/passepartoutkit",
+      "location" : "git@github.com:passepartoutvpn/passepartoutkit-source",
       "state" : {
-        "revision" : "2e61214462dcf6ad9e211d8fdbd611c6755845c4"
+        "revision" : "2e61214462dcf6ad9e211d8fdbd611c6755845c4",
+        "version" : "0.8.0"
       }
     },
     {
-      "identity" : "passepartoutkit-openvpn-openssl",
+      "identity" : "passepartoutkit-source-openvpn-openssl",
       "kind" : "remoteSourceControl",
-      "location" : "git@github.com:passepartoutvpn/passepartoutkit-openvpn-openssl",
+      "location" : "git@github.com:passepartoutvpn/passepartoutkit-source-openvpn-openssl",
       "state" : {
-        "revision" : "a3092a6ee0a63f666aa47ef3f0f50c324a64598d",
-        "version" : "0.6.0"
+        "revision" : "031863a1cd683962a7dfe68e20b91fa820a1ecce",
+        "version" : "0.8.0"
       }
     },
     {
-      "identity" : "passepartoutkit-wireguard-go",
+      "identity" : "passepartoutkit-source-wireguard-go",
       "kind" : "remoteSourceControl",
-      "location" : "git@github.com:passepartoutvpn/passepartoutkit-wireguard-go",
+      "location" : "git@github.com:passepartoutvpn/passepartoutkit-source-wireguard-go",
       "state" : {
-        "revision" : "2cbd6023300d2dcc3f6f68de4812cf390421ec35",
-        "version" : "0.6.2"
+        "revision" : "ea39fa396e98cfd2b9a235f0a801aaf03a37e30a",
+        "version" : "0.8.0"
       }
     },
     {
diff --git a/Passepartout/Library/Package.resolved b/Passepartout/Library/Package.resolved
deleted file mode 100644
index d97cd9a2..00000000
--- a/Passepartout/Library/Package.resolved
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-  "pins" : [
-    {
-      "identity" : "dtfoundation",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/Cocoanetics/DTFoundation.git",
-      "state" : {
-        "revision" : "a61be65dd7d5b2cde3acabd13bf320b71f2907a5",
-        "version" : "1.7.19"
-      }
-    },
-    {
-      "identity" : "kvitto",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/Cocoanetics/Kvitto",
-      "state" : {
-        "revision" : "88888674d772ddcf19671159ed0022cb0bc37be2",
-        "version" : "1.0.6"
-      }
-    },
-    {
-      "identity" : "openssl-apple",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/passepartoutvpn/openssl-apple",
-      "state" : {
-        "revision" : "0edc07c7a0e4ec2ca0f448dd68314241ccc925b3",
-        "version" : "3.2.107"
-      }
-    },
-    {
-      "identity" : "passepartoutkit",
-      "kind" : "remoteSourceControl",
-      "location" : "git@github.com:passepartoutvpn/passepartoutkit",
-      "state" : {
-        "revision" : "2c32459d6a669e8feed0e6ea2d1250ef72364aa3",
-        "version" : "0.7.0"
-      }
-    },
-    {
-      "identity" : "passepartoutkit-openvpn-openssl",
-      "kind" : "remoteSourceControl",
-      "location" : "git@github.com:passepartoutvpn/passepartoutkit-openvpn-openssl",
-      "state" : {
-        "revision" : "a3092a6ee0a63f666aa47ef3f0f50c324a64598d",
-        "version" : "0.6.0"
-      }
-    },
-    {
-      "identity" : "passepartoutkit-wireguard-go",
-      "kind" : "remoteSourceControl",
-      "location" : "git@github.com:passepartoutvpn/passepartoutkit-wireguard-go",
-      "state" : {
-        "revision" : "2cbd6023300d2dcc3f6f68de4812cf390421ec35",
-        "version" : "0.6.2"
-      }
-    },
-    {
-      "identity" : "wg-go-apple",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/passepartoutvpn/wg-go-apple",
-      "state" : {
-        "revision" : "860e82efaf261da37483a5f51555be83e5a79ad3",
-        "version" : "0.0.20240714"
-      }
-    },
-    {
-      "identity" : "wireguard-apple",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/passepartoutvpn/wireguard-apple",
-      "state" : {
-        "revision" : "a896f784bc5ed94f29d97e376be5cfa08d4a5d44",
-        "version" : "1.1.1"
-      }
-    }
-  ],
-  "version" : 2
-}
diff --git a/Passepartout/Library/Package.swift b/Passepartout/Library/Package.swift
index 2766677e..10d0ae7f 100644
--- a/Passepartout/Library/Package.swift
+++ b/Passepartout/Library/Package.swift
@@ -30,13 +30,15 @@ let package = Package(
         )
     ],
     dependencies: [
-//        .package(url: "git@github.com:passepartoutvpn/passepartoutkit", from: "0.7.0"),
-        .package(url: "git@github.com:passepartoutvpn/passepartoutkit", revision: "2e61214462dcf6ad9e211d8fdbd611c6755845c4"),
-//        .package(path: "../../../passepartoutkit"),
-        .package(url: "git@github.com:passepartoutvpn/passepartoutkit-openvpn-openssl", from: "0.6.0"),
-//        .package(path: "../../../passepartoutkit-openvpn-openssl"),
-        .package(url: "git@github.com:passepartoutvpn/passepartoutkit-wireguard-go", from: "0.6.2"),
-//        .package(path: "../../../passepartoutkit-wireguard-go"),
+        .package(url: "git@github.com:passepartoutvpn/passepartoutkit-source", from: "0.8.0"),
+//        .package(url: "git@github.com:passepartoutvpn/passepartoutkit-source", revision: "2e61214462dcf6ad9e211d8fdbd611c6755845c4"),
+//        .package(path: "../../../passepartoutkit-source"),
+        .package(url: "git@github.com:passepartoutvpn/passepartoutkit-source-openvpn-openssl", from: "0.8.0"),
+//        .package(url: "git@github.com:passepartoutvpn/passepartoutkit-source-openvpn-openssl", revision: "031863a1cd683962a7dfe68e20b91fa820a1ecce"),
+//        .package(path: "../../../passepartoutkit-source-openvpn-openssl"),
+        .package(url: "git@github.com:passepartoutvpn/passepartoutkit-source-wireguard-go", from: "0.8.0"),
+//            .package(url: "git@github.com:passepartoutvpn/passepartoutkit-source-wireguard-go", revision: "ea39fa396e98cfd2b9a235f0a801aaf03a37e30a"),
+//        .package(path: "../../../passepartoutkit-source-wireguard-go"),
         .package(url: "https://github.com/Cocoanetics/Kvitto", from: "1.0.0")
     ],
     targets: [
@@ -45,7 +47,7 @@ let package = Package(
         .target(
             name: "AppData",
             dependencies: [
-                .product(name: "PassepartoutKit", package: "passepartoutkit")
+                .product(name: "PassepartoutKit", package: "passepartoutkit-source")
             ]
         ),
         .target(
@@ -53,7 +55,7 @@ let package = Package(
             dependencies: [
                 "AppData",
                 "UtilsLibrary",
-                .product(name: "PassepartoutKit", package: "passepartoutkit")
+                .product(name: "PassepartoutKit", package: "passepartoutkit-source")
             ],
             resources: [
                 .process("Profiles.xcdatamodeld")
@@ -79,9 +81,9 @@ let package = Package(
         .target(
             name: "CommonLibrary",
             dependencies: [
-                .product(name: "PassepartoutKit", package: "passepartoutkit"),
-                .product(name: "PassepartoutOpenVPNOpenSSL", package: "passepartoutkit-openvpn-openssl"),
-                .product(name: "PassepartoutWireGuardGo", package: "passepartoutkit-wireguard-go")
+                .product(name: "PassepartoutKit", package: "passepartoutkit-source"),
+                .product(name: "PassepartoutOpenVPNOpenSSL", package: "passepartoutkit-source-openvpn-openssl"),
+                .product(name: "PassepartoutWireGuardGo", package: "passepartoutkit-source-wireguard-go")
             ],
             resources: [
                 .process("Resources")
@@ -90,7 +92,7 @@ let package = Package(
         .target(
             name: "LegacyV2",
             dependencies: [
-                .product(name: "PassepartoutKit", package: "passepartoutkit")
+                .product(name: "PassepartoutKit", package: "passepartoutkit-source")
             ],
             resources: [
                 .process("Profiles.xcdatamodeld")