diff --git a/docker/Dockerfile b/docker/Dockerfile
index 4ad8481f..9c6a09eb 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,84 +1,87 @@
 FROM fedora:27
 
 RUN dnf -y update
 
 RUN dnf -y install gcc-c++ git doxygen cmake bzr vim tar ninja-build clang procps-ng libcxx-devel sudo rsyslog
 
 #Sink deps
 RUN dnf -y install extra-cmake-modules qt5-qtbase-devel libgit2-devel lmdb-devel readline-devel libcurl-devel xapian-core-devel flatbuffers-devel
 
 #Test and debugging
 RUN dnf -y install gdb xterm perf valgrind strace kcachegrind dbus-x11 gammaray heaptrack
 #Required for the symbolizer for asan
 RUN dnf -y install llvm
 
 #kf5-mime
 RUN dnf -y install cyrus-sasl-devel
 
 #Stuff for kube
 RUN dnf -y install qt5-qtquickcontrols qt5-qtquickcontrols2-devel qt5-qtwebengine-devel qt5-qtxmlpatterns-devel
 RUN dnf -y install kf5-kpackage-devel kf5-ki18n-devel kf5-kcodecs-devel kf5-kcontacts-devel kf5-kmime-devel qgpgme-devel kf5-kcalendarcore-devel
 
 # Imap tests
 RUN dnf -y install cyrus-imapd cyrus-sasl cyrus-sasl-plain gnupg2-smime pinentry-gtk
 
 #Fonts
 RUN dnf -y install google-noto-serif-fonts google-noto-sans-fonts
 
 RUN dnf -y install xorg-x11-server-Xvfb
 
 RUN useradd -d /home/developer -m developer
 
 
 ADD rsyslog.conf /etc/rsyslog.conf
 #Setup cyrus imap
 ADD imapd.conf /etc/imapd.conf
 RUN usermod -p `perl -e "print crypt("admin","Q4")"` cyrus
 RUN useradd -p `perl -e "print crypt("doe","Q4")"` doe
 RUN /usr/bin/sscg --package cyrus-imapd --cert-file /etc/pki/cyrus-imapd/cyrus-imapd.pem --cert-key-file /etc/pki/cyrus-imapd/cyrus-imapd-key.pem --ca-file /etc/pki/cyrus-imapd/cyrus-imapd-ca.pem
 RUN saslauthd -a shadow && /usr/libexec/cyrus-imapd/master -d && sleep 1 && echo "cm user.doe" | cyradm --auth PLAIN -u cyrus -w admin localhost
 #RUN echo "doe" | saslpasswd2 -p -u example.org doe
 #RUN chown cyrus:root /etc/sasldb2
 
 #DBus For KCacheGrind
 RUN dbus-uuidgen --ensure
 
 # setup developer account
 RUN echo 'developer ALL=NOPASSWD: ALL' >> /etc/sudoers
 USER developer
 ENV HOME /home/developer
 WORKDIR /home/developer/
 
 ENV QT_PLUGIN_PATH /install/lib64/plugins/
 ENV LD_LIBRARY_PATH /install/lib64
 ENV PATH /install/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 ENV QML_IMPORT_PATH /install/lib64/qml
 ENV QML2_IMPORT_PATH /install/lib64/qml
 ENV XDG_CONFIG_DIRS /install/share/config
 ENV XDG_DATA_DIRS /install/share/:/usr/share
 RUN mkdir /tmp/runtime-developer
 ENV XDG_RUNTIME_DIR /tmp/runtime-developer
 ENV LANG en_US.UTF-8
 
 RUN git config --global url."git://anongit.kde.org/".insteadOf kde: && \
     git config --global url."ssh://git@git.kde.org/".pushInsteadOf kde:
 
 ADD bashrc /home/developer/.bashrc
 ADD startimap.sh /home/developer/startimap.sh
 
 
 ADD setupkolabnowtest.sh /home/developer/setupkolabnowtest.sh
 ADD kubeunlocked.sh /home/developer/kubeunlocked.sh
 ADD initrepositories.sh /home/developer/initrepositories.sh
 
 ADD keyconfig /home/developer/keyconfig
 ADD gpg-agent.conf /home/developer/.gnupg/gpg-agent.conf
 ADD gpg.conf /home/developer/.gnupg/gpg.conf
 ADD gdbinit /home/developer/.gdbinit
 ADD enableDebug.sh /home/developer/enableDebug.sh
+ADD private-key /home/developer/private-key
+ADD public-key /home/developer/public-key
 RUN sudo chown developer:developer /home/developer/*
 RUN sudo chown developer:developer /home/developer/.gnupg -R
 
-RUN gpg2 --batch --generate-key /home/developer/keyconfig
+RUN gpg2 --import /home/developer/public-key
+RUN gpg2 --batch --import /home/developer/private-key
 #Better qt support
 RUN git clone https://github.com/Lekensteyn/qt5printers.git ~/.gdb/qt5printers/
diff --git a/docker/generate-key.sh b/docker/generate-key.sh
new file mode 100644
index 00000000..15379095
--- /dev/null
+++ b/docker/generate-key.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+gpg2 --batch --generate-key keyconfig
+gpg2 --export-secret-key -a test1@kolab.org > private-key
+gpg2 --export -a test1@kolab.org > public-key
diff --git a/docker/private-key b/docker/private-key
new file mode 100644
index 00000000..7ebf09dd
--- /dev/null
+++ b/docker/private-key
@@ -0,0 +1,59 @@
+-----BEGIN PGP PRIVATE KEY BLOCK-----
+
+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
+UbgUQg+rWDyO/t7TNy6SHe92l0orFH7r0z/b
+=CEuP
+-----END PGP PRIVATE KEY BLOCK-----
diff --git a/docker/public-key b/docker/public-key
new file mode 100644
index 00000000..6c3d8b72
--- /dev/null
+++ b/docker/public-key
@@ -0,0 +1,56 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+P9s=
+=nF1e
+-----END PGP PUBLIC KEY BLOCK-----