diff --git a/.gitlab-ci-files/common-prepare.yml b/.gitlab-ci-files/common-prepare.yml
index 8edc3f0..31f797a 100644
--- a/.gitlab-ci-files/common-prepare.yml
+++ b/.gitlab-ci-files/common-prepare.yml
@@ -8,11 +8,22 @@
   - 'which rsync || ( sudo apt-get update -y && sudo apt-get install rsync -y )'
   - 'which make || ( sudo apt-get update -y && sudo apt-get install make -y )'
 
+.add_ssh_keys: &add_ssh_keys
+  # Add the SSH key (stored in the SSH_PRIVATE_KEY variable) to the agent.
+  - eval $(ssh-agent -s)
+  - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add -
+
+.verify_ssh_host_keys: &verify_ssh_host_keys
+  # Verify SSH host keys
+  - mkdir -p ~/.ssh
+  - chmod 700 ~/.ssh
+  - echo "${SSH_KNOWN_HOSTS}" >> ~/.ssh/known_hosts
+  - chmod 644 ~/.ssh/known_hosts
+
 .standard_job:
   tags: [kvm]
   before_script:
     - *ensure_docker
-    - *ensure_rsync
 
 .make_in_docker:
   extends: .standard_job
@@ -20,3 +31,21 @@
     - docker login -u ${DOCKER_REGISTRY_USER} -p ${DOCKER_REGISTRY_PASS} ${DOCKER_REGISTRY_HOST}
     - cd scripts/${CI_DISTRO_TARGET}
     - make ${MAKE_TARGET}
