diff --git a/Dockerfile b/Dockerfile
index 0aedb16a4f7f4f48eeea64085647594fae55d3ce..7fe695e4d0fd78d3c08404e51c5a7e57b6a35c1f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,23 +1,23 @@
-FROM nextcloud:22.2.9-fpm AS nextcloud
+FROM nextcloud:22.2.10-fpm AS nextcloud
 ARG BASE_DIR="/usr/src/nextcloud"
 ARG TMP_PATCH_DIR="/tmp/build_patches"
-ARG THEME_VERSION="22.1.3"
-ARG THEME_HELPER_VERSION="1.3.2"
-ARG NEWS_VERSION="18.1.0"
+ARG THEME_VERSION="22.1.4"
+ARG THEME_HELPER_VERSION="1.4.1"
+ARG NEWS_VERSION="18.1.1"
 ARG QUOTA_WARN_VERSION="1.14.0"
-ARG NOTES_VERSION="4.3.1"
-ARG CONTACTS_JOB_ID="329486"
-ARG CALENDAR_JOB_ID="344794"
+ARG NOTES_VERSION="4.5.0"
+ARG CONTACTS_JOB_ID="372144"
+ARG CALENDAR_JOB_ID="372097"
 ARG USER_BACKEND_RAW_SQL_VERSION="1.3.0"
-ARG EMAIL_RECOVERY_JOB_ID="313915"
+ARG EMAIL_RECOVERY_JOB_ID="314819"
 ARG RAINLOOP_VERSION="7.2.5"
 ARG RAINLOOP_COMMIT_SHA="523518ba"
 ARG EA_TAG="2.1.0"
 ARG ECLOUD_LAUNCHER_JOB_ID="345049"
-ARG GOOGLE_INTEGRATION_VERSION="1.0.6"
+ARG GOOGLE_INTEGRATION_VERSION="1.0.8"
 ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0"
 
-RUN sed -i 's/22,2,9,1/22,2,9,3/' ${BASE_DIR}/version.php
+RUN sed -i 's/22,2,10,2/22,2,10,5/' ${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
@@ -62,8 +62,8 @@ RUN curl -fsSL -o user_backend_sql_raw.tar.gz \
 RUN curl -fsSL -o email-recovery.zip \
     "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/email-recovery/-/jobs/${EMAIL_RECOVERY_JOB_ID}/artifacts/download" && \
     unzip email-recovery.zip && \
-    cd dist && tar -xf email-recovery.tar.gz -C ${BASE_DIR}/custom_apps/ && \
-    rm email-recovery.tar.gz;
+    mv dist/email-recovery ${BASE_DIR}/custom_apps/ && \
+    rm email-recovery.zip;
 
 RUN curl -fsSL -o rainloop.tar.gz \
     "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/rainloop-nextcloud/-/archive/${RAINLOOP_VERSION}-${RAINLOOP_COMMIT_SHA}/rainloop-nextcloud-${RAINLOOP_VERSION}-${RAINLOOP_COMMIT_SHA}.tar.gz" && \
@@ -158,5 +158,12 @@ RUN curl -fsSL -o eCloud-theme.tar.gz \
 # Replace "Get your own free account" NC link with /e/ Account link in public pages
 RUN sed -i 's/https:\/\/nextcloud.com\/signup\//https:\/\/e\.foundation\/<?php p(\$_\[\x27language\x27\]); ?>\/e-email-invite\//' ${BASE_DIR}/core/templates/layout.public.php
 
+# Set default class of hidden to settings-hint
+RUN sed -i 's/settings-hint/settings-hint hidden/' ${BASE_DIR}/apps/settings/templates/settings/personal/security/twofactor.php
+
+# Seds to fix displayname save regression
+RUN sed -i "s/'email' ||/'email'/" ${BASE_DIR}/apps/settings/js/federationsettingsview.js
+RUN sed -i "s/field === 'displayname'//" ${BASE_DIR}/apps/settings/js/federationsettingsview.js
+
 ENTRYPOINT ["/custom_entrypoint.sh"]
 CMD ["php-fpm"]
diff --git a/patches/005-autocomplete-user-leak-core.patch b/patches/005-autocomplete-user-leak-core.patch
index 26cbf3344b0a407e31f468b077a225541f884fce..68d0f74e14c6e20ec8a5bfc4ee5fb1ebb8312010 100644
--- a/patches/005-autocomplete-user-leak-core.patch
+++ b/patches/005-autocomplete-user-leak-core.patch
@@ -14,13 +14,15 @@ this filtering works in conjunction with the autocomplete feature disabled in ne
 diff --git lib/private/Collaboration/Collaborators/UserPlugin.php lib/private/Collaboration/Collaborators/UserPlugin-new.php
 --- lib/private/Collaboration/Collaborators/UserPlugin.php	2021-01-25 15:56:05.000000000 +0100
 +++ lib/private/Collaboration/Collaborators/UserPlugin-new.php	2021-02-16 14:56:26.778152834 +0100
-@@ -114,7 +114,7 @@
- 			$uid = (string) $uid;
+@@ -186,8 +186,8 @@
  			if (
+ 				$this->shareeEnumerationFullMatch &&
  				$lowerSearch !== '' && (strtolower($uid) === $lowerSearch ||
 -				strtolower($userDisplayName) === $lowerSearch ||
-+//				strtolower($userDisplayName) === $lowerSearch ||
- 				strtolower($userEmail) === $lowerSearch)
+-				($this->shareeEnumerationFullMatchIgnoreSecondDisplayName && trim(strtolower(preg_replace('/ \(.*\)$/', '', $userDisplayName))) === $lowerSearch) ||
++				// strtolower($userDisplayName) === $lowerSearch ||
++				// ($this->shareeEnumerationFullMatchIgnoreSecondDisplayName && trim(strtolower(preg_replace('/ \(.*\)$/', '', $userDisplayName))) === $lowerSearch) ||
+ 				($this->shareeEnumerationFullMatchEmail && strtolower($userEmail) === $lowerSearch))
  			) {
  				if (strtolower($uid) === $lowerSearch) {
 diff --git lib/private/Collaboration/Collaborators/MailPlugin.php lib/private/Collaboration/Collaborators/MailPlugin-new.php