diff --git a/metadata/app.openconnect.yml b/metadata/app.openconnect.yml
index 75dbbcd6ae..9fd75f04d3 100644
--- a/metadata/app.openconnect.yml
+++ b/metadata/app.openconnect.yml
@@ -9,6 +9,8 @@ Changelog: https://github.com/cernekee/ics-openconnect/blob/HEAD/doc/CHANGES.txt
 
 AutoName: OpenConnect
 Description: |-
+  <b>NOTE:</b> App is no longer developed, we recommend https://f-droid.org/packages/net.openconnect_vpn.android instead
+
   OpenConnect for Android is an SSL VPN client used with Cisco AnyConnect or
   ocserv based gateways.
 
@@ -164,7 +166,8 @@ MaintainerNotes: |-
   TODO: libs/stoken-wrapper.jar
   TODO: lib/XposedBridgeApi-54.jar
 
+ArchivePolicy: 0
 AutoUpdateMode: None
-UpdateCheckMode: Tags
+UpdateCheckMode: None
 CurrentVersion: '1.11'
 CurrentVersionCode: 1119
diff --git a/metadata/net.openconnect_vpn.android.yml b/metadata/net.openconnect_vpn.android.yml
new file mode 100644
index 0000000000..1b7c63e331
--- /dev/null
+++ b/metadata/net.openconnect_vpn.android.yml
@@ -0,0 +1,39 @@
+Categories:
+  - Internet
+License: GPL-2.0-or-later
+AuthorName: Arthur K.
+AuthorEmail: me@wzray.com
+SourceCode: https://gitlab.com/openconnect/ics-openconnect
+IssueTracker: https://gitlab.com/openconnect/ics-openconnect/-/issues
+
+AutoName: OpenConnect
+
+RepoType: git
+Repo: https://gitlab.com/openconnect/ics-openconnect.git
+Binaries: https://gitlab.com/openconnect/ics-openconnect/-/releases/v%v/downloads/OpenConnect.apk
+
+Builds:
+  - versionName: '1.12'
+    versionCode: 1120
+    commit: v1.12
+    submodules: true
+    sudo:
+      - apt-get update
+      - apt-get install -y git autoconf automake libtool gettext make patch unzip
+        ant wget xz-utils pkg-config
+    gradle:
+      - yes
+    output: app/build/outputs/apk/release/*.apk
+    rm:
+      - external/openconnect/tests/softhsm/*
+    prebuild: sdkmanager "build-tools;34.0.0" "platforms;android-35"
+    build: make -j$(nproc) -C external NDK=$$NDK$$ CFLAGS="-ffile-prefix-map=$(pwd)/external=/build"
+      >/dev/null
+    ndk: r27c
+
+AllowedAPKSigningKeys: 4c965471abda2f1959722e0aa15adbe3d3189d98b590e1f0001ae6934ca191e3
+
+AutoUpdateMode: Version
+UpdateCheckMode: Tags v*
+CurrentVersion: '1.12'
+CurrentVersionCode: 1120