117 files changed, 2189 insertions, 1086 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3ff991aa4..4a7a4e605 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,7 @@ before_script:
   # prepare git fetching of secrets
   - echo "$gitlab_deploy_privkey" > ~/.ssh/gitlab_deploy.key
   - chmod 600 ~/.ssh/gitlab_deploy.key
-  - ssh-keyscan -H 'ssh.git.shackspace.de' >> ~/.ssh/known_hosts
+  - echo "$ssh_git_shackspace_serverkey" >> ~/.ssh/known_hosts
   # import secret key for secrets
   - echo "$secrets_gpg_key" | gpg --import
 deployment test:
diff --git a/.gitmodules b/.gitmodules
index e9b098519..a0eb20951 100644
--- a/.gitmodules
+++ b/