diff --git a/metadata/com.simondalvai.pocketbroomball.yml b/metadata/com.simondalvai.pocketbroomball.yml
index 976d99a40d..70c4c165aa 100644
--- a/metadata/com.simondalvai.pocketbroomball.yml
+++ b/metadata/com.simondalvai.pocketbroomball.yml
@@ -548,8 +548,53 @@ Builds:
       - ./godot/bin/godot_server.* -v --path game --export Android PocketBroomball.apk
     ndk: 23.2.8568313
 
+  - versionName: 6.1.0
+    versionCode: 97
+    commit: 8235b5c278a447d44121c3f9455647588fb69bb4
+    sudo:
+      - apt-get update
+      - apt-get install -y clang gettext pkg-config scons
+    output: game/PocketBroomball.apk
+    srclibs:
+      - Godot@3.6-stable
+    prebuild: mv fdroid/export_presets.cfg game/export_presets.cfg
+    build:
+      - export HOME=$PWD
+      - export JAVA_HOME=$(dirname $(dirname $(readlink -f $(which javac))))
+      - cp -R $$Godot$$ godot
+      - keytool -keyalg RSA -genkey -v -keystore debug.keystore -storepass android
+        -alias androiddebugkey -keypass android -dname "CN=Android Debug,O=Android,C=US"
+      - mkdir -p $HOME/.config/godot/
+      - export SDK_PATH="export/android/android_sdk_path = \"$$SDK$$\""
+      - export DEBUG_KEYSTORE_PATH="export/android/debug_keystore = \"$PWD/debug.keystore\""
+      - export JAVA_SDK_PATH="export/android/java_sdk_path = \"$JAVA_HOME\""
+      - echo '[gd_resource type="EditorSettings" format=2]' >> $HOME/.config/godot/editor_settings-3.tres
+      - echo "[resource]"  >> $HOME/.config/godot/editor_settings-3.tres
+      - echo $SDK_PATH >> $HOME/.config/godot/editor_settings-3.tres
+      - echo $JAVA_SDK_PATH  >> $HOME/.config/godot/editor_settings-3.tres
+      - echo $DEBUG_KEYSTORE_PATH >> $HOME/.config/godot/editor_settings-3.tres
+      - echo 'export/android/debug_keystore_user = "androiddebugkey"' >> $HOME/.config/godot/editor_settings-3.tres
+      - echo 'export/android/debug_keystore_pass = "android"' >> $HOME/.config/godot/editor_settings-3.tres
+      - cd godot
+      - scons -j `nproc` platform=server use_llvm=yes unix_global_settings_path=".."
+        profile=fdroid/godot-build-options.py
+      - export ANDROID_NDK_ROOT=$$NDK$$
+      - scons -j `nproc` use_llvm=yes p=android target=release  unix_global_settings_path=".."
+        android_arch=armv7 profile=fdroid/godot-build-options.py
+      - scons -j `nproc` use_llvm=yes p=android target=release  unix_global_settings_path=".."
+        android_arch=arm64v8 profile=fdroid/godot-build-options.py
+      - pushd platform/android/java/
+      - gradle generateGodotTemplates
+      - popd
+      - cd ..
+      - mkdir -p $HOME/.local/share/godot/templates/3.6.stable/
+      - echo "3.6.stable" >> $HOME/.local/share/godot/templates/3.6.stable/version.txt
+      - cp godot/bin/android_release.apk $HOME/.local/share/godot/templates/3.6.stable/
+      - ./godot/bin/godot_server.* -v --path game --export Android PocketBroomball.apk
+    ndk: 23.2.8568313
+
 AutoUpdateMode: Version
 UpdateCheckMode: Tags
 UpdateCheckData: fdroid/export_presets.cfg|version/code=(\d+)|.|version/name="([\d.]+)"
-CurrentVersion: 6.0.0
-CurrentVersionCode: 96
+CurrentVersion: 6.1.0
+CurrentVersionCode: 97