diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 921817e61b0..24953cd5d43 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,4 +1,4 @@
-services/settings/ @kulmann
-services/web/ @kulmann
-.drone.star @wkloucek @micbar @phil-davis @individual-it
-assets/End-User-License-Agreement-for-ownCloud-Infinite-Scale.pdf @micbar @dragotin @tbsbdr
+services/settings/ @lukashirt
+services/web/ @lukashirt
+.drone.star @kobergj @phil-davis @individual-it
+assets/End-User-License-Agreement-for-ownCloud-Infinite-Scale.pdf @kobergj @hodyroff
diff --git a/deployments/continuous-deployment-config/ocis_full/master.yml b/deployments/continuous-deployment-config/ocis_full/master.yml
index db92f98326e..99a52c2498e 100644
--- a/deployments/continuous-deployment-config/ocis_full/master.yml
+++ b/deployments/continuous-deployment-config/ocis_full/master.yml
@@ -18,10 +18,9 @@
 
   vars:
     ssh_authorized_keys:
-      - https://github.com/butonic.keys
-      - https://github.com/fschade.keys
-      - https://github.com/kulmann.keys
-      - https://github.com/micbar.keys
+      - https://github.com/kobergj.keys
+      - https://github.com/2403905.keys
+      - https://github.com/d7oc.keys
       - https://github.com/wkloucek.keys
     docker_compose_projects:
       - name: ocis
@@ -30,7 +29,7 @@
         docker_compose_path: deployments/examples/ocis_full
         env:
           INSECURE: "false"
-          TRAEFIK_ACME_MAIL: mbarz@owncloud.com
+          TRAEFIK_ACME_MAIL: julian.koberg@kiteworks.com
           OCIS_DOCKER_TAG: master
           OCIS_DOCKER_IMAGE: owncloud/ocis-rolling
           OCIS_DOMAIN: ocis.ocis.master.owncloud.works
diff --git a/deployments/continuous-deployment-config/ocis_full/onlyoffice-master.yml b/deployments/continuous-deployment-config/ocis_full/onlyoffice-master.yml
index 9a48b3b428d..164f5949d2b 100644
--- a/deployments/continuous-deployment-config/ocis_full/onlyoffice-master.yml
+++ b/deployments/continuous-deployment-config/ocis_full/onlyoffice-master.yml
@@ -18,10 +18,9 @@
 
   vars:
     ssh_authorized_keys:
-      - https://github.com/butonic.keys
-      - https://github.com/fschade.keys
-      - https://github.com/kulmann.keys
-      - https://github.com/micbar.keys
+      - https://github.com/kobergj.keys
+      - https://github.com/2403905.keys
+      - https://github.com/d7oc.keys
       - https://github.com/wkloucek.keys
     docker_compose_projects:
       - name: ocis
@@ -30,7 +29,7 @@
         docker_compose_path: deployments/examples/ocis_full
         env:
           INSECURE: "false"
-          TRAEFIK_ACME_MAIL: mbarz@owncloud.com
+          TRAEFIK_ACME_MAIL: julian.koberg@kiteworks.com
           OCIS_DOCKER_TAG: master
           OCIS_DOCKER_IMAGE: owncloud/ocis-rolling
           OCIS_DOMAIN: ocis.ocis-onlyoffice.master.owncloud.works
diff --git a/deployments/continuous-deployment-config/ocis_full/onlyoffice-rolling.yml b/deployments/continuous-deployment-config/ocis_full/onlyoffice-rolling.yml
index fb4c1ab5622..a886e4787f6 100644
--- a/deployments/continuous-deployment-config/ocis_full/onlyoffice-rolling.yml
+++ b/deployments/continuous-deployment-config/ocis_full/onlyoffice-rolling.yml
@@ -18,10 +18,9 @@
 
   vars:
     ssh_authorized_keys:
-      - https://github.com/butonic.keys
-      - https://github.com/fschade.keys
-      - https://github.com/kulmann.keys
-      - https://github.com/micbar.keys
+      - https://github.com/kobergj.keys
+      - https://github.com/2403905.keys
+      - https://github.com/d7oc.keys
       - https://github.com/wkloucek.keys
     docker_compose_projects:
       - name: ocis
@@ -30,7 +29,7 @@
         docker_compose_path: deployments/examples/ocis_full
         env:
           INSECURE: "false"
-          TRAEFIK_ACME_MAIL: mbarz@owncloud.com
+          TRAEFIK_ACME_MAIL: julian.koberg@kiteworks.com
           OCIS_DOCKER_TAG: 6.6.1
           OCIS_DOCKER_IMAGE: owncloud/ocis-rolling
           OCIS_DOMAIN: ocis.ocis-onlyoffice.rolling.owncloud.works
diff --git a/deployments/continuous-deployment-config/ocis_full/production.yml b/deployments/continuous-deployment-config/ocis_full/production.yml
index 508efd432e1..a0dde882351 100644
--- a/deployments/continuous-deployment-config/ocis_full/production.yml
+++ b/deployments/continuous-deployment-config/ocis_full/production.yml
@@ -18,10 +18,9 @@
 
   vars:
     ssh_authorized_keys:
-      - https://github.com/butonic.keys
-      - https://github.com/fschade.keys
-      - https://github.com/kulmann.keys
-      - https://github.com/micbar.keys
+      - https://github.com/kobergj.keys
+      - https://github.com/2403905.keys
+      - https://github.com/d7oc.keys
       - https://github.com/wkloucek.keys
     docker_compose_projects:
       - name: ocis
@@ -30,7 +29,7 @@
         docker_compose_path: deployments/examples/ocis_full
         env:
           INSECURE: "false"
