diff --git a/metadata/com.chiller3.rsaf.yml b/metadata/com.chiller3.rsaf.yml
index f99454441d..c4df430934 100644
--- a/metadata/com.chiller3.rsaf.yml
+++ b/metadata/com.chiller3.rsaf.yml
@@ -43,10 +43,41 @@ Builds:
       - gradle rcbridge
     ndk: r28c
 
+  - versionName: '3.18'
+    versionCode: 201216
+    commit: 1306a7b99acc05a0e03ec724fdd6d6cb3aa8dbad
+    subdir: app
+    sudo:
+      - echo "deb https://deb.debian.org/debian trixie main" > /etc/apt/sources.list.d/trixie.list
+      - apt-get update
+      - apt-get install -t bookworm-backports -y golang-go
+      - apt-get install -y -t trixie openjdk-21-jdk-headless
+      - update-alternatives --auto java
+    gradle:
+      - yes
+    srclibs:
+      - go@go1.25.1
+    prebuild:
+      - sdkmanager "platforms;android-35" "build-tools;35.0.0"
+      - export GO_VERSION=$(sed -n 's/toolchain \(go.*\)/\1/p' ../rcbridge/go.mod)
+      - '[[ $GO_VERSION ]]'
+      - git -C $$go$$ checkout -f $GO_VERSION
+      - sed -i -e 's|-target=android|-target=android/arm64|' -e 's/include(.*)/include("arm64-v8a")/'
+        -e '/GOTOOLCHAIN/d' build.gradle.kts
+    build:
+      - pushd $$go$$/src
+      - ./make.bash
+      - popd
+      - export GOROOT=$$go$$
+      - export GOPATH="$HOME/go"
+      - export PATH="$GOROOT/bin:$GOPATH/bin:$PATH"
+      - gradle rcbridge
+    ndk: r28c
+
 AllowedAPKSigningKeys: b2506499bea1c5a6e658f07be6773fe486999dc124204c6522af7407503ac9f9
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags
-UpdateCheckData: metadata/version.txt|(\d+)||v([\d.])
-CurrentVersion: '3.17'
-CurrentVersionCode: 200960
+UpdateCheckData: metadata/version.txt|(\d+)||v([\d.]+)
+CurrentVersion: '3.18'
+CurrentVersionCode: 201216