diff --git a/metadata/com.cookiegames.smartcookie.yml b/metadata/com.cookiegames.smartcookie.yml
index 967799340c..a0d485f17c 100644
--- a/metadata/com.cookiegames.smartcookie.yml
+++ b/metadata/com.cookiegames.smartcookie.yml
@@ -298,7 +298,14 @@ Builds:
     gradle:
       - scMain
 
-AutoUpdateMode: None
+  - versionName: 10.0.1
+    versionCode: 132
+    commit: v10.0.1
+    subdir: app
+    gradle:
+      - scMain
+
+AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags
 CurrentVersion: 10.0.1
 CurrentVersionCode: 132
diff --git a/metadata/eu.faircode.email.yml b/metadata/eu.faircode.email.yml
index a2ca658b7b..c7c761ad87 100644
--- a/metadata/eu.faircode.email.yml
+++ b/metadata/eu.faircode.email.yml
@@ -3488,9 +3488,19 @@ Builds:
     prebuild: sed -i -e '/keystoreProperties/d' build.gradle
     ndk: r21d
 
+  - versionName: '1.1410'
+    versionCode: 1410
+    commit: '1.1410'
+    subdir: app
+    submodules: true
+    gradle:
+      - fdroid
+    prebuild: sed -i -e '/keystoreProperties/d' build.gradle
+    ndk: r21d
+
 MaintainerNotes: Dynamic versionName and version code, so no autoupdates anymore.
 
 AutoUpdateMode: None
 UpdateCheckMode: None
-CurrentVersion: '1.1409'
-CurrentVersionCode: 1409
+CurrentVersion: '1.1410'
+CurrentVersionCode: 1410
diff --git a/metadata/is.xyz.omw_nightly.yml b/metadata/is.xyz.omw_nightly.yml
index 5d6be48c3d..0afc95e0f7 100644
--- a/metadata/is.xyz.omw_nightly.yml
+++ b/metadata/is.xyz.omw_nightly.yml
@@ -474,6 +474,41 @@ Builds:
       - buildscripts/downloads/*
     ndk: r20b
 
+  - versionName: 0.47.0-40-nightly
+    versionCode: 40
+    commit: 0.47.0-40-nightly
+    timeout: 30000
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y doxygen g++ pkgconf wget
+      - apt-get install -y -t stretch-backports-sloppy libarchive13
+      - apt-get install -y -t stretch-backports cmake
+    gradle:
+      - nightly
+    output: app/build/outputs/apk/nightly/release/omw_release_*.apk
+    prebuild:
+      - sed -i -e '/Unzip/,+5d' buildscripts/include/setup-ndk.sh
+      - sed -i -e 's/\ -Wl,-plugin-opt=-emulated-tls//' -e '/download-ndk/d' -e '/debugging\
+        life/,+19d' buildscripts/build.sh
+      - mkdir -p buildscripts/toolchain/ndk
+      - ln -s $$NDK$$/* buildscripts/toolchain/ndk/
+      - rm -fr buildscripts/toolchain/ndk/build
+      - cp -r $$NDK$$/build buildscripts/toolchain/ndk/
+      - sed -i 's/Oz/O2/g' buildscripts/toolchain/ndk/build/cmake/android.toolchain.cmake
+      - ./buildscripts/build.sh --arch arm --lto
+      - ./buildscripts/build.sh --arch arm64 --lto --no-resources
+      - ./buildscripts/build.sh --arch x86 --lto --no-resources
+      - ./buildscripts/build.sh --arch x86_64 --lto --no-resources
+      - rm -fr ./buildscripts/build/*
+      - rm -fr ./buildscripts/prefix/*
+      - rm -fr ./buildscripts/symbols/*
+      - rm -fr ./buildscripts/toolchain/*
+    scanignore:
+      - app/src/main/assets
+      - app/src/main/jniLibs
+      - buildscripts/downloads/*
+    ndk: r20b
+
 MaintainerNotes: |-
     - we use prebuild else fdroid scanner will detect the built libs as binaries on the second pass before running build, and we can't scanignore them (at start) since they don't exist yet, see https://gitlab.com/fdroid/fdroidserver/issues/635
     - we remove the buildtools and intermediary artefacts (several gigabytes) else they'll get pulled in the source tarball
@@ -481,5 +516,5 @@ MaintainerNotes: |-
 
 AutoUpdateMode: None
 UpdateCheckMode: Tags .*[0-9]-nightly$
-CurrentVersion: 0.47.0-39-nightly
-CurrentVersionCode: 39
+CurrentVersion: 0.47.0-40-nightly
+CurrentVersionCode: 40