diff --git a/Passepartout.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Passepartout.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 41b40b06..1c499189 100644
--- a/Passepartout.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/Passepartout.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -41,7 +41,7 @@
       "kind" : "remoteSourceControl",
       "location" : "git@github.com:passepartoutvpn/passepartoutkit-source",
       "state" : {
-        "revision" : "ead8d1652fc6875f8865a1c8610b0cc35828dee6"
+        "revision" : "288ccbf1e1a984c8dc3a7cd2fd23d3d3fc4464f6"
       }
     },
     {
diff --git a/Passepartout/Library/Package.swift b/Passepartout/Library/Package.swift
index 1f323394..c01e8f68 100644
--- a/Passepartout/Library/Package.swift
+++ b/Passepartout/Library/Package.swift
@@ -28,7 +28,7 @@ let package = Package(
     ],
     dependencies: [
 //        .package(url: "git@github.com:passepartoutvpn/passepartoutkit-source", from: "0.9.0"),
-        .package(url: "git@github.com:passepartoutvpn/passepartoutkit-source", revision: "ead8d1652fc6875f8865a1c8610b0cc35828dee6"),
+        .package(url: "git@github.com:passepartoutvpn/passepartoutkit-source", revision: "288ccbf1e1a984c8dc3a7cd2fd23d3d3fc4464f6"),
 //        .package(path: "../../../passepartoutkit-source"),
         .package(url: "git@github.com:passepartoutvpn/passepartoutkit-source-openvpn-openssl", from: "0.9.1"),
 //        .package(url: "git@github.com:passepartoutvpn/passepartoutkit-source-openvpn-openssl", revision: "031863a1cd683962a7dfe68e20b91fa820a1ecce"),
diff --git a/Passepartout/Library/Sources/AppLibrary/Business/NEProfileRepository.swift b/Passepartout/Library/Sources/AppLibrary/Business/NEProfileRepository.swift
index a552c3e8..a4d0afab 100644
--- a/Passepartout/Library/Sources/AppLibrary/Business/NEProfileRepository.swift
+++ b/Passepartout/Library/Sources/AppLibrary/Business/NEProfileRepository.swift
@@ -65,13 +65,10 @@ public final class NEProfileRepository: ProfileRepository {
         profilesSubject.eraseToAnyPublisher()
     }
 
-    // unused in app, rely on Tunnel.prepare()
-    public func loadProfiles(purge: Bool) async throws {
-        try await repository.load(purge: purge)
-    }
-
     public func saveProfile(_ profile: Profile) async throws {
-        try await repository.save(profile, connect: false, title: title)
+
+        // FIXME: #379, save + reconnect in some scenarios
+        try await repository.save(profile, forConnecting: false, title: title)
         if let index = profilesSubject.value.firstIndex(where: { $0.id == profile.id }) {
             profilesSubject.value[index] = profile
         } else {
diff --git a/Passepartout/Library/Sources/AppUI/Business/AppContext.swift b/Passepartout/Library/Sources/AppUI/Business/AppContext.swift
index 5a88428f..ee6e194c 100644
--- a/Passepartout/Library/Sources/AppUI/Business/AppContext.swift
+++ b/Passepartout/Library/Sources/AppUI/Business/AppContext.swift
@@ -115,9 +115,6 @@ private extension AppContext {
                 try await tunnel.disconnect()
                 return
             }
-            if tunnel.status == .active {
-                try await tunnel.connect(with: profile, processor: profileProcessor)
-            }
         }
     }
 }
diff --git a/Passepartout/Library/Sources/AppUI/Views/UI/TunnelRestartButton.swift b/Passepartout/Library/Sources/AppUI/Views/UI/TunnelRestartButton.swift
index 06ad0c50..38358db6 100644
--- a/Passepartout/Library/Sources/AppUI/Views/UI/TunnelRestartButton.swift
+++ b/Passepartout/Library/Sources/AppUI/Views/UI/TunnelRestartButton.swift
@@ -41,9 +41,6 @@ struct TunnelRestartButton<Label>: View where Label: View {
 
     let label: () -> Label
 
-    @State
-    private var pendingTask: Task<Void, Error>?
-
     var body: some View {
         Button {
             guard let profile else {
@@ -52,10 +49,11 @@ struct TunnelRestartButton<Label>: View where Label: View {
             guard tunnel.status == .active else {
                 return
             }
-            pendingTask?.cancel()
-            pendingTask = Task {
+            Task {
                 do {
                     try await tunnel.connect(with: profile, processor: profileProcessor)
+                } catch is CancellationError {
+                    //
                 } catch {
                     errorHandler.handle(
                         error,
diff --git a/Passepartout/Library/Sources/AppUI/Views/UI/TunnelToggleButton.swift b/Passepartout/Library/Sources/AppUI/Views/UI/TunnelToggleButton.swift
index 17481a82..15e827fa 100644
--- a/Passepartout/Library/Sources/AppUI/Views/UI/TunnelToggleButton.swift
+++ b/Passepartout/Library/Sources/AppUI/Views/UI/TunnelToggleButton.swift
@@ -62,9 +62,6 @@ struct TunnelToggleButton<Label>: View, TunnelContextProviding, ThemeProviding w
 
     let label: (Bool) -> Label
 
-    @State
-    private var pendingTask: Task<Void, Error>?
-
     var body: some View {
         Button(action: tryPerform) {
             label(canConnect)
@@ -100,12 +97,13 @@ private extension TunnelToggleButton {
 
 private extension TunnelToggleButton {
     func tryPerform() {
-        pendingTask?.cancel()
-        pendingTask = Task {
+        Task {
             guard let profile else {
                 return
             }
-            nextProfileId = profile.id
+            if !isInstalled {
+                nextProfileId = profile.id
+            }
             defer {
                 if nextProfileId == profile.id {
                     nextProfileId = nil
@@ -137,6 +135,8 @@ private extension TunnelToggleButton {
             } else {
                 try await tunnel.connect(with: profile, processor: profileProcessor)
             }
+        } catch is CancellationError {
+            //
         } catch {
             errorHandler.handle(
                 error,
diff --git a/Passepartout/Shared/Shared+App.swift b/Passepartout/Shared/Shared+App.swift
index 5368676a..b2b0e2f1 100644
--- a/Passepartout/Shared/Shared+App.swift
+++ b/Passepartout/Shared/Shared+App.swift
@@ -182,19 +182,19 @@ private extension ProfileManager {
 
 extension Tunnel {
     static let shared = Tunnel(
-        strategy: NETunnelStrategy(repository: ProfileManager.neRepository)
+        strategy: ProfileManager.neStrategy
     )
 }
 
 private extension ProfileManager {
     static let localProfileRepository: ProfileRepository = {
-        NEProfileRepository(repository: neRepository) {
+        NEProfileRepository(repository: neStrategy) {
             ProfileManager.sharedTitle($0)
         }
     }()
 
-    static let neRepository: NETunnelManagerRepository = {
-        NETunnelManagerRepository(
+    static let neStrategy: NETunnelStrategy = {
+        NETunnelStrategy(
             bundleIdentifier: BundleConfiguration.mainString(for: .tunnelId),
             coder: Registry.sharedProtocolCoder,
             environment: .shared