-          TRAEFIK_ACME_MAIL: mbarz@owncloud.com
+          TRAEFIK_ACME_MAIL: julian.koberg@kiteworks.com
           OCIS_DOCKER_TAG: 7.0.0
           OCIS_DOMAIN: ocis.ocis.production.owncloud.works
           COMPANION_DOMAIN: companion.ocis.production.owncloud.works
diff --git a/deployments/continuous-deployment-config/ocis_full/rolling.yml b/deployments/continuous-deployment-config/ocis_full/rolling.yml
index c7e3dd480bd..d08b02e69f3 100644
--- a/deployments/continuous-deployment-config/ocis_full/rolling.yml
+++ b/deployments/continuous-deployment-config/ocis_full/rolling.yml
@@ -18,10 +18,9 @@
 
   vars:
     ssh_authorized_keys:
-      - https://github.com/butonic.keys
-      - https://github.com/fschade.keys
-      - https://github.com/kulmann.keys
-      - https://github.com/micbar.keys
+      - https://github.com/kobergj.keys
+      - https://github.com/2403905.keys
+      - https://github.com/d7oc.keys
       - https://github.com/wkloucek.keys
     docker_compose_projects:
       - name: ocis
@@ -30,7 +29,7 @@
         docker_compose_path: deployments/examples/ocis_full
         env:
           INSECURE: "false"
-          TRAEFIK_ACME_MAIL: mbarz@owncloud.com
+          TRAEFIK_ACME_MAIL: julian.koberg@kiteworks.com
           OCIS_DOCKER_TAG: 6.6.1
           OCIS_DOCKER_IMAGE: owncloud/ocis-rolling
           OCIS_DOMAIN: ocis.ocis.rolling.owncloud.works
diff --git a/deployments/continuous-deployment-config/ocis_full/s3-rolling.yml b/deployments/continuous-deployment-config/ocis_full/s3-rolling.yml
index c4db2bf540c..fb32524fc51 100644
--- a/deployments/continuous-deployment-config/ocis_full/s3-rolling.yml
+++ b/deployments/continuous-deployment-config/ocis_full/s3-rolling.yml
@@ -18,10 +18,9 @@
 
   vars:
     ssh_authorized_keys:
-      - https://github.com/butonic.keys
-      - https://github.com/fschade.keys
-      - https://github.com/kulmann.keys
-      - https://github.com/micbar.keys
+      - https://github.com/kobergj.keys
+      - https://github.com/2403905.keys
+      - https://github.com/d7oc.keys
       - https://github.com/wkloucek.keys
     docker_compose_projects:
       - name: ocis
@@ -30,7 +29,7 @@
         docker_compose_path: deployments/examples/ocis_full
         env:
           INSECURE: "false"
-          TRAEFIK_ACME_MAIL: mbarz@owncloud.com
+          TRAEFIK_ACME_MAIL: julian.koberg@kiteworks.com
           OCIS_DOCKER_TAG: 6.6.1
           OCIS_DOCKER_IMAGE: owncloud/ocis-rolling
           OCIS_DOMAIN: ocis.ocis-s3.rolling.owncloud.works
diff --git a/deployments/continuous-deployment-config/ocis_keycloak/rolling.yml b/deployments/continuous-deployment-config/ocis_keycloak/rolling.yml
index 20bcccc7354..b79742d312c 100644
--- a/deployments/continuous-deployment-config/ocis_keycloak/rolling.yml
+++ b/deployments/continuous-deployment-config/ocis_keycloak/rolling.yml
@@ -18,10 +18,9 @@
 
   vars:
     ssh_authorized_keys:
-      - https://github.com/butonic.keys
-      - https://github.com/fschade.keys
-      - https://github.com/kulmann.keys
-      - https://github.com/micbar.keys
+      - https://github.com/kobergj.keys
+      - https://github.com/2403905.keys
+      - https://github.com/d7oc.keys
       - https://github.com/wkloucek.keys
     docker_compose_projects:
       - name: ocis
@@ -30,7 +29,7 @@
         docker_compose_path: deployments/examples/ocis_keycloak
         env:
           INSECURE: "false"
-          TRAEFIK_ACME_MAIL: mbarz@owncloud.com
+          TRAEFIK_ACME_MAIL: julian.koberg@kiteworks.com
           OCIS_DOCKER_TAG: 6.6.1
           OCIS_DOCKER_IMAGE: owncloud/ocis-rolling
           OCIS_DOMAIN: ocis.ocis-keycloak.rolling.owncloud.works
diff --git a/deployments/continuous-deployment-config/ocis_ldap/rolling.yml b/deployments/continuous-deployment-config/ocis_ldap/rolling.yml
index 9727b73fab5..4ef6e0a2a0d 100644
--- a/deployments/continuous-deployment-config/ocis_ldap/rolling.yml
+++ b/deployments/continuous-deployment-config/ocis_ldap/rolling.yml
@@ -18,10 +18,9 @@
 
   vars:
     ssh_authorized_keys:
-      - https://github.com/butonic.keys
-      - https://github.com/fschade.keys
-      - https://github.com/kulmann.keys
-      - https://github.com/micbar.keys
+      - https://github.com/kobergj.keys
+      - https://github.com/2403905.keys
+      - https://github.com/d7oc.keys
       - https://github.com/wkloucek.keys
     docker_compose_projects:
       - name: ocis
@@ -30,7 +29,7 @@
         docker_compose_path: deployments/examples/ocis_ldap
         env:
           INSECURE: "false"
-          TRAEFIK_ACME_MAIL: mbarz@owncloud.com
+          TRAEFIK_ACME_MAIL: julian.koberg@kiteworks.com
           OCIS_DOCKER_TAG: 6.6.1
           OCIS_DOCKER_IMAGE: owncloud/ocis-rolling
           OCIS_DOMAIN: ocis.ocis-ldap.rolling.owncloud.works