diff --git a/.env b/.env
index dff1bf71..ca0e8122 100644
--- a/.env
+++ b/.env
@@ -1,3 +1,4 @@
 # constant (fastlane)
 LC_ALL="en_US.UTF-8"
 LANG="en_US.UTF-8"
+BASE_BUILD_NUMBER="1071"
diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml
index 9ad17ecf..8d1bf86a 100644
--- a/.github/workflows/beta.yml
+++ b/.github/workflows/beta.yml
@@ -34,7 +34,6 @@ jobs:
     steps:
       - uses: actions/checkout@v2
         with:
-          fetch-depth: 0
           submodules: true
       - name: Prepare build
         uses: ./.github/actions/prepare-build-app
@@ -48,7 +47,6 @@ jobs:
     steps:
       - uses: actions/checkout@v2
         with:
-          fetch-depth: 0
           submodules: true
       - name: Prepare build
         uses: ./.github/actions/prepare-build-app
@@ -67,7 +65,6 @@ jobs:
     steps:
       - uses: actions/checkout@v2
         with:
-          fetch-depth: 0
           submodules: true
       - name: Prepare build
         uses: ./.github/actions/prepare-build-app
@@ -93,7 +90,6 @@ jobs:
       - name: Check out repository
         uses: actions/checkout@v2
         with:
-          fetch-depth: 0
           submodules: true
       - name: Prepare Ruby bundle
         uses: ruby/setup-ruby@v1
@@ -122,7 +118,6 @@ jobs:
       - name: Check out repository
         uses: actions/checkout@v2
         with:
-          fetch-depth: 0
           submodules: true
       - name: Prepare Ruby bundle
         uses: ruby/setup-ruby@v1
diff --git a/Passepartout.xcodeproj/project.pbxproj b/Passepartout.xcodeproj/project.pbxproj
index 397b6d87..90a4a0fe 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 = 1071;
+				CURRENT_PROJECT_VERSION = 2935;
 				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 = 1071;
+				CURRENT_PROJECT_VERSION = 2935;
 				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 2d96142d..ff30fa53 100644
--- a/Passepartout/App/iOS/Info.plist
+++ b/Passepartout/App/iOS/Info.plist
@@ -35,7 +35,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.17.2</string>
 	<key>CFBundleVersion</key>
-	<string>1071</string>
+	<string>2935</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>
diff --git a/Passepartout/App/macOS/Info.plist b/Passepartout/App/macOS/Info.plist
index 2c1648d6..d9c87b50 100644
--- a/Passepartout/App/macOS/Info.plist
+++ b/Passepartout/App/macOS/Info.plist
@@ -34,7 +34,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.17.2</string>
 	<key>CFBundleVersion</key>
-	<string>1071</string>
+	<string>2935</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 3e0315f9..d1271282 100644
--- a/Passepartout/App/macOS/Launcher/Info.plist
+++ b/Passepartout/App/macOS/Launcher/Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.17.2</string>
 	<key>CFBundleVersion</key>
-	<string>1071</string>
+	<string>2935</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationCategoryType</key>
diff --git a/Passepartout/Tunnel/Info.plist b/Passepartout/Tunnel/Info.plist
index 55b32aa3..4e919c52 100644
--- a/Passepartout/Tunnel/Info.plist
+++ b/Passepartout/Tunnel/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.17.2</string>
 	<key>CFBundleVersion</key>
-	<string>1071</string>
+	<string>2935</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 666d370e..a3588654 160000
--- a/PassepartoutCore/Sources/PassepartoutCore/API
+++ b/PassepartoutCore/Sources/PassepartoutCore/API
@@ -1 +1 @@
-Subproject commit 666d370e838973fcac8d5271d0e54b1703f2ca3b
+Subproject commit a35886548dd3068e4173d51dd448288b45ad3eff
diff --git a/Submodules/fastlane-ci-templates b/Submodules/fastlane-ci-templates
index 149a7f44..26620d59 160000
--- a/Submodules/fastlane-ci-templates
+++ b/Submodules/fastlane-ci-templates
@@ -1 +1 @@
-Subproject commit 149a7f44475708f5b75889fd489bdbd6a063232b
+Subproject commit 26620d596ca3bbc25be6cc2efa2b52797021379a
diff --git a/scripts/commit-beta.sh b/scripts/commit-beta.sh
index 7b33052f..d722dfe1 100755
--- a/scripts/commit-beta.sh
+++ b/scripts/commit-beta.sh
@@ -5,17 +5,32 @@ if [[ $CURRENT_BRANCH != "master" ]]; then
     exit
 fi
 
+# just in case
+scripts/after-beta.sh
+
+# set build number
+. .env
+BUILD=$((BASE_BUILD_NUMBER + `git rev-list HEAD --count` + 1))
+ci/set-build.sh $BUILD
+
+# set release notes
 ci/update-changelog.sh ios &&
     ci/update-changelog.sh mac &&
     ci/copy-release-notes.sh ios &&
     ci/copy-release-notes.sh mac
 
+# pull latest API
 git -C PassepartoutCore/Sources/PassepartoutCore/API pull origin master
 git add */PassepartoutCore/API
+
+# add build number
+git add Passepartout.xcodeproj
+git add *.plist
+
+# add release notes
 git add Passepartout/App/*/CHANGELOG.md
 git add Passepartout/App/*/fastlane/metadata/*/release_notes.txt
-git commit -m "Set beta release"
 
-VERSION=`ci/version-number.sh ios`
-BUILD=`ci/build-number.sh ios`
-git tag "v$VERSION-b$BUILD"
+git commit -m "Set beta release"
+#VERSION=`ci/version-number.sh ios`
+#git tag "v$VERSION-b$BUILD"