diff --git a/Dockerfile b/Dockerfile
index a4406054b6946120f5e71e6d83e3d22a4a5add29..1bb5a226623719f0920b3e975600615bacfbe04c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,13 @@
 FROM nextcloud:22.2.8-fpm AS nextcloud
 ARG BASE_DIR="/usr/src/nextcloud"
 ARG TMP_PATCH_DIR="/tmp/build_patches"
-ARG THEME_VERSION="22.1.0"
+ARG THEME_VERSION="22.1.1"
 ARG THEME_HELPER_VERSION="1.3.1"
 ARG NEWS_VERSION="18.0.1"
 ARG QUOTA_WARN_VERSION="1.14.0"
 ARG NOTES_VERSION="4.3.1"
-ARG CONTACTS_VERSION="4.1.1"
-ARG CALENDAR_JOB_ID="321100"
+ARG CONTACTS_JOB_ID="323110"
+ARG CALENDAR_JOB_ID="324817"
 ARG USER_BACKEND_RAW_SQL_VERSION="1.1.1"
 ARG EMAIL_RECOVERY_JOB_ID="313915"
 ARG RAINLOOP_VERSION="7.2.5"
@@ -17,7 +17,7 @@ ARG ECLOUD_LAUNCHER_JOB_ID="318040"
 ARG GOOGLE_INTEGRATION_VERSION="1.0.6"
 ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0"
 
-RUN sed -i 's/22,2,8,1/22,2,8,12/' ${BASE_DIR}/version.php
+RUN sed -i 's/22,2,8,1/22,2,8,13/' ${BASE_DIR}/version.php
 COPY custom_entrypoint.sh /
 RUN chmod +x /custom_entrypoint.sh
 RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images
@@ -40,10 +40,12 @@ RUN curl -fsSL -o notes.tar.gz \
     tar -xf notes.tar.gz -C ${BASE_DIR}/custom_apps/ && \
     rm notes.tar.gz;
 
-RUN curl -fsSL -o contacts.tar.gz \
-    "https://github.com/nextcloud-releases/contacts/releases/download/v${CONTACTS_VERSION}/contacts-v${CONTACTS_VERSION}.tar.gz" && \
-    tar -xf contacts.tar.gz -C ${BASE_DIR}/custom_apps/ && \
-    rm contacts.tar.gz;
+# custom Contact
+RUN curl -fsSL -o contacts.zip \
+    "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/contacts/-/jobs/${CONTACTS_JOB_ID}/artifacts/download" && \
+    unzip contacts.zip && \
+    mv dist/contacts ${BASE_DIR}/custom_apps/ && \
+    rm contacts.zip;
 
 # custom Calendar 3.2.4
 RUN curl -fsSL -o calendar.zip \
diff --git a/custom_entrypoint.sh b/custom_entrypoint.sh
index 97f7495ea44e7b5e5647d394888a688e37ea9318..87606ea450f1c3cc875c6af073e693b365683e04 100644
--- a/custom_entrypoint.sh
+++ b/custom_entrypoint.sh
@@ -37,22 +37,5 @@ else
     echo "Skipping rsync step as version not updated!"
 fi
 
-if [ "$(id -u)" = 0 ]; then
-    su -p www-data -s /bin/sh -c "php $DST_DIR/occ app:disable apporder"
-    su -p www-data -s /bin/sh -c "php $DST_DIR/occ app:enable murena_launcher"
-    su -p www-data -s /bin/sh -c "php $DST_DIR/occ app:enable ecloud-theme-helper"
-    su -p www-data -s /bin/sh -c "php $DST_DIR/occ app:disable ecloud_drop_account"
-    su -p www-data -s /bin/sh -c "php $DST_DIR/occ app:enable ecloud-accounts"
-    su -p www-data -s /bin/sh -c "php $DST_DIR/occ config:system:set integrity.check.disabled --value='true' --type=boolean"
-    su -p www-data -s /bin/sh -c "php $DST_DIR/occ config:system:set theme --value='eCloud'"
-else
-    sh -c "php $DST_DIR/occ app:disable apporder"
-    sh -c "php $DST_DIR/occ app:enable ecloud-launcher"
-    sh -c "php $DST_DIR/occ app:enable ecloud-theme-helper"
-    sh -c "php $DST_DIR/occ app:disable ecloud_drop_account"
-    sh -c "php $DST_DIR/occ app:enable ecloud-accounts"
-    sh -c "php $DST_DIR/occ config:system:set integrity.check.disabled --value='true' --type=boolean"
-    sh -c "php $DST_DIR/occ config:system:set theme --value='eCloud'"
-fi
 
 /entrypoint.sh "$@"
diff --git a/patches/016-login-screen.patch b/patches/016-login-screen.patch
index c90119f34e6527e52a5e036657c042704f1c2458..6af76804369edd7ac305b4ee0e4d6396c96eef89 100644
--- a/patches/016-login-screen.patch
+++ b/patches/016-login-screen.patch
@@ -14,7 +14,7 @@
  		<?php }?>
 -		<div class="wrapper">
 -			<div class="v-align">
-+		<div class="wrapper <?= (array_key_exists("alt_login",$_)) ? 'alt_login':'not_alt_login' ?>" > 
++		<div class="wrapper <?= (array_key_exists("alt_login",$_)) ? 'alt_login':'not_alt_login' ?>" >
 +			<?php if (array_key_exists("alt_login",$_)) { ?>
 +				<div class="banner-right-align">
 +					<div class="lines">