diff --git a/metadata/net.e1547.yml b/metadata/net.e1547.yml
index e57bf5e756..a7de9653d1 100644
--- a/metadata/net.e1547.yml
+++ b/metadata/net.e1547.yml
@@ -7,7 +7,7 @@ Categories:
   - Multimedia
 License: GPL-3.0-or-later
 AuthorName: clragon
-AuthorEmail: kenta3ds.habbo@gmail.com
+AuthorEmail: support@clynamic.net
 WebSite: https://e1547.clynamic.net/
 SourceCode: https://github.com/clragon/e1547
 IssueTracker: https://github.com/clragon/e1547/issues
@@ -61,11 +61,13 @@ Builds:
       - popd
       - mv $repo/e1547 net.e1547
 
-  - versionName: 17.0.0
-    versionCode: 89
-    disable: https://github.com/clragon/e1547/issues/110
-    commit: da3216c37c7b3c764aa969d5901363c5993b3f17
+  - versionName: 18.0.0
+    versionCode: 90
+    commit: 18a87eafa09c27c998387d4ec99420509c2aafaa
     sudo:
+      - apt-get update
+      - apt-get install -y openjdk-17-jdk-headless
+      - update-java-alternatives -a
       - mkdir -p /home/runner/
       - chown vagrant /home/runner/
     output: build/app/outputs/flutter-apk/app-release.apk
@@ -75,8 +77,7 @@ Builds:
       - ios
       - windows
     prebuild:
-      - export FLUTTER_VERSION=$(grep "^  flutter:" pubspec.yaml | cut -d "'" -f2
-        | cut -d ' ' -f1 | cut -d '=' -f2)
+      - export FLUTTER_VERSION=$(./.github/workflows/get_flutter_version.sh)
       - pushd $$flutter$$
       - git checkout -f $FLUTTER_VERSION
       - popd
@@ -109,5 +110,5 @@ AllowedAPKSigningKeys: 8d324e434b975aa338a7a9c7f3077e1fc0dbf1303ec5d9b9634fe83e9
 AutoUpdateMode: Version
 UpdateCheckMode: Tags
 UpdateCheckData: pubspec.yaml|version:\s.+\+(\d+)|.|version:\s(.+)\+
-CurrentVersion: 17.0.0
-CurrentVersionCode: 89
+CurrentVersion: 18.0.0
+CurrentVersionCode: 90