diff --git a/metadata/universe.constellation.orion.viewer.yml b/metadata/universe.constellation.orion.viewer.yml
index 8f3d7a4b08..fdb247a02e 100644
--- a/metadata/universe.constellation.orion.viewer.yml
+++ b/metadata/universe.constellation.orion.viewer.yml
@@ -12,7 +12,7 @@ Changelog: https://github.com/max-kammerer/orion-viewer/releases
 AutoName: Orion Viewer
 
 RepoType: git
-Repo: https://github.com/max-kammerer/orion-viewer
+Repo: https://github.com/max-kammerer/orion-viewer.git
 
 Builds:
   - versionName: 0.81.2
@@ -32,26 +32,81 @@ Builds:
       KnownVuln:
         en-US: Uses outdated MuPDF 1.16.1 library which has security issues.
 
-  - versionName: 0.82.1
-    versionCode: 208
-    disable: https://gitlab.com/fdroid/fdroiddata/-/issues/2989
-    commit: 15afa2760d5e430e617e2e0cbbcb1112f11735bf
+  - versionName: 0.82.5
+    versionCode: 2033
+    commit: 88d9f79d2ec96c92e60f0304dc94d7f32081fd84
     subdir: orion-viewer
     sudo:
       - apt-get update
       - apt-get install -y make g++ pkg-config
     gradle:
-      - arm7
-    output: build/outputs/apk/arm7/release/orion-viewer-$$VERSION$$-arm7-release-unsigned.apk
+      - yes
+    output: build/outputs/apk/release/orion-viewer-$$VERSION$$-armeabi-v7a-release-unsigned.apk
     prebuild:
       - cd ..
       - gradle -b thirdparty_build.gradle downloadAndPatchDjvu downloadAndMakeMupdf
     scandelete:
       - nativeLibs/mupdf
-    ndk: r23c
+    ndk: 23.2.8568313
 
-AutoUpdateMode: None
+  - versionName: 0.82.5
+    versionCode: 2034
+    commit: 88d9f79d2ec96c92e60f0304dc94d7f32081fd84
+    subdir: orion-viewer
+    sudo:
+      - apt-get update
+      - apt-get install -y make g++ pkg-config
+    gradle:
+      - yes
+    output: build/outputs/apk/release/orion-viewer-$$VERSION$$-x86-release-unsigned.apk
+    prebuild:
+      - cd ..
+      - gradle -b thirdparty_build.gradle downloadAndPatchDjvu downloadAndMakeMupdf
+    scandelete:
+      - nativeLibs/mupdf
+    ndk: 23.2.8568313
+
+  - versionName: 0.82.5
+    versionCode: 2035
+    commit: 88d9f79d2ec96c92e60f0304dc94d7f32081fd84
+    subdir: orion-viewer
+    sudo:
+      - apt-get update
+      - apt-get install -y make g++ pkg-config
+    gradle:
+      - yes
+    output: build/outputs/apk/release/orion-viewer-$$VERSION$$-x86_64-release-unsigned.apk
+    prebuild:
+      - cd ..
+      - gradle -b thirdparty_build.gradle downloadAndPatchDjvu downloadAndMakeMupdf
+    scandelete:
+      - nativeLibs/mupdf
+    ndk: 23.2.8568313
+
+  - versionName: 0.82.5
+    versionCode: 2036
+    commit: 88d9f79d2ec96c92e60f0304dc94d7f32081fd84
+    subdir: orion-viewer
+    sudo:
+      - apt-get update
+      - apt-get install -y make g++ pkg-config
+    gradle:
+      - yes
+    output: build/outputs/apk/release/orion-viewer-$$VERSION$$-arm64-v8a-release-unsigned.apk
+    prebuild:
+      - cd ..
+      - gradle -b thirdparty_build.gradle downloadAndPatchDjvu downloadAndMakeMupdf
+    scandelete:
+      - nativeLibs/mupdf
+    ndk: 23.2.8568313
+
+AutoUpdateMode: Version
 UpdateCheckMode: Tags
+VercodeOperation:
+  - 1 + %c
+  - 2 + %c
+  - 3 + %c
+  - 4 + %c
 UpdateCheckData: orion-viewer/version.properties|orion\.version\.code\s*=\s*([0-9]+)|.|orion.version.name\s*=\s*(.+)
 CurrentVersion: 0.82.5
-CurrentVersionCode: 2032
+CurrentVersionCode: 2036