+
+.upload_pkg:
+  extends: .standard_job
+  before_script:
+    - *ensure_rsync
+    - *add_ssh_keys
+    - *verify_ssh_host_keys
+  script:
+    - docker login -u ${DOCKER_REGISTRY_USER} -p ${DOCKER_REGISTRY_PASS} ${DOCKER_REGISTRY_HOST}
+    - cd scripts/${CI_DISTRO_TARGET}
+    - make ${MAKE_TARGET}
+    - pwd
+    - cd out
+    - time rsync -avP -e "ssh -p ${PKG_HOST_SSH_PORT}" depot@${PKG_HOST}:files/pkgs/RHEL/8/pEpJNIAdapter/SHA256SUMS || true
+    - if sha256sum --ignore-missing --check SHA256SUMS ; then echo "Package already exists... Exiting..." && exit ; else true ; fi
+    - sha256sum ./*.rpm | tee --append SHA256SUMS
+    - cat ./SHA256SUMS
+    - time rsync -azvP -e "ssh -p ${PKG_HOST_SSH_PORT}" --rsync-path="mkdir -p /home/depot/files/pkgs/RHEL/8/pEpJNIAdapter && rsync" ./*.rpm SHA256SUMS depot@${PKG_HOST}:files/pkgs/RHEL/8/pEpJNIAdapter/
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 756749a..eb80f5d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,6 +3,8 @@ include:
 
 stages:
   - build
+  - packages
+
 
 # Debian
 
@@ -10,6 +12,7 @@ debian10:build:
   extends: .make_in_docker
   stage: build
   variables:
+    MAKE_TARGET: "build"
     CI_DISTRO_TARGET: "debian10"
     DEBIAN_FRONTEND: "noninteractive"
   rules:
@@ -19,6 +22,7 @@ debian10:tagged-build:
   extends: .make_in_docker
   stage: build
   variables:
+    MAKE_TARGET: "build"
     CI_DISTRO_TARGET: "debian10"
     DEBIAN_FRONTEND: "noninteractive"
     TAGGED_BUILD: "true"
@@ -29,8 +33,8 @@ debian10-java8:build:
   extends: .make_in_docker
   stage: build
   variables:
-    CI_DISTRO_TARGET: "debian10"
     MAKE_TARGET: "java8"
+    CI_DISTRO_TARGET: "debian10"
     DEBIAN_FRONTEND: "noninteractive"
   rules:
     - if: '$CI_COMMIT_TAG  !~ /^Release_[0-9]+\.[0-9]+\.[0-9]+$/'
@@ -45,3 +49,46 @@ debian10-java8:tagged-build:
     TAGGED_BUILD: "true"
   rules:
     - if: '$CI_COMMIT_TAG  =~ /^Release_[0-9]+\.[0-9]+\.[0-9]+$/'
+
+# CentOS
+
+centos8:build:
+  extends: .make_in_docker
+  stage: build
+  variables:
+    MAKE_TARGET: "build"
+    CI_DISTRO_TARGET: "centos8"
+  rules:
+    - if: '$CI_COMMIT_TAG  !~ /^Release_[0-9]+\.[0-9]+\.[0-9]+$/'
+
+centos8:tagged-build:
+  extends: .make_in_docker
+  stage: build
+  variables:
+    MAKE_TARGET: "build"
+    CI_DISTRO_TARGET: "centos8"
+    TAGGED_BUILD: "true"
+  rules:
+    - if: '$CI_COMMIT_TAG  =~ /^Release_[0-9]+\.[0-9]+\.[0-9]+$/'
+
+centos8:rpm:
+  extends: .make_in_docker
+  stage: packages
+  needs: ["centos8:build"]
+  variables:
+    MAKE_TARGET: "rpm"
+    CI_DISTRO_TARGET: "centos8"
+  rules:
+    - if: '$CI_COMMIT_TAG  !~ /^Release_[0-9]+\.[0-9]+\.[0-9]+$/'
+
+
+centos8:rpm:tagged-build:
+  extends: .upload_pkg
+  stage: packages
+  needs: ["centos8:tagged-build"]
+  variables:
+    MAKE_TARGET: "rpm"
+    CI_DISTRO_TARGET: "centos8"
+    TAGGED_BUILD: "true"
+  rules:
+    - if: '$CI_COMMIT_TAG  =~ /^Release_[0-9]+\.[0-9]+\.[0-9]+$/'
diff --git a/DEPENDENCIES b/DEPENDENCIES
index bbbee56..ccafdb8 100644
--- a/DEPENDENCIES
+++ b/DEPENDENCIES
@@ -1,5 +1,5 @@
 # 1st Party Dependencies
 ## Prefer git tags instead of SHA hashes when possible.
 
-libpEpAdapter=Release_2.1.21
-pEpEngine=Release_2.1.45
\ No newline at end of file
+libpEpAdapter=Release_2.1.22
+pEpEngine=Release_2.1.49
\ No newline at end of file
diff --git a/androidTests/app/src/main/java/com/pep/k9/MainActivity.java b/androidTests/app/src/main/java/com/pep/k9/MainActivity.java
index 435a4f7..37fa1a3 100644
--- a/androidTests/app/src/main/java/com/pep/k9/MainActivity.java
+++ b/androidTests/app/src/main/java/com/pep/k9/MainActivity.java
@@ -260,7 +260,6 @@ public class MainActivity extends AppCompatActivity {
 
     @BindView(R.id.bRunTypes) Button runTypes;
     @BindView(R.id.bRunAliceBob) Button runIntegration;
-    @BindView(R.id.bRunServerLookup) Button runLookup;
     @BindView(R.id.bRunGenKey) Button runGenKey;
     @BindView(R.id.encrypt_and_decrypt) Button runEncryptAndDecrypt;
     @BindView(R.id.encrypt_and_decrypt_without_key) Button runEncryptAndDecryptWithoutKey;
@@ -287,11 +286,6 @@ public class MainActivity extends AppCompatActivity {
         runIntegration.setText(TESTING);
         new RunTestTask().execute(6);
     }
-    @OnClick(R.id.bRunServerLookup)
-    public void runLookup() {
-        runLookup.setText(TESTING);
-        new RunTestTask().execute(2);
-    }
     @OnClick(R.id.bRunGenKey)
     public void runGenKey() {
         runGenKey.setText(TESTING);
@@ -390,10 +384,6 @@ public class MainActivity extends AppCompatActivity {
         testPEpTypes();
     }
 
-    private void runTestKeyserverLookup() throws pEpException, InterruptedException, IOException {
-        testKeyserverLookup();
-    }
-
     private void runTestKeyGen() throws pEpException, InterruptedException, IOException {
         testKeyGen();
     }
@@ -1494,46 +1484,6 @@ public class MainActivity extends AppCompatActivity {
         msg.setAttachments(attachments);
     }
 
-    /*
-    tests its possible to find the fingerprint on server
-     */
-    public void testKeyserverLookup() throws pEpException, IOException, AssertionError, InterruptedException {
-        log("TEST: ", "Test keyserver lookup loaded");
-        Engine e;
-
-        e = new Engine();
-
-        long lastTime = System.currentTimeMillis();
-        e.startKeyserverLookup();
-        log("engine.startLookup", String.valueOf(System.currentTimeMillis() - lastTime));
-
-        Identity vb = new Identity();
-        vb.username = "pEpDontAssert";
-        vb.address = "vb@ulm.ccc.de";
-        vb.user_id = "SsI6H9";
-        updateIdentityOnEngine(e, vb);
-
-        int count = 0;
-        while (count++ < 5000) {
-            Thread.sleep(1);
-        }
-
-        String fpr = e.updateIdentity(vb).fpr;
-
-        log("PEPTEST", "keyserver test fpr");
-        log("PEPTEST", fpr != null ? fpr : "NULL");
-        if (fpr == null) throw new AssertionError();
-
-        lastTime = System.currentTimeMillis();
-        e.stopKeyserverLookup();
-        log("engine.stopLookup", String.valueOf(System.currentTimeMillis() - lastTime));
-
-        lastTime = System.currentTimeMillis();
-        e.close();
-        log("engine.close", String.valueOf(System.currentTimeMillis() - lastTime));
-        log("TEST: ", "Test keyserver lookup finished");
-    }
-
     /*
     tests I can get my own fingerprint
      */
