diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 54d63bd37d..2d25eecb78 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -40,7 +40,7 @@ android {
         multiDexEnabled = true
 
         buildConfigField("String", "COMMIT_COUNT", "\"${getCommitCount()}\"")
-        buildConfigField("String", "BETA_COMMIT_COUNT", "\"${getCommitCountSinceLastRelease()}\"")
+        buildConfigField("String", "BETA_COUNT", "\"${getBetaCount()}\"")
         buildConfigField("String", "COMMIT_SHA", "\"${getGitSha()}\"")
         buildConfigField("String", "BUILD_TIME", "\"${getBuildTime()}\"")
         buildConfigField("Boolean", "INCLUDE_UPDATER", "false")
@@ -79,8 +79,7 @@ android {
         create("beta") {
             initWith(getByName("release"))
             buildConfigField("boolean", "BETA", "true")
-
-            versionNameSuffix = "-b${getCommitCountSinceLastRelease()}"
+            versionNameSuffix = "-b${getBetaCount()}"
         }
     }
 
diff --git a/buildSrc/src/main/kotlin/Commands.kt b/buildSrc/src/main/kotlin/Commands.kt
index 4e1a469a25..8ed139fe2c 100644
--- a/buildSrc/src/main/kotlin/Commands.kt
+++ b/buildSrc/src/main/kotlin/Commands.kt
@@ -11,15 +11,14 @@ fun Project.getCommitCount(): String {
     // return "1"
 }
 
-fun Project.getCommitCountSinceLastRelease(): String {
+fun Project.getBetaCount(): String {
     val betaTags = runCommand("git tag -l --sort=refname v${AndroidVersions.versionName}-b*")
-    return if (betaTags.isNotEmpty()) {
-        val betaTag = betaTags.split("\n").last()
-        runCommand("git rev-list --count $betaTag..HEAD").toIntOrNull()?.toString() ?: "1"
+    return String.format("%02d", if (betaTags.isNotEmpty()) {
+        val betaTag = betaTags.split("\n").last().substringAfter("-b").toIntOrNull()
+        ((betaTag ?: 0) + 1)
     } else {
-        val lastTag = runCommand("git describe --tags --abbrev=0")
-        runCommand("git rev-list --count $lastTag..HEAD").toIntOrNull()?.toString() ?: "1"
-    }
+        1
+    })
     // return "1"
 }