diff --git a/Dockerfile b/Dockerfile
index 3f3f4e84863c7414303622582ae434fe3c77878a..7f54b4c752507b7796203baae7d87cf20b3f1097 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,23 +1,24 @@
-FROM nextcloud:19.0.12-fpm
+FROM nextcloud:20.0.11-fpm
 ARG BASE_DIR="/usr/src/nextcloud"
 ARG TMP_PATCH_DIR="/tmp/build_patches"
 ARG THEME_VERSION="19.0.9.6"
-ARG NEWS_VERSION="14.2.2"
-ARG QUOTA_WARN_VERSION="1.8.0"
-ARG NOTES_VERSION="3.6.4"
+ARG NEWS_VERSION="16.0.0"
+ARG QUOTA_WARN_VERSION="1.9.1"
+ARG NOTES_VERSION="4.1.0"
 ARG CONTACTS_VERSION="3.5.1"
-ARG CALENDAR_VERSION="2.0.5"
-ARG USER_BACKEND_RAW_SQL_VERSION="1.0.12"
+ARG CALENDAR_VERSION="2.3.0"
+ARG USER_BACKEND_RAW_SQL_VERSION="1.1.0"
 ARG EMAIL_RECOVERY_JOB_ID="162557"
-ARG RAINLOOP_VERSION="7.1.0"
-ARG RAINLOOP_COMMIT_SHA="c21dfcab"
+ARG RAINLOOP_VERSION="7.1.2"
+ARG RAINLOOP_COMMIT_SHA="aa5c57a7"
 ARG USC_VERSION="1.0.0"
+ARG EDA_TAG="nc-20"
 
 RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images
 COPY patches/ ${TMP_PATCH_DIR}/
 COPY custom_entrypoint.sh /
 RUN chmod +x /custom_entrypoint.sh
-# RUN sed -i 's/19,0,12,0/19,0,12,1/' ${BASE_DIR}/version.php
+RUN sed -i 's/20,0,11,1/20,0,11,2/' ${BASE_DIR}/version.php
 
 # Install unzip for unzipping artifacts
 RUN apt-get update && apt-get install unzip 
@@ -44,7 +45,7 @@ RUN curl -fsSL -o contacts.tar.gz \
     rm contacts.tar.gz;
 
 RUN curl -fsSL -o calendar.tar.gz \
-    "https://github.com/nextcloud/calendar/releases/download/v${CALENDAR_VERSION}/calendar.tar.gz" && \
+    "https://github.com/nextcloud-releases/calendar/releases/download/v${CALENDAR_VERSION}/calendar.tar.gz" && \
     tar -xf calendar.tar.gz -C ${BASE_DIR}/custom_apps/ && \
     rm calendar.tar.gz;
 
@@ -65,6 +66,12 @@ RUN curl -fsSL -o rainloop.tar.gz \
     mv "${BASE_DIR}/custom_apps/rainloop-nextcloud-${RAINLOOP_VERSION}-${RAINLOOP_COMMIT_SHA}" "${BASE_DIR}/custom_apps/rainloop" && \
     rm rainloop.tar.gz;
 
+RUN curl -fsSL -o ecloud_drop_account.tar.gz \
+    "https://gitlab.e.foundation/e/infra/selfhost/nextcloud-apps/ecloud-drop-account/-/archive/${EDA_TAG}/ecloud-drop-account-${EDA_TAG}.tar.gz" && \
+    tar -xf ecloud_drop_account.tar.gz -C ${BASE_DIR}/custom_apps/ && \
+    mv "${BASE_DIR}/custom_apps/ecloud-drop-account-${EDA_TAG}" "${BASE_DIR}/custom_apps/ecloud_drop_account" && \
+    rm ecloud_drop_account.tar.gz;
+
 # Remove unzip when unzipping is done
 RUN apt-get -y remove unzip
 
@@ -74,8 +81,9 @@ RUN patch -u ${BASE_DIR}/core/templates/layout.user.php -i ${TMP_PATCH_DIR}/003-
 RUN patch -u ${BASE_DIR}/core/Controller/ContactsMenuController.php -i ${TMP_PATCH_DIR}/004-contact-search-controller-removal.patch
 RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/005-autocomplete-user-leak-core.patch
 RUN cd ${BASE_DIR}/custom_apps && patch -p0 < ${TMP_PATCH_DIR}/005-autocomplete-user-leak-custom-app.patch
