diff --git a/metadata/security.pEp.yml b/metadata/security.pEp.yml
index dd9fffc94b..dc180f2646 100644
--- a/metadata/security.pEp.yml
+++ b/metadata/security.pEp.yml
@@ -443,7 +443,64 @@ Builds:
       - sed -i 's:rustup run:~/.cargo/bin/rustup run:' $$pEpJNIAdapter$$/android/external/**/Makefile
     ndk: r20b
 
+  - versionName: 1.1.213
+    versionCode: 80
+    commit: v1.1.213
+    subdir: k9mail
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get purge asn1c
+      - apt-get install -y --no-install-recommends mercurial g++ clang nettle-dev
+        capnproto libsqlite3-dev libtool python3-lxml
+      - git clone https://github.com/vlm/asn1c /tmp/asn1c || true
+      - cd /tmp/asn1c
+      - git checkout v0.9.28
+      - autoreconf -iv
+      - ./configure
+      - make
+      - make install
+    gradle:
+      - WithkeysyncFDroid
+    srclibs:
+      - yml2@2.6.3
+      - pEpEngine@Release_2.1.13
+      - pEpJNIAdapter@Release_2.1.5
+      - libpEpAdapter@Release_2.1.3
+    prebuild:
+      - wget https://sh.rustup.rs -O ~/rustup.sh
+      - chmod +x ~/rustup.sh
+      - ~/rustup.sh -v -y --no-modify-path --default-toolchain nightly --default-host
+        x86_64-unknown-linux-gnu -t i686-linux-android -t x86_64-linux-android -t
+        armv7-linux-androideabi -t aarch64-linux-android
+      - ~/.cargo/bin/rustup -v component add rust-src
+      - export NDKB=${NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin/
+      - echo -e "[target.aarch64-linux-android]\nar = \"${NDKB}aarch64-linux-android-ar\"\nlinker
+        = \"${NDKB}aarch64-linux-android21-clang\"\n" > ~/.cargo/config
+      - echo -e "[target.armv7-linux-androideabi]\nar = \"${NDKB}arm-linux-androideabi-ar\"\nlinker
+        = \"${NDKB}armv7a-linux-androideabi18-clang\"\n" >> ~/.cargo/config
+      - echo -e "[target.x86_64-linux-android]\nar = \"${NDKB}x86_64-linux-android-ar\"\nlinker
+        = \"${NDKB}x86_64-linux-android21-clang\"\n" >> ~/.cargo/config
+      - echo -e "[target.i686-linux-android]\nar = \"${NDKB}i686-linux-android-ar\"\nlinker
+        = \"${NDKB}i686-linux-android18-clang\"" >> ~/.cargo/config
+      - echo -e "\norg.gradle.jvmargs=-Xms1024m -Xmx4096m -XX:MaxPermSize=4096m" >>
+        ../gradle.properties
+      - sed -i 's:include.*arm64-v8a.*armeabi-v7a.*x86.*x86_64.*:include "arm64-v8a":'
+        build.gradle
+      - sed -i 's:universalApk false:universalApk true:' build.gradle
+      - sed -i 's:enable true:enable false:' build.gradle
+      - sed -i 's:file("../pEpJNIAdapter/android"):file("../srclib/pEpJNIAdapter/android"):'
+        ../settings.gradle
+      - sed -i 's:20.0:20.1:' ../build.gradle
+      - sed -i 's:21.0.6113669:20.1.5948944:' $$pEpJNIAdapter$$/android/build.gradle
+      - echo -e "DEBUG=0\nYML2_PATH=$$yml2$$" > $$pEpEngine$$/local.conf
+      - echo -e "DEBUG=0\nYML2_PATH=$$yml2$$\nENGINE_INC_PATH=$$pEpEngine$$/src\nAD_INC_PATH=$$pEpJNIAdapter$$/src/"
+        > $$pEpJNIAdapter$$/local.conf
+      - ln -s $$pEpEngine$$/src/ $$pEpEngine$$/src/pEp
+      - sed -i 's:cargo build:~/.cargo/bin/cargo build:' $$pEpJNIAdapter$$/android/external/**/Makefile
+      - sed -i 's:rustup run:~/.cargo/bin/rustup run:' $$pEpJNIAdapter$$/android/external/**/Makefile
+    ndk: r20b
+
 AutoUpdateMode: None
 UpdateCheckMode: Tags
-CurrentVersion: 1.1.209
-CurrentVersionCode: 76
+CurrentVersion: 1.1.213
+CurrentVersionCode: 80
diff --git a/srclibs/libpEpAdapter.yml b/srclibs/libpEpAdapter.yml
index 1dd102d98c..438ba0445e 100644
--- a/srclibs/libpEpAdapter.yml
+++ b/srclibs/libpEpAdapter.yml
@@ -1,2 +1,2 @@
-RepoType: hg
-Repo: https://pep.foundation/dev/repos/libpEpAdapter/
+RepoType: git
+Repo: https://gitea.pep.foundation/pEp.foundation/libpEpAdapter
diff --git a/srclibs/pEpEngine.yml b/srclibs/pEpEngine.yml
index 19c177a184..f30b720136 100644
--- a/srclibs/pEpEngine.yml
+++ b/srclibs/pEpEngine.yml
@@ -1,2 +1,2 @@
-RepoType: hg
-Repo: https://pep.foundation/dev/repos/pEpEngine/
+RepoType: git
+Repo: https://gitea.pep.foundation/pEp.foundation/pEpEngine
diff --git a/srclibs/pEpJNIAdapter.yml b/srclibs/pEpJNIAdapter.yml
index 556fd1251c..9ecc6a7fa2 100644
--- a/srclibs/pEpJNIAdapter.yml
+++ b/srclibs/pEpJNIAdapter.yml
@@ -1,2 +1,2 @@
-RepoType: hg
-Repo: https://pep.foundation/dev/repos/pEpJNIAdapter/
+RepoType: git
+Repo: https://gitea.pep.foundation/pEp.foundation/pEpJNIAdapter
diff --git a/srclibs/yml2.yml b/srclibs/yml2.yml
index f5f5220a9b..6ad95a3ba6 100644
--- a/srclibs/yml2.yml
+++ b/srclibs/yml2.yml
@@ -1,2 +1,2 @@
-RepoType: hg
-Repo: https://pep.foundation/dev/repos/yml2/
+RepoType: git
+Repo: https://gitea.pep.foundation/fdik/yml2