diff --git a/metadata/de.blinkt.openvpn.yml b/metadata/de.blinkt.openvpn.yml
index f3c34711c1..c7a88ed876 100644
--- a/metadata/de.blinkt.openvpn.yml
+++ b/metadata/de.blinkt.openvpn.yml
@@ -983,7 +983,30 @@ Builds:
       - echo -e "\norg.gradle.jvmargs=-Xmx4096m" >> ../gradle.properties
     ndk: 28.0.13004108
 
+  - versionName: 0.7.58
+    versionCode: 213
+    commit: 85a015c610e79dedf18c8c89b0a9eb92901cf896
+    subdir: main
+    submodules: true
+    sudo:
+      - apt-get update
+      - apt-get install -y swig
+    gradle:
+      - ui
+      - ovpn23
+    rm:
+      - main/src/main/cpp/lz4/tests
+      - main/src/main/cpp/mbedtls/programs/fuzz
+      - main/src/main/cpp/mbedtls/tests
+      - main/src/main/cpp/openvpn3/test/unittests
+    prebuild:
+      - sed -i -e 's/28.0.12674087-rc1/27.0.12077973/' build.gradle.kts
+      - sed -i -e '/signingConfigs.getByName/d' -e 's/isEnable\ =\ true/isEnable\
+        =\ false/' build.gradle.kts
+      - echo -e "\norg.gradle.jvmargs=-Xmx4096m" >> ../gradle.properties
+    ndk: 28.0.13004108
+
 AutoUpdateMode: Version
 UpdateCheckMode: Tags
-CurrentVersion: 0.7.57
-CurrentVersionCode: 212
+CurrentVersion: 0.7.58
+CurrentVersionCode: 213