-RUN patch -u ${BASE_DIR}/custom_apps/notes/lib/Service/NoteUtil.php -i ${TMP_PATCH_DIR}/006-notes-url-fix.patch
-RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/007-recovery-email-changes.patch
+RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/006-recovery-email-changes.patch
+# RUN patch -u ${BASE_DIR}/apps/files_trashbin/lib/Storage.php -i ${TMP_PATCH_DIR}/007-files-trashbin-parent-wrapper.patch
+RUN patch -u ${BASE_DIR}/apps/settings/lib/Settings/Personal/ServerDevNotice.php -i ${TMP_PATCH_DIR}/008-remove-dev-notice.patch
 RUN rm -rf ${TMP_PATCH_DIR}
 
 # autocomplete leak tweak apps frontend with sed, disable group suggestion
diff --git a/custom_entrypoint.sh b/custom_entrypoint.sh
index 9d9b0a2aad170b9599d27272e18eb5adf6432444..0aead91041389e99ee95ad5b7191253bbd4b508d 100644
--- a/custom_entrypoint.sh
+++ b/custom_entrypoint.sh
@@ -14,6 +14,7 @@ rsync $rsync_options --include "/contacts/" --exclude '/*' $SRC_DIR/custom_apps/
 rsync $rsync_options --include "/user_backend_sql_raw/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/
 rsync $rsync_options --include "/rainloop" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/
 rsync $rsync_options --include "/email-recovery" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/
+rsync $rsync_options --include "/ecloud_drop_account" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/
 
 rsync $rsync_options --include "/eelo/" --exclude '/*' $SRC_DIR/themes/ $DST_DIR/themes/
 
diff --git a/patches/003-contact-search-removal.patch b/patches/003-contact-search-removal.patch
index a4887e0784585fa7129ef78c4ee8b6565113c20b..6449e213a10cc69636313024a385d1cc2b4f766b 100644
--- a/patches/003-contact-search-removal.patch
+++ b/patches/003-contact-search-removal.patch
@@ -5,12 +5,12 @@ Subject: [PATCH] remove user search icon in header tab
 This patch removes the top right icon enabling the global user search function available to all in nextcloud.
 
 diff --git layout.user.php layout.user.php-new
---- layout.user.php	2021-02-02 16:47:17.348572250 +0100
-+++ layout.user.php-new	2021-02-02 16:47:33.128646878 +0100
-@@ -111,14 +111,6 @@
- 						autocomplete="off">
- 					<button class="icon-close-white" type="reset"><span class="hidden-visually"><?php p($l->t('Reset search'));?></span></button>
- 				</form>
+--- layout.user.php	2021-06-22 14:06:34.786843164 +0530
++++ layout.user.php-new	2021-06-22 14:07:45.938569109 +0530
+@@ -103,14 +103,6 @@
+
+ 			<div class="header-right">
+ 				<div id="unified-search"></div>
 -				<div id="contactsmenu">
 -					<div class="icon-contacts menutoggle" tabindex="0" role="button"
 -					aria-haspopup="true" aria-controls="contactsmenu-menu" aria-expanded="false">
