diff --git a/.github/workflows/android-release.yaml b/.github/workflows/android-release.yaml
index 2af4717f11..98b1f9b301 100644
--- a/.github/workflows/android-release.yaml
+++ b/.github/workflows/android-release.yaml
@@ -26,9 +26,11 @@ jobs:
           git config user.name '${{ github.actor }}'
           git config user.email '${{ github.actor }}@users.noreply.github.com'
           version=$(tools/unix/version.sh ios_version)
-          build=$(tools/unix/version.sh ios_build)
-          code=$(tools/unix/version.sh android_code)
-          tag=$(tools/unix/version.sh android_name)-android
+          # +1 because below a "Bump versions" commit is created.
+          # TODO: Find a way to refactor FDroid versioning without that additional commit.
+          build=$(($(tools/unix/version.sh ios_build) + 1))
+          code=$(($(tools/unix/version.sh android_code) + 1))
+          tag=$version-$build-android
           echo "::set-output name=version::$version"
           echo "::set-output name=build::$build"
           echo "::set-output name=tag::$tag"