diff --git a/.github/workflows/android-release.yml b/.github/workflows/android-release.yml
index 232eab64..9f6a5bab 100644
--- a/.github/workflows/android-release.yml
+++ b/.github/workflows/android-release.yml
@@ -1,7 +1,8 @@
 name: Google Play release
 on:
   push:
-    branches: [ master ]
+    branches:
+      - 'release/*'
 
 jobs:
   deploy_android:
@@ -38,6 +39,12 @@ jobs:
       - name: Generated translation files
         run: flutter gen-l10n
 
+      - name: Bump version
+        uses: maierj/fastlane-action@v2.0.0
+        with:
+          lane: setVersion
+          subdirectory: android
+
       - name: Build AAB
         run: flutter build appbundle --release --no-sound-null-safety
         env:
diff --git a/android/fastlane/Fastfile b/android/fastlane/Fastfile
index 2029ef8f..6988ed80 100644
--- a/android/fastlane/Fastfile
+++ b/android/fastlane/Fastfile
@@ -28,10 +28,6 @@ platform :android do
   desc "Upload app to production"
   lane :production do
     begin
-      # gradle(
-      #  task: 'assemble',
-      #  build_type: 'Release'
-      #)
       upload_to_play_store(
         track: 'production',
         aab: '../build/app/outputs/bundle/release/app-release.aab',
@@ -43,6 +39,29 @@ platform :android do
     end
   end
 
+  desc "Sets the version name and code in pubspec.yaml"
+  lane :setVersion do
+        begin
+            old_version_code = google_play_track_version_codes(
+                package_name: "de.wger.flutter",
+                track: "alpha",
+                json_key: "./fastlane/envfiles/playstore.json",
+            )
+            puts "old_version_code: " + old_version_code.to_s
+            new_version_code = old_version_code.last().to_i + 1
+            puts "new_version_code: " + new_version_code.to_s
+
+            new_version_name = get_version_number_from_git_branch(pattern: 'release/#')
+            puts new_version_name.to_s
+
+            flutter_set_version(
+              path_to_yaml: "../pubspec.yaml",
+              version_name: new_version_name.to_s,
+              version_code: new_version_code.to_s,
+            )
+        end
+    end
+
 
   desc "Upload closed alpha app and update store entry"
   lane :update_alpha do
@@ -57,10 +76,4 @@ platform :android do
       )
     end
   end
-
-  desc "Deploy a new version to the Google Play"
-  lane :deploy do
-    gradle(task: "clean assembleRelease")
-    upload_to_play_store
-  end
 end
diff --git a/android/fastlane/Pluginfile b/android/fastlane/Pluginfile
new file mode 100644
index 00000000..e6832759
--- /dev/null
+++ b/android/fastlane/Pluginfile
@@ -0,0 +1,6 @@
+# Autogenerated by fastlane
+#
+# Ensure this file is checked in to source control!
+
+gem 'fastlane-plugin-versioning'
+gem 'fastlane-plugin-flutter_dart_version_manager'