diff --git a/metadata/com.simondalvai.pocketbroomball.yml b/metadata/com.simondalvai.pocketbroomball.yml
index 2b57f97cdf..37954e8e71 100644
--- a/metadata/com.simondalvai.pocketbroomball.yml
+++ b/metadata/com.simondalvai.pocketbroomball.yml
@@ -460,31 +460,31 @@ Builds:
 
   - versionName: 5.2.1
     versionCode: 95
-    disable: wip recipe upgrade
     commit: f74f99139c3059d48699d6de326e7ad6fff34587
     sudo:
       - apt-get update
       - apt-get install -y clang gettext pkg-config scons
     output: game/PocketBroomball.apk
     srclibs:
-      - Godot@6c814135b69d4e703956bacc2073b4b179ff5a00
-    prebuild:
-      - mv fdroid/export_presets.cfg game/export_presets.cfg
-      - sed -i 's/FDROID = false/FDROID = true/g' game/src/global/Global.gd
+      - 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 ./.config/godot/
+      - 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\""
-      - echo '[gd_resource type="EditorSettings" format=2]' >> ./.config/godot/editor_settings-3.tres
-      - echo "[resource]"  >> ./.config/godot/editor_settings-3.tres
-      - echo $SDK_PATH >> ./.config/godot/editor_settings-3.tres
-      - echo $DEBUG_KEYSTORE_PATH >> ./.config/godot/editor_settings-3.tres
-      - echo 'export/android/debug_keystore_user = "androiddebugkey"' >> ./.config/godot/editor_settings-3.tres
-      - echo 'export/android/debug_keystore_pass = "android"' >> ./.config/godot/editor_settings-3.tres
+      - 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
@@ -497,9 +497,9 @@ Builds:
       - gradle generateGodotTemplates
       - popd
       - cd ..
-      - mkdir -p ./.local/share/godot/templates/3.5.3.stable/
-      - echo "3.5.3.stable" >> ./.local/share/godot/templates/3.5.3.stable/version.txt
-      - cp godot/bin/android_release.apk ./.local/share/godot/templates/3.5.3.stable/
+      - 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