@@ -1927,18 +1877,15 @@ public class MainActivity extends AppCompatActivity {
                         runTestPEpTypes();
                         return 1;
                     case 2:
-                        runTestKeyserverLookup();
-                        return 2;
-                    case 3:
                         runEncryptAndDecryptTest();
                         return 3;
-                    case 4:
+                    case 3:
                         runEncryptAndDecryptWithoutKeyTest();
                         return 4;
-                    case 5:
+                    case 4:
                         runColorRatingsTest();
                         return 5;
-                    case 6:
+                    case 5:
                         runIntegrationTest();
                         return 6;
                     case 16:
diff --git a/androidTests/app/src/main/res/layout/activity_main.xml b/androidTests/app/src/main/res/layout/activity_main.xml
index 25726c4..344b55e 100644
--- a/androidTests/app/src/main/res/layout/activity_main.xml
+++ b/androidTests/app/src/main/res/layout/activity_main.xml
@@ -57,27 +57,6 @@
                     android:text="Run" />
             </LinearLayout>
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="Server Lookup"
-                    android:textAppearance="?android:attr/textAppearanceMedium" />
-
-                <Button
-                    android:id="@+id/bRunServerLookup"
-                    style="?android:attr/buttonStyleSmall"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="Run" />
-            </LinearLayout>
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/scripts/centos8/JNIAdapter.centos8.Dockerfile b/scripts/centos8/JNIAdapter.centos8.Dockerfile
new file mode 100644
index 0000000..4084df4
--- /dev/null
+++ b/scripts/centos8/JNIAdapter.centos8.Dockerfile
@@ -0,0 +1,30 @@
+ARG DOCKER_REGISTRY_HOST
+ARG CURRENT_DISTRO
+ARG LIBPEPADAPTER_VERSION
+FROM ${DOCKER_REGISTRY_HOST}/pep-${CURRENT_DISTRO}-libpepadapter:${LIBPEPADAPTER_VERSION}
+
+ENV BUILDROOT /build
+ENV INSTPREFIX /install
+ENV OUTDIR /out
+
+ARG JNIADAPTER_VERSION
+
+## Install system dependencies
+USER root
+RUN yum -y install time java-1.8.0-openjdk java-1.8.0-openjdk-devel && \
+    yum clean all
+
+## Build and install pEpJNIAdapter
+### Setup working directory
+RUN mkdir ${BUILDROOT}/pEpJNIAdapter
+COPY . ${BUILDROOT}/pEpJNIAdapter
+RUN chown -R pep-builder:pep-builder ${BUILDROOT}/pEpJNIAdapter
+USER pep-builder
+WORKDIR ${BUILDROOT}/pEpJNIAdapter
+
+RUN sh ./scripts/common/build_pEpJNIAdapter.sh && \
+    install -m 644 -t ${INSTPREFIX}/lib dist/libpEpJNI.a && \
+    install -m 755 -t ${INSTPREFIX}/lib dist/libpEpJNI.so && \
+    install -m 644 -t ${INSTPREFIX}/lib dist/pEp.jar && \
+    echo "${pepjni_ver}">${INSTPREFIX}/pEp_JNI.ver && \
+    rm -rf ${BUILDROOT}/*
diff --git a/scripts/centos8/Makefile b/scripts/centos8/Makefile
new file mode 100644
index 0000000..c220e36
--- /dev/null
+++ b/scripts/centos8/Makefile
@@ -0,0 +1,79 @@
+include ../../DEPENDENCIES
+export
+LIBPEPADAPTER_VERSION=${libpEpAdapter}
+PEPENGINE_VERSION=${pEpEngine}
+SEQUOIA_VERSION=${sequoia}
+CURRENT_DISTRO=${CI_DISTRO_TARGET}
+IMAGE_NAME=${DOCKER_REGISTRY_HOST}/pep-$(CURRENT_DISTRO)-jniadapter
+DOCKERFILE=JNIAdapter.$(CURRENT_DISTRO).Dockerfile
+PKG_BUILD_IMAGE=${DOCKER_REGISTRY_HOST}/fpm-$(CURRENT_DISTRO)
+PKG_INSTALL_PATH=/opt/pEp
+PKG_NAME=pEpJNIAdapter
+PKG_DESCRIPTION="p≡p JNI Adapter Binary RPM Package"
+PKG_DEPENDS="libpEpAdapter --depends java-1.8.0-openjdk"
+PKG_INSTALL_PATH_STRING="/ /package/lib=${PKG_INSTALL_PATH}"
+IS_TAGGED=${TAGGED_BUILD}
+ifeq ($(IS_TAGGED), true)
+# $CI_COMMIT_TAG is a predefined environment variable from Gitlab
+	PEPJNIADAPTER_VERSION=${CI_COMMIT_TAG}
+else
+	PEPJNIADAPTER_VERSION=$(shell git rev-parse --short=8 HEAD)
+endif
+all: build
+
+build:
+	-docker pull $(IMAGE_NAME):latest
+	cd ../../ && docker build --build-arg CURRENT_DISTRO=$(CURRENT_DISTRO) \
+		      --build-arg DOCKER_REGISTRY_HOST=${DOCKER_REGISTRY_HOST} \
+		      --build-arg PEPJNIADAPTER_VERSION=$(PEPJNIADAPTER_VERSION) \
+		      --build-arg LIBPEPADAPTER_VERSION=$(LIBPEPADAPTER_VERSION) \
+		      --build-arg PEPENGINE_VERSION=$(PEPENGINE_VERSION) \
+		      --build-arg SEQUOIA_VERSION=$(SEQUOIA_VERSION) \
+		      --cache-from $(IMAGE_NAME):latest \
+		      --tag=$(IMAGE_NAME):$(PEPJNIADAPTER_VERSION) \
+		      --tag=$(IMAGE_NAME):$(PEPJNIADAPTER_VERSION)_libpepadapter-$(LIBPEPADAPTER_VERSION)_engine-$(PEPENGINE_VERSION) \
+		      --tag=$(IMAGE_NAME):latest \
+		      -f scripts/${CURRENT_DISTRO}/$(DOCKERFILE) .
+	docker push $(IMAGE_NAME):$(PEPJNIADAPTER_VERSION)
+	docker push $(IMAGE_NAME):$(PEPJNIADAPTER_VERSION)_libpepadapter-$(LIBPEPADAPTER_VERSION)_engine-$(PEPENGINE_VERSION)
+	docker push $(IMAGE_NAME):latest
+
+java8:
+	-docker pull $(IMAGE_NAME)-java8:latest
+	cd ../../ && docker build --build-arg CURRENT_DISTRO=$(CURRENT_DISTRO) \
+		      --build-arg DOCKER_REGISTRY_HOST=${DOCKER_REGISTRY_HOST} \
+		      --build-arg PEPJNIADAPTER_VERSION=$(PEPJNIADAPTER_VERSION) \
+		      --build-arg LIBPEPADAPTER_VERSION=$(LIBPEPADAPTER_VERSION) \
+		      --build-arg PEPENGINE_VERSION=$(PEPENGINE_VERSION) \
+		      --build-arg SEQUOIA_VERSION=$(SEQUOIA_VERSION) \
+		      --cache-from $(IMAGE_NAME):latest \
+		      --tag=$(IMAGE_NAME)-java8:$(PEPJNIADAPTER_VERSION) \
+		      --tag=$(IMAGE_NAME)-java8:$(PEPJNIADAPTER_VERSION)_libpepadapter-$(LIBPEPADAPTER_VERSION)_engine-$(PEPENGINE_VERSION) \
+		      --tag=$(IMAGE_NAME)-java8:latest \
+		      -f scripts/${CURRENT_DISTRO}/java8.$(DOCKERFILE) .
+	docker push $(IMAGE_NAME)-java8:$(PEPJNIADAPTER_VERSION)
+	docker push $(IMAGE_NAME)-java8:$(PEPJNIADAPTER_VERSION)_libpepadapter-$(LIBPEPADAPTER_VERSION)_engine-$(PEPENGINE_VERSION)
+	docker push $(IMAGE_NAME)-java8:latest
+rpm:
+	-docker pull $(PKG_BUILD_IMAGE)-jniadapter:latest
+	@docker build --build-arg CURRENT_DISTRO=$(CURRENT_DISTRO) \
+		--build-arg PEPJNIADAPTER_VERSION=$(PEPJNIADAPTER_VERSION) \
+		--build-arg DOCKER_REGISTRY_HOST=${DOCKER_REGISTRY_HOST} \
+		--build-arg PKG_INSTALL_PATH=$(PKG_INSTALL_PATH) \
+		--cache-from $(PKG_BUILD_IMAGE)-jniadapter:latest \
+		--tag=$(PKG_BUILD_IMAGE)-jniadapter:$(PEPJNIADAPTER_VERSION) \
+		--tag=$(PKG_BUILD_IMAGE)-jniadapter:latest \
+		packages/rpm
+	@docker push $(PKG_BUILD_IMAGE)-jniadapter:$(PEPJNIADAPTER_VERSION)
+	@docker push $(PKG_BUILD_IMAGE)-jniadapter:latest
+	@docker run -e PEPJNIADAPTER_VERSION=$(PEPJNIADAPTER_VERSION) \
+		-e PKG_VERSION=$(PEPJNIADAPTER_VERSION) \
+		-e PKG_INSTALL_PATH=$(PKG_INSTALL_PATH) \
+		-e PKG_NAME=$(PKG_NAME) \
+		-e PKG_DESCRIPTION=$(PKG_DESCRIPTION) \
+		-e PKG_DEPENDS=$(PKG_DEPENDS) \
+		-e PKG_INSTALL_PATH_STRING=$(PKG_INSTALL_PATH_STRING) \
+		--rm -v $(shell pwd)/packages/rpm/create-jniadapter-rpm.sh:/usr/bin/create-rpm.sh:ro  \
+		-v $(shell pwd)/out:/out \
+		-w / $(PKG_BUILD_IMAGE)-jniadapter:${PEPJNIADAPTER_VERSION} \
+		/usr/bin/create-rpm.sh
diff --git a/scripts/centos8/packages/rpm/Dockerfile b/scripts/centos8/packages/rpm/Dockerfile
new file mode 100644
index 0000000..bb8bfed
--- /dev/null
+++ b/scripts/centos8/packages/rpm/Dockerfile
@@ -0,0 +1,18 @@
+ARG DOCKER_REGISTRY_HOST
+ARG CURRENT_DISTRO
+ARG PEPJNIADAPTER_VERSION
+FROM ${DOCKER_REGISTRY_HOST}/pep-${CURRENT_DISTRO}-jniadapter:${PEPJNIADAPTER_VERSION} AS pEpBuild
+
+FROM ${DOCKER_REGISTRY_HOST}/fpm-${CURRENT_DISTRO}:latest
+# whatever is required for building should be installed in this image; just like BuildRequires: for RPM specs
+RUN yum -y install readline-devel epel-release && \
+    yum -y install patchelf chrpath
+
+ARG PEP_MACHINE_DIR
+COPY --from=pEpBuild /install /source
+
+COPY install.sh /usr/local/bin/install.sh
+
+ENV INSTPREFIX /source
+
+RUN /usr/local/bin/install.sh
diff --git a/scripts/centos8/packages/rpm/create-jniadapter-rpm.sh b/scripts/centos8/packages/rpm/create-jniadapter-rpm.sh
new file mode 100755
index 0000000..91ed5fb
--- /dev/null
+++ b/scripts/centos8/packages/rpm/create-jniadapter-rpm.sh
@@ -0,0 +1,25 @@
+#!/bin/bash -ex
+# we should always set proper ownership before exiting, otherwise
+# the created packages will have root:root ownership and we'll be unable
+# to delete them from our host.
+trap 'chown -R --reference /usr/bin/create-rpm.sh /out/' EXIT
+
+# the source directory is mounted read-only to prevent issues where the build
+# could alter the source; we should copy it somewhere inside the container
+cd /source/out
+ls -alh
+tree
+INSTALL_TOP=/package
+mkdir -p ${INSTALL_TOP}/lib
+cp -ar lib/* ${INSTALL_TOP}/lib/.
+
+
+cd /out
+
+#this would be the no-signature command line
+fpm -t rpm -s dir \
+	-n ${PKG_NAME} \
+	--version ${PKG_VERSION} \
+	--description "${PKG_DESCRIPTION}" \
+	--depends ${PKG_DEPENDS} \
+	-C ${PKG_INSTALL_PATH_STRING}
diff --git a/scripts/centos8/packages/rpm/install.sh b/scripts/centos8/packages/rpm/install.sh
new file mode 100755
index 0000000..13e9fbb
--- /dev/null
+++ b/scripts/centos8/packages/rpm/install.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+set -exuo pipefail
+
+# ===========================
+# Distro
+# ===========================
+
+echo 7 >"${INSTPREFIX}/D_REVISION"
+
+D_REV=$(cat ${INSTPREFIX}/D_REVISION)
+D=""
+
+D=${INSTPREFIX}/out
+
+mkdir -p ${INSTPREFIX}/out
+rm -rf ${INSTPREFIX}/out/*
+mkdir -p "$D"/{bin,ld,lib/pEp,share/pEp,include/pEp}
+
+tree ${INSTPREFIX}
+
+# pEpJNIAdapter
+cp -a ${INSTPREFIX}/lib/libpEpJNI.a "$D"/lib
+cp -a ${INSTPREFIX}/lib/libpEpJNI.so "$D"/lib
+cp -a ${INSTPREFIX}/lib/pEp.jar "$D"/lib
+
+# versions
+cp -a ${INSTPREFIX}/*.ver "$D"
+
+find "$D"/lib -maxdepth 1 -type f -print -exec patchelf --set-rpath '$ORIGIN/pEp:$ORIGIN' {} \;
+find "$D"/lib/pEp         -type f -print -exec patchelf --set-rpath '$ORIGIN' {} \;
+find "$D"/bin -type f -print -exec patchelf --set-rpath '$ORIGIN/../lib/pEp:$ORIGIN/../lib' {} \;
+
+ls -lh "$D"/*
+du -sch "$D"
diff --git a/scripts/debian10/build_pEpJNIAdapter.sh b/scripts/common/build_pEpJNIAdapter.sh
similarity index 100%
rename from scripts/debian10/build_pEpJNIAdapter.sh
rename to scripts/common/build_pEpJNIAdapter.sh
diff --git a/scripts/debian10/Makefile b/scripts/debian10/Makefile
index 9e707e8..4430a86 100644
--- a/scripts/debian10/Makefile
+++ b/scripts/debian10/Makefile
@@ -13,7 +13,9 @@ ifeq ($(IS_TAGGED), true)
 else
 	PEPJNIADAPTER_VERSION=$(shell git rev-parse --short=8 HEAD)
 endif
-all:
+all: build
+
+build:
 	-docker pull $(IMAGE_NAME):latest
 	cd ../../ && docker build --build-arg CURRENT_DISTRO=$(CURRENT_DISTRO) \
 		      --build-arg DOCKER_REGISTRY_HOST=${DOCKER_REGISTRY_HOST} \
diff --git a/scripts/debian10/java8.pEpJNIAdapter.debian10.Dockerfile b/scripts/debian10/java8.pEpJNIAdapter.debian10.Dockerfile
index 4f0dbbe..3a0d415 100644
--- a/scripts/debian10/java8.pEpJNIAdapter.debian10.Dockerfile
+++ b/scripts/debian10/java8.pEpJNIAdapter.debian10.Dockerfile
@@ -49,7 +49,7 @@ ARG PEPJNIADAPTER_VERSION
 ARG CURRENT_DISTRO
 
 ### Build pEpJNIAdapter
-RUN sh ./scripts/${CURRENT_DISTRO}/build_pEpJNIAdapter.sh && \
+RUN sh ./scripts/common/build_pEpJNIAdapter.sh && \
     install -m 644 -t ${INSTPREFIX}/lib dist/libpEpJNI.a && \
     install -m 755 -t ${INSTPREFIX}/lib dist/libpEpJNI.so && \
     install -m 644 -t ${INSTPREFIX}/lib dist/pEp.jar
diff --git a/scripts/debian10/pEpJNIAdapter.debian10.Dockerfile b/scripts/debian10/pEpJNIAdapter.debian10.Dockerfile
index af2ee4d..77bdb54 100644
--- a/scripts/debian10/pEpJNIAdapter.debian10.Dockerfile
+++ b/scripts/debian10/pEpJNIAdapter.debian10.Dockerfile
@@ -43,7 +43,7 @@ ARG PEPJNIADAPTER_VERSION
 ARG CURRENT_DISTRO
 
 ### Build pEpJNIAdapter
-RUN sh ./scripts/${CURRENT_DISTRO}/build_pEpJNIAdapter.sh && \
+RUN sh ./scripts/common/build_pEpJNIAdapter.sh && \
     install -m 644 -t ${INSTPREFIX}/lib dist/libpEpJNI.a && \
     install -m 755 -t ${INSTPREFIX}/lib dist/libpEpJNI.so && \
     install -m 644 -t ${INSTPREFIX}/lib dist/pEp.jar
diff --git a/src/cxx/foundation_pEp_jniadapter_AbstractEngine.cc b/src/cxx/foundation_pEp_jniadapter_AbstractEngine.cc
index ca179eb..80bcdf0 100644
--- a/src/cxx/foundation_pEp_jniadapter_AbstractEngine.cc
+++ b/src/cxx/foundation_pEp_jniadapter_AbstractEngine.cc
@@ -1,5 +1,4 @@
 #include "foundation_pEp_jniadapter_AbstractEngine.h"
-#include <unistd.h>
 #include <pEp/keymanagement.h>
 #include <pEp/message_api.h>
 #include <pEp/sync_api.h>
@@ -326,119 +325,6 @@ int examine_identity(pEp_identity *ident,
     return 0;
 }
 
-pEp_identity *retrieve_next_identity(void *arg)
-{
-    pEpLog("called");
-    locked_queue < pEp_identity * > *queue = static_cast<locked_queue < pEp_identity * > * > (arg);
-
-    while (!queue->size()) {
-        usleep(100000);
-    }
-
-    pEp_identity *ident = queue->front();
-    queue->pop_front();
-    return ident;
-}
-
-static void *keyserver_thread_routine(void *arg)
-{
-    PEP_STATUS status = do_keymanagement(retrieve_next_identity, arg);
-    locked_queue < pEp_identity * > *queue = static_cast<locked_queue < pEp_identity * > * > (arg);
-
-    while (queue->size()) {
-        pEp_identity *ident = queue->front();
-        queue->pop_front();
-        free_identity(ident);
-    }
-
-    delete queue;
-    return reinterpret_cast<void *>(status);
-}
-
-JNIEXPORT void JNICALL Java_foundation_pEp_jniadapter_AbstractEngine__1startKeyserverLookup(JNIEnv *env,
-        jobject obj)
-{
-    std::mutex *mutex_local = nullptr;
-    {
-        std::lock_guard<std::mutex> l(global_mutex);
-        pEpLog("called with lock_guard");
-        mutex_local = get_engine_java_object_mutex(env, obj);
-    }
-    std::lock_guard<std::mutex> l(*mutex_local);
-
-    pthread_t *thread = nullptr;
-    locked_queue< pEp_identity * > *queue = nullptr;
-
-    jfieldID thread_handle;
-    jfieldID queue_handle;
-
-    try {
-        thread_handle = getFieldID(env, "foundation/pEp/jniadapter/Engine", "keyserverThread", "J");
-        queue_handle = getFieldID(env, "foundation/pEp/jniadapter/Engine", "keyserverQueue", "J");
-    }
-    catch (std::exception& ex) {
-        assert(0);
-        return;
-    }
-
-    thread = reinterpret_cast<pthread_t*>(env->GetLongField(obj, thread_handle));
-    if (thread)
-        return;
-
-    thread = static_cast<pthread_t*>(calloc(1, sizeof(pthread_t)));
-    assert(thread);
-    env->SetLongField(obj, thread_handle, reinterpret_cast<jlong>(thread));
-
-    queue = new locked_queue< pEp_identity * >();
-    env->SetLongField(obj, queue_handle, reinterpret_cast<jlong>(queue));
-
-    register_examine_function(Adapter::session(), examine_identity,static_cast<void*>(queue));
-
-    pthread_create(thread, nullptr, keyserver_thread_routine, static_cast<void*>(queue));
-}
-
-JNIEXPORT void JNICALL Java_foundation_pEp_jniadapter_AbstractEngine__1stopKeyserverLookup(JNIEnv *env,
-        jobject obj)
-{
-    std::mutex *mutex_local = nullptr;
-    {
-        std::lock_guard<std::mutex> l(global_mutex);
-        pEpLog("called with lock_guard");
-        mutex_local = get_engine_java_object_mutex(env, obj);
-    }
-    std::lock_guard<std::mutex> l(*mutex_local);
-
-    pthread_t *thread = nullptr;
-    locked_queue< pEp_identity * > *queue = nullptr;
-
-    jfieldID thread_handle;
-    jfieldID queue_handle;
-
-    try {
-        thread_handle = getFieldID(env, "foundation/pEp/jniadapter/Engine", "keyserverThread", "J");
-        queue_handle = getFieldID(env, "foundation/pEp/jniadapter/Engine", "keyserverQueue", "J");
-    }
-    catch (std::exception& ex) {
-        assert(0);
-        return;
-    }
-
-    thread = reinterpret_cast<pthread_t*>(env->GetLongField(obj, thread_handle));
-    if (!thread)
-        return;
-
-    queue = reinterpret_cast<locked_queue<pEp_identity*>*>(env->GetLongField(obj, queue_handle));
-
-    env->SetLongField(obj, queue_handle, 0);
-    env->SetLongField(obj, thread_handle, 0);
-
-    register_examine_function(Adapter::session(), nullptr, nullptr);
-
-    queue->push_front(nullptr);
-    pthread_join(*thread, nullptr);
-    free(thread);
-}
-
 JNIEXPORT void JNICALL Java_foundation_pEp_jniadapter_AbstractEngine__1startSync(JNIEnv *env,
         jobject obj)
 {
diff --git a/src/cxx/jniutils.cc b/src/cxx/jniutils.cc
index b8653bf..82b1de4 100644
--- a/src/cxx/jniutils.cc
+++ b/src/cxx/jniutils.cc
@@ -1,17 +1,7 @@
-#include <cassert>
 #include "jniutils.hh"
 #include <pEp/pEpLog.hh>
-
-#ifndef __LP64__
-
-#include <time64.h>
-
-#define time_t time64_t
-#define timegm timegm64
-#define gmtime_r gmtime64_r
-#else
-#include <string.h>
-#endif
+#include <cassert>
+#include <cstring>
 
 namespace pEp {
 namespace JNIAdapter {
diff --git a/src/java/foundation/pEp/jniadapter/AbstractEngine.java b/src/java/foundation/pEp/jniadapter/AbstractEngine.java
index f16e302..7d160d8 100644
--- a/src/java/foundation/pEp/jniadapter/AbstractEngine.java
+++ b/src/java/foundation/pEp/jniadapter/AbstractEngine.java
@@ -23,9 +23,6 @@ abstract class AbstractEngine extends UniquelyIdentifiable implements AbstractEn
     private native void init();
     private native void release();
 
-    private long keyserverThread;
-    private long keyserverQueue;
-
     public AbstractEngine() throws pEpException {
         synchronized (AbstractEngine.class) {
             init();
@@ -67,20 +64,6 @@ abstract class AbstractEngine extends UniquelyIdentifiable implements AbstractEn
     private native String _getProtocolVersion();
 
 
-    public void startKeyserverLookup() {
-        _startKeyserverLookup();
-    }
-
-    private native void _startKeyserverLookup();
-
-
-    public void stopKeyserverLookup() {
-        _startKeyserverLookup();
-    }
-
-    private native void _stopKeyserverLookup();
-
-
     public void startSync() {
         _startSync();
     }
diff --git a/src/java/foundation/pEp/jniadapter/interfaces/AbstractEngineInterface.java b/src/java/foundation/pEp/jniadapter/interfaces/AbstractEngineInterface.java
index 63fb399..17d6f53 100644
--- a/src/java/foundation/pEp/jniadapter/interfaces/AbstractEngineInterface.java
+++ b/src/java/foundation/pEp/jniadapter/interfaces/AbstractEngineInterface.java
@@ -8,10 +8,6 @@ public interface AbstractEngineInterface extends AutoCloseable {
 
     public String getProtocolVersion();
 
-    public void startKeyserverLookup();
-
-    public void stopKeyserverLookup();
-
     public void startSync();
 
     public void stopSync();
diff --git a/test/java/foundation/pEp/jniadapter/test/regression/TestMain.java b/test/java/foundation/pEp/jniadapter/test/regression/TestMain.java
index acf87a0..3add3e1 100644
--- a/test/java/foundation/pEp/jniadapter/test/regression/TestMain.java
+++ b/test/java/foundation/pEp/jniadapter/test/regression/TestMain.java
@@ -276,10 +276,6 @@ class TestMain {
             ctx.engine.getProtocolVersion();
         });
 
-        new TestUnit<CTXBase>("Engine.startKeyserverLookup", new CTXBase(), ctx -> {
-            ctx.engine.startKeyserverLookup();
-        });
-
         new TestUnit<CTXBase>("Engine.startSync", new CTXBase(), ctx -> {
             ctx.engine.startSync();
         });