diff --git a/metadata/net.ivpn.client.yml b/metadata/net.ivpn.client.yml
index 96e28019a9..aaa9ef0877 100644
--- a/metadata/net.ivpn.client.yml
+++ b/metadata/net.ivpn.client.yml
@@ -14,147 +14,22 @@ RepoType: git
 Repo: https://github.com/ivpn/android-app
 
 Builds:
-  - versionName: '1.65'
-    versionCode: 75
-    disable: com.android.billingclient
-    commit: v1.65
-    subdir: app
-    init:
-      - git submodule init
-      - git submodule update
-      - rm -rf src/main/cpp/mbedtls/tests
-      - rm -rf src/main/cpp/openvpn3/test
+  - versionName: 2.6.0
+    versionCode: 100
+    commit: v2.6.0
+    subdir: fdroid
+    submodules: true
     gradle:
-      - fdroidProduction
-    ndk: r21
-
-  - versionName: '1.66'
-    versionCode: 78
-    disable: com.android.billingclient
-    commit: v1.66
-    subdir: app
-    init:
-      - git submodule init
-      - git submodule update
-      - rm -rf src/main/cpp/mbedtls/tests
-      - rm -rf src/main/cpp/openvpn3/test
-    gradle:
-      - fdroidProduction
-    ndk: r21
-
-  - versionName: '1.67'
-    versionCode: 79
-    disable: com.android.billingclient
-    commit: v1.67
-    subdir: app
-    init:
-      - git submodule init
-      - git submodule update
-      - rm -rf src/main/cpp/mbedtls/tests
-      - rm -rf src/main/cpp/openvpn3/test
-    gradle:
-      - fdroidProduction
-    ndk: r21
-
-  - versionName: '1.68'
-    versionCode: 82
-    disable: com.android.billingclient
-    commit: v1.68
-    subdir: app
-    init:
-      - git submodule init
-      - git submodule update
-      - rm -rf src/main/cpp/mbedtls/tests
-      - rm -rf src/main/cpp/openvpn3/test
-    gradle:
-      - fdroidProduction
-    ndk: r21d
-
-  - versionName: '2.0'
-    versionCode: 87
-    disable: com.android.billingclient
-    commit: v2.0
-    subdir: app
-    init:
-      - git submodule init
-      - git submodule update
-      - rm -rf src/main/cpp/mbedtls/tests
-      - rm -rf src/main/cpp/openvpn3/test
-    gradle:
-      - fdroidProduction
-    ndk: r21d
-
-  - versionName: 2.1.0
-    versionCode: 90
-    disable: com.android.billingclient
-    commit: v2.1.0
-    subdir: app
-    init:
-      - git submodule init
-      - git submodule update
-      - rm -rf src/main/cpp/mbedtls/tests
-      - rm -rf src/main/cpp/openvpn3/test
-    gradle:
-      - fdroidProduction
-    ndk: r21d
-
-  - versionName: 2.2.0
-    versionCode: 92
-    disable: com.android.billingclient
-    commit: v2.2.0
-    subdir: app
-    init:
-      - git submodule init
-      - git submodule update
-      - rm -rf src/main/cpp/mbedtls/tests
-      - rm -rf src/main/cpp/openvpn3/test
-    gradle:
-      - fdroidProduction
-    ndk: r21d
-
-  - versionName: 2.3.1
-    versionCode: 94
-    disable: com.android.billingclient
-    commit: v2.3.1
-    subdir: app
-    init:
-      - git submodule init
-      - git submodule update
-      - rm -rf src/main/cpp/mbedtls/tests
-      - rm -rf src/main/cpp/openvpn3/test
-    gradle:
-      - fdroidProduction
+      - production
+    rm:
+      - site
+      - store
+      - core/src/main/cpp/mbedtls/tests
+      - core/src/main/cpp/mbedtls/crypto/tests
+      - core/src/main/cpp/openvpn3/test
     ndk: r21e
 
-  - versionName: 2.4.1
-    versionCode: 96
-    disable: com.android.billingclient
-    commit: v2.4.1
-    subdir: app
-    init:
-      - git submodule init
-      - git submodule update
-      - rm -rf src/main/cpp/mbedtls/tests
-      - rm -rf src/main/cpp/openvpn3/test
-    gradle:
-      - fdroidProduction
-    ndk: r21e
-
-  - versionName: 2.5.2
-    versionCode: 99
-    disable: com.android.billingclient https://github.com/ivpn/android-app/issues/72
-    commit: 7ac2d70b5db19e1bdd2bad82d4b6d488e304173a
-    subdir: app
-    init:
-      - git submodule init
-      - git submodule update
-      - rm -rf src/main/cpp/mbedtls/tests
-      - rm -rf src/main/cpp/openvpn3/test
-    gradle:
-      - fdroidProduction
-    ndk: r21e
-
-AutoUpdateMode: None
-UpdateCheckMode: None
-CurrentVersion: 2.5.2
-CurrentVersionCode: 99
+AutoUpdateMode: Version
+UpdateCheckMode: Tags
+CurrentVersion: 2.6.0
+CurrentVersionCode: 100