diff --git a/.beta-build b/.beta-build
index 3a874aff..ac8b4e04 100644
--- a/.beta-build
+++ b/.beta-build
@@ -1 +1 @@
-2967
+2971
diff --git a/Gemfile.lock b/Gemfile.lock
index 17b3ab45..808b1dab 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -3,7 +3,7 @@ GEM
   specs:
     CFPropertyList (3.0.5)
       rexml
-    activesupport (6.1.4.1)
+    activesupport (6.1.4.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -17,17 +17,17 @@ GEM
     artifactory (3.0.15)
     atomos (0.1.3)
     aws-eventstream (1.2.0)
-    aws-partitions (1.539.0)
-    aws-sdk-core (3.124.0)
+    aws-partitions (1.544.0)
+    aws-sdk-core (3.125.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.52.0)
-      aws-sdk-core (~> 3, >= 3.122.0)
+    aws-sdk-kms (1.53.0)
+      aws-sdk-core (~> 3, >= 3.125.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.109.0)
-      aws-sdk-core (~> 3, >= 3.122.0)
+    aws-sdk-s3 (1.110.0)
+      aws-sdk-core (~> 3, >= 3.125.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
     aws-sigv4 (1.4.0)
@@ -86,7 +86,7 @@ GEM
     escape (0.0.4)
     ethon (0.15.0)
       ffi (>= 1.15.0)
-    excon (0.88.0)
+    excon (0.89.0)
     faraday (1.8.0)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -111,8 +111,8 @@ GEM
     faraday-rack (1.0.0)
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
-    fastimage (2.2.5)
-    fastlane (2.198.1)
+    fastimage (2.2.6)
+    fastlane (2.199.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -155,7 +155,7 @@ GEM
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.13.0)
+    google-apis-androidpublisher_v3 (0.14.0)
       google-apis-core (>= 0.4, < 2.a)
     google-apis-core (0.4.1)
       addressable (~> 2.5, >= 2.5.1)
@@ -166,11 +166,11 @@ GEM
       retriable (>= 2.0, < 4.a)
       rexml
       webrick
-    google-apis-iamcredentials_v1 (0.8.0)
+    google-apis-iamcredentials_v1 (0.9.0)
       google-apis-core (>= 0.4, < 2.a)
     google-apis-playcustomapp_v1 (0.6.0)
       google-apis-core (>= 0.4, < 2.a)
-    google-apis-storage_v1 (0.9.0)
+    google-apis-storage_v1 (0.10.0)
       google-apis-core (>= 0.4, < 2.a)
     google-cloud-core (1.6.0)
       google-cloud-env (~> 1.0)
@@ -178,8 +178,8 @@ GEM
     google-cloud-env (1.5.0)
       faraday (>= 0.17.3, < 2.0)
     google-cloud-errors (1.2.0)
-    google-cloud-storage (1.34.1)
-      addressable (~> 2.5)
+    google-cloud-storage (1.35.0)
+      addressable (~> 2.8)
       digest-crc (~> 0.4)
       google-apis-iamcredentials_v1 (~> 0.1)
       google-apis-storage_v1 (~> 0.1)
@@ -205,7 +205,7 @@ GEM
     memoist (0.16.2)
     mini_magick (4.11.0)
     mini_mime (1.1.2)
-    minitest (5.14.4)
+    minitest (5.15.0)
     molinillo (0.8.0)
     multi_json (1.15.0)
     multipart-post (2.0.0)
@@ -267,7 +267,7 @@ GEM
       rouge (~> 2.0.7)
     xcpretty-travis-formatter (1.0.1)
       xcpretty (~> 0.2, >= 0.0.7)
-    zeitwerk (2.5.1)
+    zeitwerk (2.5.3)
 
 PLATFORMS
   ruby
diff --git a/Passepartout.xcodeproj/project.pbxproj b/Passepartout.xcodeproj/project.pbxproj
index 88fc210e..e5f7bc80 100644
--- a/Passepartout.xcodeproj/project.pbxproj
+++ b/Passepartout.xcodeproj/project.pbxproj
@@ -1426,7 +1426,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 2967;
+				CURRENT_PROJECT_VERSION = 2971;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_BITCODE = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -1492,7 +1492,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 2967;
+				CURRENT_PROJECT_VERSION = 2971;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_BITCODE = NO;
 				ENABLE_NS_ASSERTIONS = NO;
diff --git a/Passepartout/App/iOS/Info.plist b/Passepartout/App/iOS/Info.plist
index d1d1ebbb..4d3ba852 100644
--- a/Passepartout/App/iOS/Info.plist
+++ b/Passepartout/App/iOS/Info.plist
@@ -35,7 +35,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.18.0</string>
 	<key>CFBundleVersion</key>
-	<string>2967</string>
+	<string>2971</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>
diff --git a/Passepartout/App/iOS/fastlane/metadata/de-DE/release_notes.txt b/Passepartout/App/iOS/fastlane/metadata/de-DE/release_notes.txt
index 90136aa4..7d6cda22 100644
--- a/Passepartout/App/iOS/fastlane/metadata/de-DE/release_notes.txt
+++ b/Passepartout/App/iOS/fastlane/metadata/de-DE/release_notes.txt
@@ -1,4 +1,8 @@
+### Added
+
+- Handle `--keepalive` option.
+
 ### Changed
 
-- Release app in the open via [GitHub Actions](https://github.com/passepartoutvpn/passepartout-apple/actions).
+- Release app in the open via GitHub Actions.
 
diff --git a/Passepartout/App/iOS/fastlane/metadata/el/release_notes.txt b/Passepartout/App/iOS/fastlane/metadata/el/release_notes.txt
index 90136aa4..7d6cda22 100644
--- a/Passepartout/App/iOS/fastlane/metadata/el/release_notes.txt
+++ b/Passepartout/App/iOS/fastlane/metadata/el/release_notes.txt
@@ -1,4 +1,8 @@
+### Added
+
+- Handle `--keepalive` option.
+
 ### Changed
 
-- Release app in the open via [GitHub Actions](https://github.com/passepartoutvpn/passepartout-apple/actions).
+- Release app in the open via GitHub Actions.
 
diff --git a/Passepartout/App/iOS/fastlane/metadata/en-US/release_notes.txt b/Passepartout/App/iOS/fastlane/metadata/en-US/release_notes.txt
index 90136aa4..7d6cda22 100644
--- a/Passepartout/App/iOS/fastlane/metadata/en-US/release_notes.txt
+++ b/Passepartout/App/iOS/fastlane/metadata/en-US/release_notes.txt
@@ -1,4 +1,8 @@
+### Added
+
+- Handle `--keepalive` option.
+
 ### Changed
 
-- Release app in the open via [GitHub Actions](https://github.com/passepartoutvpn/passepartout-apple/actions).
+- Release app in the open via GitHub Actions.
 
diff --git a/Passepartout/App/iOS/fastlane/metadata/es-MX/release_notes.txt b/Passepartout/App/iOS/fastlane/metadata/es-MX/release_notes.txt
index 90136aa4..7d6cda22 100644
--- a/Passepartout/App/iOS/fastlane/metadata/es-MX/release_notes.txt
+++ b/Passepartout/App/iOS/fastlane/metadata/es-MX/release_notes.txt
@@ -1,4 +1,8 @@
+### Added
+
+- Handle `--keepalive` option.
+
 ### Changed
 
-- Release app in the open via [GitHub Actions](https://github.com/passepartoutvpn/passepartout-apple/actions).
+- Release app in the open via GitHub Actions.
 
diff --git a/Passepartout/App/iOS/fastlane/metadata/fr-FR/release_notes.txt b/Passepartout/App/iOS/fastlane/metadata/fr-FR/release_notes.txt
index 90136aa4..7d6cda22 100755
--- a/Passepartout/App/iOS/fastlane/metadata/fr-FR/release_notes.txt
+++ b/Passepartout/App/iOS/fastlane/metadata/fr-FR/release_notes.txt
@@ -1,4 +1,8 @@
+### Added
+
+- Handle `--keepalive` option.
+
 ### Changed
 
-- Release app in the open via [GitHub Actions](https://github.com/passepartoutvpn/passepartout-apple/actions).
+- Release app in the open via GitHub Actions.
 
diff --git a/Passepartout/App/iOS/fastlane/metadata/it/release_notes.txt b/Passepartout/App/iOS/fastlane/metadata/it/release_notes.txt
index 90136aa4..7d6cda22 100644
--- a/Passepartout/App/iOS/fastlane/metadata/it/release_notes.txt
+++ b/Passepartout/App/iOS/fastlane/metadata/it/release_notes.txt
@@ -1,4 +1,8 @@
+### Added
+
+- Handle `--keepalive` option.
+
 ### Changed
 
-- Release app in the open via [GitHub Actions](https://github.com/passepartoutvpn/passepartout-apple/actions).
+- Release app in the open via GitHub Actions.
 
diff --git a/Passepartout/App/iOS/fastlane/metadata/nl-NL/release_notes.txt b/Passepartout/App/iOS/fastlane/metadata/nl-NL/release_notes.txt
index 90136aa4..7d6cda22 100644
--- a/Passepartout/App/iOS/fastlane/metadata/nl-NL/release_notes.txt
+++ b/Passepartout/App/iOS/fastlane/metadata/nl-NL/release_notes.txt
@@ -1,4 +1,8 @@
+### Added
+
+- Handle `--keepalive` option.
+
 ### Changed
 
-- Release app in the open via [GitHub Actions](https://github.com/passepartoutvpn/passepartout-apple/actions).
+- Release app in the open via GitHub Actions.
 
diff --git a/Passepartout/App/iOS/fastlane/metadata/pl/release_notes.txt b/Passepartout/App/iOS/fastlane/metadata/pl/release_notes.txt
index 90136aa4..7d6cda22 100644
--- a/Passepartout/App/iOS/fastlane/metadata/pl/release_notes.txt
+++ b/Passepartout/App/iOS/fastlane/metadata/pl/release_notes.txt
@@ -1,4 +1,8 @@
+### Added
+
+- Handle `--keepalive` option.
+
 ### Changed
 
-- Release app in the open via [GitHub Actions](https://github.com/passepartoutvpn/passepartout-apple/actions).
+- Release app in the open via GitHub Actions.
 
diff --git a/Passepartout/App/iOS/fastlane/metadata/pt-BR/release_notes.txt b/Passepartout/App/iOS/fastlane/metadata/pt-BR/release_notes.txt
index 90136aa4..7d6cda22 100644
--- a/Passepartout/App/iOS/fastlane/metadata/pt-BR/release_notes.txt
+++ b/Passepartout/App/iOS/fastlane/metadata/pt-BR/release_notes.txt
@@ -1,4 +1,8 @@
+### Added
+
+- Handle `--keepalive` option.
+
 ### Changed
 
-- Release app in the open via [GitHub Actions](https://github.com/passepartoutvpn/passepartout-apple/actions).
+- Release app in the open via GitHub Actions.
 
diff --git a/Passepartout/App/iOS/fastlane/metadata/ru/release_notes.txt b/Passepartout/App/iOS/fastlane/metadata/ru/release_notes.txt
index 90136aa4..7d6cda22 100644
--- a/Passepartout/App/iOS/fastlane/metadata/ru/release_notes.txt
+++ b/Passepartout/App/iOS/fastlane/metadata/ru/release_notes.txt
@@ -1,4 +1,8 @@
+### Added
+
+- Handle `--keepalive` option.
+
 ### Changed
 
-- Release app in the open via [GitHub Actions](https://github.com/passepartoutvpn/passepartout-apple/actions).
+- Release app in the open via GitHub Actions.
 
diff --git a/Passepartout/App/iOS/fastlane/metadata/sv/release_notes.txt b/Passepartout/App/iOS/fastlane/metadata/sv/release_notes.txt
index 90136aa4..7d6cda22 100644
--- a/Passepartout/App/iOS/fastlane/metadata/sv/release_notes.txt
+++ b/Passepartout/App/iOS/fastlane/metadata/sv/release_notes.txt
@@ -1,4 +1,8 @@
+### Added
+
+- Handle `--keepalive` option.
+
 ### Changed
 
-- Release app in the open via [GitHub Actions](https://github.com/passepartoutvpn/passepartout-apple/actions).
+- Release app in the open via GitHub Actions.
 
diff --git a/Passepartout/App/macOS/Info.plist b/Passepartout/App/macOS/Info.plist
index 849fce61..a86471d1 100644
--- a/Passepartout/App/macOS/Info.plist
+++ b/Passepartout/App/macOS/Info.plist
@@ -34,7 +34,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.18.0</string>
 	<key>CFBundleVersion</key>
-	<string>2967</string>
+	<string>2971</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationCategoryType</key>
diff --git a/Passepartout/App/macOS/Launcher/Info.plist b/Passepartout/App/macOS/Launcher/Info.plist
index 7bb335fe..99bdf17d 100644
--- a/Passepartout/App/macOS/Launcher/Info.plist
+++ b/Passepartout/App/macOS/Launcher/Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.18.0</string>
 	<key>CFBundleVersion</key>
-	<string>2967</string>
+	<string>2971</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationCategoryType</key>
diff --git a/Passepartout/App/macOS/fastlane/metadata/de-DE/release_notes.txt b/Passepartout/App/macOS/fastlane/metadata/de-DE/release_notes.txt
index 1ba4b454..99ce7a0b 100644
--- a/Passepartout/App/macOS/fastlane/metadata/de-DE/release_notes.txt
+++ b/Passepartout/App/macOS/fastlane/metadata/de-DE/release_notes.txt
@@ -1,6 +1,10 @@
+### Added
+
+- Handle `--keepalive` option.
+
 ### Changed
 
-- Release app in the open via [GitHub Actions](https://github.com/passepartoutvpn/passepartout-apple/actions).
+- Release app in the open via GitHub Actions.
 
 ### Fixed
 
diff --git a/Passepartout/App/macOS/fastlane/metadata/el/release_notes.txt b/Passepartout/App/macOS/fastlane/metadata/el/release_notes.txt
index 1ba4b454..99ce7a0b 100644
--- a/Passepartout/App/macOS/fastlane/metadata/el/release_notes.txt
+++ b/Passepartout/App/macOS/fastlane/metadata/el/release_notes.txt
@@ -1,6 +1,10 @@
+### Added
+
+- Handle `--keepalive` option.
+
 ### Changed
 
-- Release app in the open via [GitHub Actions](https://github.com/passepartoutvpn/passepartout-apple/actions).
+- Release app in the open via GitHub Actions.
 
 ### Fixed
 
diff --git a/Passepartout/App/macOS/fastlane/metadata/en-US/release_notes.txt b/Passepartout/App/macOS/fastlane/metadata/en-US/release_notes.txt
index 1ba4b454..99ce7a0b 100644
--- a/Passepartout/App/macOS/fastlane/metadata/en-US/release_notes.txt
+++ b/Passepartout/App/macOS/fastlane/metadata/en-US/release_notes.txt
@@ -1,6 +1,10 @@
+### Added
+
+- Handle `--keepalive` option.
+
 ### Changed
 
-- Release app in the open via [GitHub Actions](https://github.com/passepartoutvpn/passepartout-apple/actions).
+- Release app in the open via GitHub Actions.
 
 ### Fixed
 
diff --git a/Passepartout/App/macOS/fastlane/metadata/es-MX/release_notes.txt b/Passepartout/App/macOS/fastlane/metadata/es-MX/release_notes.txt
index 1ba4b454..99ce7a0b 100644
--- a/Passepartout/App/macOS/fastlane/metadata/es-MX/release_notes.txt
+++ b/Passepartout/App/macOS/fastlane/metadata/es-MX/release_notes.txt
@@ -1,6 +1,10 @@
+### Added
+
+- Handle `--keepalive` option.
+
 ### Changed
 
-- Release app in the open via [GitHub Actions](https://github.com/passepartoutvpn/passepartout-apple/actions).
+- Release app in the open via GitHub Actions.
 
 ### Fixed
 
diff --git a/Passepartout/App/macOS/fastlane/metadata/fr-FR/release_notes.txt b/Passepartout/App/macOS/fastlane/metadata/fr-FR/release_notes.txt
index 1ba4b454..99ce7a0b 100644
--- a/Passepartout/App/macOS/fastlane/metadata/fr-FR/release_notes.txt
+++ b/Passepartout/App/macOS/fastlane/metadata/fr-FR/release_notes.txt
@@ -1,6 +1,10 @@
+### Added
+
+- Handle `--keepalive` option.
+
 ### Changed
 
-- Release app in the open via [GitHub Actions](https://github.com/passepartoutvpn/passepartout-apple/actions).
+- Release app in the open via GitHub Actions.
 
 ### Fixed
 
diff --git a/Passepartout/App/macOS/fastlane/metadata/it/release_notes.txt b/Passepartout/App/macOS/fastlane/metadata/it/release_notes.txt
index 1ba4b454..99ce7a0b 100644
--- a/Passepartout/App/macOS/fastlane/metadata/it/release_notes.txt
+++ b/Passepartout/App/macOS/fastlane/metadata/it/release_notes.txt
@@ -1,6 +1,10 @@
+### Added
+
+- Handle `--keepalive` option.
+
 ### Changed
 
-- Release app in the open via [GitHub Actions](https://github.com/passepartoutvpn/passepartout-apple/actions).
+- Release app in the open via GitHub Actions.
 
 ### Fixed
 
diff --git a/Passepartout/App/macOS/fastlane/metadata/nl-NL/release_notes.txt b/Passepartout/App/macOS/fastlane/metadata/nl-NL/release_notes.txt
index 1ba4b454..99ce7a0b 100644
--- a/Passepartout/App/macOS/fastlane/metadata/nl-NL/release_notes.txt
+++ b/Passepartout/App/macOS/fastlane/metadata/nl-NL/release_notes.txt
@@ -1,6 +1,10 @@
+### Added
+
+- Handle `--keepalive` option.
+
 ### Changed
 
-- Release app in the open via [GitHub Actions](https://github.com/passepartoutvpn/passepartout-apple/actions).
+- Release app in the open via GitHub Actions.
 
 ### Fixed
 
diff --git a/Passepartout/App/macOS/fastlane/metadata/pl/release_notes.txt b/Passepartout/App/macOS/fastlane/metadata/pl/release_notes.txt
index 1ba4b454..99ce7a0b 100644
--- a/Passepartout/App/macOS/fastlane/metadata/pl/release_notes.txt
+++ b/Passepartout/App/macOS/fastlane/metadata/pl/release_notes.txt
@@ -1,6 +1,10 @@
+### Added
+
+- Handle `--keepalive` option.
+
 ### Changed
 
-- Release app in the open via [GitHub Actions](https://github.com/passepartoutvpn/passepartout-apple/actions).
+- Release app in the open via GitHub Actions.
 
 ### Fixed
 
diff --git a/Passepartout/App/macOS/fastlane/metadata/pt-BR/release_notes.txt b/Passepartout/App/macOS/fastlane/metadata/pt-BR/release_notes.txt
index 1ba4b454..99ce7a0b 100644
--- a/Passepartout/App/macOS/fastlane/metadata/pt-BR/release_notes.txt
+++ b/Passepartout/App/macOS/fastlane/metadata/pt-BR/release_notes.txt
@@ -1,6 +1,10 @@
+### Added
+
+- Handle `--keepalive` option.
+
 ### Changed
 
-- Release app in the open via [GitHub Actions](https://github.com/passepartoutvpn/passepartout-apple/actions).
+- Release app in the open via GitHub Actions.
 
 ### Fixed
 
diff --git a/Passepartout/App/macOS/fastlane/metadata/ru/release_notes.txt b/Passepartout/App/macOS/fastlane/metadata/ru/release_notes.txt
index 1ba4b454..99ce7a0b 100644
--- a/Passepartout/App/macOS/fastlane/metadata/ru/release_notes.txt
+++ b/Passepartout/App/macOS/fastlane/metadata/ru/release_notes.txt
@@ -1,6 +1,10 @@
+### Added
+
+- Handle `--keepalive` option.
+
 ### Changed
 
-- Release app in the open via [GitHub Actions](https://github.com/passepartoutvpn/passepartout-apple/actions).
+- Release app in the open via GitHub Actions.
 
 ### Fixed
 
diff --git a/Passepartout/App/macOS/fastlane/metadata/sv/release_notes.txt b/Passepartout/App/macOS/fastlane/metadata/sv/release_notes.txt
index 1ba4b454..99ce7a0b 100644
--- a/Passepartout/App/macOS/fastlane/metadata/sv/release_notes.txt
+++ b/Passepartout/App/macOS/fastlane/metadata/sv/release_notes.txt
@@ -1,6 +1,10 @@
+### Added
+
+- Handle `--keepalive` option.
+
 ### Changed
 
-- Release app in the open via [GitHub Actions](https://github.com/passepartoutvpn/passepartout-apple/actions).
+- Release app in the open via GitHub Actions.
 
 ### Fixed
 
diff --git a/Passepartout/Tunnel/Info.plist b/Passepartout/Tunnel/Info.plist
index fd011773..6cb8ce4a 100644
--- a/Passepartout/Tunnel/Info.plist
+++ b/Passepartout/Tunnel/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.18.0</string>
 	<key>CFBundleVersion</key>
-	<string>2967</string>
+	<string>2971</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSExtension</key>
diff --git a/PassepartoutCore/Sources/PassepartoutCore/API b/PassepartoutCore/Sources/PassepartoutCore/API
index 9cc2d686..b7f9b3ac 160000
--- a/PassepartoutCore/Sources/PassepartoutCore/API
+++ b/PassepartoutCore/Sources/PassepartoutCore/API
@@ -1 +1 @@
-Subproject commit 9cc2d686118998084fe21c915768ad1341e622eb
+Subproject commit b7f9b3acbb327755ce7a8ed673c27f20fc5053e4