diff --git a/patches/005-autocomplete-user-leak-core.patch b/patches/005-autocomplete-user-leak-core.patch
index 1b7a38bdb5306d52415a5a7f2aec80c2e2bf46b1..191de05ea130e4b7f703b67197f78d9ed75fb778 100644
--- a/patches/005-autocomplete-user-leak-core.patch
+++ b/patches/005-autocomplete-user-leak-core.patch
@@ -24,15 +24,15 @@ diff --git lib/private/Collaboration/Collaborators/UserPlugin.php lib/private/Co
  			) {
  				if (strtolower($uid) === $lowerSearch) {
 diff --git lib/private/Collaboration/Collaborators/MailPlugin.php lib/private/Collaboration/Collaborators/MailPlugin-new.php
---- lib/private/Collaboration/Collaborators/MailPlugin.php	2021-02-16 14:55:37.281914086 +0100
-+++ lib/private/Collaboration/Collaborators/MailPlugin-new.php	2021-02-19 16:22:07.662189199 +0100
+--- lib/private/Collaboration/Collaborators/MailPlugin.php	2021-06-22 14:53:24.451402977 +0530
++++ lib/private/Collaboration/Collaborators/MailPlugin-new.php	2021-06-22 14:56:31.201379020 +0530
 @@ -36,6 +36,7 @@
  use OCP\IConfig;
  use OCP\IGroupManager;
  use OCP\IUser;
 +use OCP\IUserManager;
  use OCP\IUserSession;
- use OCP\Share;
+ use OCP\Share\IShare;
  
 @@ -56,12 +57,13 @@
  	/** @var IUserSession */
@@ -44,12 +44,12 @@ diff --git lib/private/Collaboration/Collaborators/MailPlugin.php lib/private/Co
  		$this->cloudIdManager = $cloudIdManager;
  		$this->config = $config;
  		$this->groupManager = $groupManager;
- 		$this->userSession = $userSession;
-+		$this->userManager = $userManager;
+		$this->userSession = $userSession;
++       $this->userManager = $userManager;
  
  		$this->shareeEnumeration = $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes';
  		$this->shareWithGroupOnly = $this->config->getAppValue('core', 'shareapi_only_share_with_group_members', 'no') === 'yes';
-@@ -185,43 +187,79 @@
+@@ -185,43 +187,78 @@
  						if ($exactEmailMatch) {
  							$searchResult->markExactIdMatch($emailType);
  						}
@@ -59,11 +59,10 @@ diff --git lib/private/Collaboration/Collaborators/MailPlugin.php lib/private/Co
 -							'name' => $contact['FN'],
 -							'type' => $emailAddressType ?? '',
 -							'value' => [
--								'shareType' => Share::SHARE_TYPE_EMAIL,
+-								'shareType' => IShare::TYPE_EMAIL,
 -								'shareWith' => $emailAddress,
 -							],
 -						];
-+						
 +						$isUserinInstance = $this->userManager->get($emailAddress);
 +						if ($isUserinInstance === null) {
 +							// /e/ user is not in ecloud
@@ -99,7 +98,7 @@ diff --git lib/private/Collaboration/Collaborators/MailPlugin.php lib/private/Co
 -							'name' => $contact['FN'],
 -							'type' => $emailAddressType ?? '',
 -							'value' => [
--								'shareType' => Share::SHARE_TYPE_EMAIL,
+-								'shareType' => IShare::TYPE_EMAIL,
 -								'shareWith' => $emailAddress,
 -							],
 -						];
@@ -153,4 +152,4 @@ diff --git lib/private/Collaboration/Collaborators/MailPlugin.php lib/private/Co
 +//		}
  
  
- 		if (!$searchResult->hasExactIdMatch($emailType) && filter_var($search, FILTER_VALIDATE_EMAIL)) {
\ No newline at end of file
+ 		if (!$searchResult->hasExactIdMatch($emailType) && filter_var($search, FILTER_VALIDATE_EMAIL)) {
diff --git a/patches/006-notes-url-fix.patch b/patches/006-notes-url-fix.patch
deleted file mode 100644
index dab16bdf05ee8c4af94ea3502e390219c97d8b11..0000000000000000000000000000000000000000
--- a/patches/006-notes-url-fix.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From: Akhil <akhil@e.email>
-Date: Mon, 21 Dec 2020 13:47:24 +0530
-Subject: [PATCH] Changes for notes with long filenames that generate endless recursion and memory issues
-
-This patch replaces a buggy recursion method with an iterative procedure. When there is a very long filename the recursion doesn't end. An iterative procedure works well.
-
-diff --git ../../notes-3.6.4/lib/Service/NoteUtilOriginal.php ../../notes-3.6.4/lib/Service/NoteUtil.php
---- ../../notes-3.6.4/lib/Service/NoteUtilOriginal.php	2020-12-21 13:45:50.215222624 +0530
-+++ ../../notes-3.6.4/lib/Service/NoteUtil.php	2020-12-21 13:47:24.277418659 +0530
-@@ -86,23 +86,25 @@
- 
- 		// if file does not exist, that name has not been taken. Similar we don't
- 		// need to handle file collisions if it is the filename did not change
--		if (!$folder->nodeExists($filename) || $folder->get($filename)->getId() === $id) {
--			return $filename;
--		} else {
--			// increments name (2) to name (3)
--			$match = preg_match('/\((?P<id>\d+)\)$/u', $title, $matches);
--			if ($match) {
--				$newId = ((int) $matches['id']) + 1;
--				$newTitle = preg_replace(
--					'/(.*)\s\((\d+)\)$/u',
--					'$1 (' . $newId . ')',
--					$title
--				);
--			} else {
--				$newTitle = $title . ' (2)';
--			}
--			return $this->generateFileName($folder, $newTitle, $suffix, $id);
--		}
-+		while($folder->nodeExists($filename) ) {
-+                        $file = $folder->get($filename);
-+                        if($file && $file->getId() === $id) {
-+                           return $filename;
-+                        }
-+                        $match = preg_match('/\((?P<id>\d+)\)$/u', $title, $matches);
-+                                        if ($match) {
-+                                                        $newId = ((int) $matches['id']) + 1;
-+                                                        $title = preg_replace(
-+                                                                        '/(.*)\s\((\d+)\)$/u',
-+                                                                        '$1 (' . $newId . ')',
-+                                                                        $title
-+                                                        );
-+                                        } else {
-+                                                        $title = $title . ' (2)';
-+                                        }
-+                        $filename = $title . $suffix;
-+                }
-+                return $filename;
- 	}
- 
- 	public function getSafeTitle(string $content) : string {
diff --git a/patches/007-recovery-email-changes.patch b/patches/006-recovery-email-changes.patch
similarity index 100%
rename from patches/007-recovery-email-changes.patch
rename to patches/006-recovery-email-changes.patch
diff --git a/patches/007-files-trashbin-parent-wrapper.patch b/patches/007-files-trashbin-parent-wrapper.patch
new file mode 100644
index 0000000000000000000000000000000000000000..daeb728d45c22b67c9c5097aed0e61de28698b77
--- /dev/null
+++ b/patches/007-files-trashbin-parent-wrapper.patch
@@ -0,0 +1,19 @@
+From: Akhil <akhil@e.email>
+Date: Tue, 29 Jun 2021 14:10:00 +0530
+Subject: [PATCH] Use parent wrapper to properly handle moves on the same source/target storage
+
+This patch adds changes described at https://github.com/nextcloud/server/pull/27016/files for NC 20.0.10
+Resolves encryption issues when deleting files after upgrade to NC 20.0.10
+
+diff --git ./apps/files_trashbin/lib/Storage.php ./apps/files_trashbin/lib/Storage-new.php
+--- ./apps/files_trashbin/lib/Storage.php	2021-06-29 14:03:36.547345625 +0530
++++ ./apps/files_trashbin/lib/Storage-new.php	2021-06-29 14:06:32.135969869 +0530
+@@ -237,7 +237,7 @@
+ 				/** @var Storage $sourceStorage */
+ 				$sourceStorage->disableTrash();
+ 			}
+-			$result = $this->getWrapperStorage()->moveFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath);
++                       $result = parent::moveFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath);
+ 			if ($sourceIsTrashbin) {
+ 				/** @var Storage $sourceStorage */
+ 				$sourceStorage->enableTrash();
diff --git a/patches/008-remove-dev-notice.patch b/patches/008-remove-dev-notice.patch
new file mode 100644
index 0000000000000000000000000000000000000000..9e848605a54b8dab91b879a6e4cf29a46f32adad
--- /dev/null
+++ b/patches/008-remove-dev-notice.patch
@@ -0,0 +1,24 @@
+From: Akhil <akhil@e.email>
+Date: Tue, 6 Jul 2021 16:20:00 +0530
+Subject: [PATCH] Remove development notice portion in personal info settings
+
+This patch removes the development notice portion in personal info settings
+
+diff --git ./apps/settings/lib/Settings/ServerDevNotice.php ./apps/settings/lib/Settings/ServerDevNotice-new.php
+--- ./apps/settings/lib/Settings/ServerDevNotice.php	2021-07-06 16:16:44.706709243 +0530
++++ ./apps/settings/lib/Settings/ServerDevNotice-new.php	2021-07-06 16:19:56.479687126 +0530
+@@ -100,11 +100,12 @@
+ 	 * @return string the section ID, e.g. 'sharing'
+ 	 */
+ 	public function getSection() {
+-		if ($this->registry->delegateHasValidSubscription()) {
++		/*if ($this->registry->delegateHasValidSubscription()) {
+ 			return null;
+ 		}
+ 
+-		return 'personal-info';
++        return 'personal-info';*/
++        return null;
+ 	}
+ 
+ 	/**