diff --git a/Dockerfile b/Dockerfile
index a8fea96b0ece9301d40a57e8b7424fdcf94e6231..4136b4b3c1a49b691aad42a85589cdf95c48a511 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,93 +1,57 @@
-FROM nextcloud:30.0.14-fpm AS nextcloud
+FROM nextcloud:31.0.9-fpm AS nextcloud
 ARG BASE_DIR="/usr/src/nextcloud"
 ARG TMP_PATCH_DIR="/tmp/build_patches"
-ARG THEME_HELPER_JOB_ID="1330034"
-ARG NOTES_VERSION="4.11.0"
-ARG CONTACTS_JOB_ID="1313223"
-ARG CALENDAR_JOB_ID="1330379"
-ARG EMAIL_RECOVERY_JOB_ID="1313239"
-ARG EA_JOB_ID="1317005"
-ARG LAUNCHER_JOB_ID="1330025"
-ARG GOOGLE_INTEGRATION_VERSION="3.2.0"
-ARG DASHBOARD_JOB_ID="1313279"
-ARG SNAPPY_VERSION="2.37.2"
-ARG SNAPPY_THEME_VERSION="4.0.5"
-ARG USER_MIGRATION_JOB_ID="1313296"
-ARG MEMORIES_VERSION="7.5.2"
-ARG DROP_ACCOUNT_VERSION="2.7.1"
-
-RUN sed -i 's/30,0,14,1/30,0,14,11/' ${BASE_DIR}/version.php
+
+ARG CONTACTS_URL="https://gitlab.e.foundation/api/v4/projects/1238/packages/generic/contacts/v7.2.0+murena-20250926/contacts-v7.2.0+murena-20250926.tar.gz"
+ARG CALENDAR_URL="https://gitlab.e.foundation/api/v4/projects/1199/packages/generic/calendar/v5.3.5+murena-20251016/calendar-v5.3.5+murena-20251016.tar.gz"
+ARG THEME_HELPER_URL="https://gitlab.e.foundation/api/v4/projects/952/packages/generic/ecloud-theme-helper/v9.0.0/ecloud-theme-helper-v9.0.0.tar.gz"
+ARG LAUNCHER_URL="https://gitlab.e.foundation/api/v4/projects/927/packages/generic/murena_launcher/v9.0.0/murena_launcher-v9.0.0.tar.gz"
+ARG DASHBOARD_URL="https://gitlab.e.foundation/api/v4/projects/1195/packages/generic/murena-dashboard/v9.0.0/murena-dashboard-v9.0.0.tar.gz"
+ARG SNAPPY_URL="https://gitlab.e.foundation/api/v4/projects/1367/packages/generic/snappymail/v2.38.2+murena-20250822/snappymail-v2.38.2+murena-20250822.tar.gz"
+ARG OIDC_LOGIN_URL="https://gitlab.e.foundation/api/v4/projects/1496/packages/generic/oidc_login/3.2.2+murena-20250822/oidc_login-3.2.2+murena-20250822.tar.gz"
+ARG SNAPPY_THEME_VERSION="https://gitlab.e.foundation/api/v4/projects/1377/packages/generic/snappymail/v4.0.5/snappymail-v4.0.5.tar.gz"
+ARG EA_URL="https://gitlab.e.foundation/api/v4/projects/648/packages/generic/ecloud-accounts/v13.0.0/ecloud-accounts-v13.0.0.tar.gz"
+ARG EMAIL_RECOVERY_URL="https://gitlab.e.foundation/api/v4/projects/868/packages/generic/email-recovery/12.0.0/email-recovery-12.0.0.tar.gz"
+ARG USER_MIGRATION_URL="https://gitlab.e.foundation/api/v4/projects/1468/packages/generic/user_migration/8.0.0+murena-20251020/user_migration-8.0.0+murena-20251020.tar.gz"
+
+ARG NOTES_URL="https://github.com/nextcloud-releases/notes/releases/download/v4.11.0/notes-v4.11.0.tar.gz"
+ARG MEMORIES_URL="https://github.com/pulsejet/memories/releases/download/v7.5.2/memories.tar.gz"
+ARG DROP_ACCOUNT_URL="https://packages.framasoft.org/projects/nextcloud-apps/drop-account/drop_account-2.7.1.tar.gz"
+ARG GOOGLE_INTEGRATION_URL="https://github.com/nextcloud/integration_google/releases/download/v1.0.9/integration_google-1.0.9.tar.gz"
+
+RUN sed -i 's/31,0,9,1/31,0,9,9/' ${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
 # Install unzip for unzipping artifacts
 RUN apt-get update && apt-get install -y unzip ffmpeg
 
-RUN curl -fsSL -o notes.tar.gz \
-  "https://github.com/nextcloud-releases/notes/releases/download/v${NOTES_VERSION}/notes-v${NOTES_VERSION}.tar.gz" && \
-  tar -xf notes.tar.gz -C ${BASE_DIR}/custom_apps/ && \
-  rm notes.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;
-
-RUN curl -fsSL -o calendar.zip \
-  "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/calendar/-/jobs/${CALENDAR_JOB_ID}/artifacts/download" && \
-  unzip calendar.zip && \
-  mv dist/calendar ${BASE_DIR}/custom_apps/ && \
-  rm calendar.zip;
-
-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 && \
-  mv dist/email-recovery ${BASE_DIR}/custom_apps/ && \
-  rm email-recovery.zip;
-
-
-RUN curl -fsSL -o ecloud-theme-helper.zip \
-  "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/ecloud-theme-helper/-/jobs/${THEME_HELPER_JOB_ID}/artifacts/download" && \
-  unzip ecloud-theme-helper.zip && \
-  mv dist/ecloud-theme-helper ${BASE_DIR}/custom_apps/ && \
-  rm ecloud-theme-helper.zip;
-
-RUN curl -fsSL -o murena_launcher.zip \
-  "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/launcher/-/jobs/${LAUNCHER_JOB_ID}/artifacts/download" && \
-  unzip murena_launcher.zip && \
-  mv dist/murena_launcher ${BASE_DIR}/custom_apps/ && \
-  rm murena_launcher.zip;
-
-RUN curl -fsSL -o integration_google.tar.gz \
-  "https://github.com/nextcloud-releases/integration_google/releases/download/v${GOOGLE_INTEGRATION_VERSION}/integration_google-v${GOOGLE_INTEGRATION_VERSION}.tar.gz" && \
-  tar -xf integration_google.tar.gz -C ${BASE_DIR}/custom_apps/ && \
-  chown -R www-data:www-data ${BASE_DIR}/custom_apps/integration_google && \
-  rm integration_google.tar.gz;
-
-RUN curl -fsSL -o ecloud-accounts.zip \
-  "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/ecloud-accounts/-/jobs/${EA_JOB_ID}/artifacts/download" && \
-  unzip ecloud-accounts.zip && \
-  mv dist/ecloud-accounts ${BASE_DIR}/custom_apps/ && \
-  rm ecloud-accounts.zip;
-
-RUN curl -fsSL -o ecloud-dashboard.zip \
-  "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/murena-dashboard/-/jobs/${DASHBOARD_JOB_ID}/artifacts/download" && \
-  unzip ecloud-dashboard.zip && \
-  mv dist/murena-dashboard ${BASE_DIR}/custom_apps/ && \
-  rm ecloud-dashboard.zip;
-
-#RUN curl -fsSL -o snappymail.tar.gz \
-#  "https://snappymail.eu/repository/nextcloud/snappymail-${SNAPPY_VERSION}-nextcloud.tar.gz" && \
-#  tar -xf snappymail.tar.gz -C ${BASE_DIR}/custom_apps/ && \
-#  rm snappymail.tar.gz;
-
-RUN curl -fsSL -o user_migration.zip \
-  "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/user_migration/-/jobs/${USER_MIGRATION_JOB_ID}/artifacts/download" && \
-  unzip user_migration.zip && \
-  mv dist/user_migration ${BASE_DIR}/custom_apps/ && \
-  rm user_migration.zip;
+
+RUN rm -rf ${BASE_DIR}/core/skeleton/* ${BASE_DIR}/themes/example \
+ && mkdir -p ${BASE_DIR}/core/skeleton/Documents \
+ && mkdir -p ${BASE_DIR}/core/skeleton/Images \
+ && mkdir -p ${BASE_DIR}/themes/Murena
+
+# Install unzip for unzipping artifacts
+RUN apt-get update && apt-get install -y unzip ffmpeg syslog-ng
+
+# Murena apps
+RUN curl -sL ${CONTACTS_URL} | tar xzf - -C ${BASE_DIR}/custom_apps
+RUN curl -sL ${CALENDAR_URL} | tar xzf - -C ${BASE_DIR}/custom_apps
+RUN curl -sL ${THEME_HELPER_URL} | tar xzf - -C ${BASE_DIR}/custom_apps
+RUN curl -sL ${LAUNCHER_URL} | tar xzf - -C ${BASE_DIR}/custom_apps
+RUN curl -sL ${DASHBOARD_URL} | tar xzf - -C ${BASE_DIR}/custom_apps
+RUN curl -sL ${SNAPPY_URL} | tar xzf - -C ${BASE_DIR}/custom_apps
+RUN curl -sL ${OIDC_LOGIN_URL} | tar xzf - -C ${BASE_DIR}/custom_apps
+RUN curl -sL ${EA_URL} | tar xzf - -C ${BASE_DIR}/custom_apps
+RUN curl -sL ${EMAIL_RECOVERY_URL} | tar xzf - -C ${BASE_DIR}/custom_apps
+RUN curl -sL ${USER_MIGRATION_URL} | tar xzf - -C ${BASE_DIR}/custom_apps
+
+# External apps
+RUN curl -sL ${NOTES_URL} | tar xzf - -C ${BASE_DIR}/custom_apps
+RUN curl -sL ${MEMORIES_URL} | tar xzf - -C ${BASE_DIR}/custom_apps
+RUN curl -sL ${DROP_ACCOUNT_URL} | tar xzf - -C ${BASE_DIR}/custom_apps
+RUN curl -sL ${GOOGLE_INTEGRATION_URL} | tar xzf - -C ${BASE_DIR}/custom_apps
 
 # Fix snappymail icon
 #RUN sed -i 's/logo-white-64x64.png/app.svg/' ${BASE_DIR}/custom_apps/snappymail/appinfo/info.xml
@@ -96,24 +60,7 @@ RUN curl -fsSL -o user_migration.zip \
 #RUN sed -i "s/'additional'/null/" ${BASE_DIR}/custom_apps/snappymail/lib/Settings/PersonalSettings.php
 
 # Snappy theme
-#RUN curl -fsSL -o Murena-snappymail-theme.tar.gz \
-#  "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/snappymail-theme/-/archive/${SNAPPY_THEME_VERSION}/snappymail-theme-${SNAPPY_THEME_VERSION}.tar.gz" && \
-#  tar -xf Murena-snappymail-theme.tar.gz -C /tmp/ && \
-#  mkdir -p ${BASE_DIR}/themes/Murena && \
-#  mv /tmp/snappymail-theme-${SNAPPY_THEME_VERSION}/ ${BASE_DIR}/themes/Murena/snappymail && \
-#  chown -R www-data:www-data ${BASE_DIR}/themes/Murena/ && \
-#  rm -rf Murena-snappymail-theme.tar.gz
-
-RUN curl -fsSL -o memories.tar.gz \
-  "https://github.com/pulsejet/memories/releases/download/v${MEMORIES_VERSION}/memories.tar.gz" && \
-  tar -xf memories.tar.gz -C ${BASE_DIR}/custom_apps/ && \
-  rm memories.tar.gz;
-
-RUN curl -fsSL -o drop_account.tar.gz \
-  "https://packages.framasoft.org/projects/nextcloud-apps/drop-account/drop_account-${DROP_ACCOUNT_VERSION}.tar.gz" && \
-  tar -xf drop_account.tar.gz -C ${BASE_DIR}/custom_apps/ && \
-  rm drop_account.tar.gz;
-
+RUN curl -sL ${SNAPPY_THEME_VERSION} | tar xzf - -C ${BASE_DIR}/themes/Murena/
 
 
 # Remove unzip when unzipping is done
@@ -132,7 +79,7 @@ CMD ["php-fpm"]
 From nextcloud as selfhost
 ARG BASE_DIR="/usr/src/nextcloud"
 ARG TMP_PATCH_DIR="/tmp/build_patches"
-ARG THEME_VERSION="26.0.2"
+ARG THEME_VERSION="https://gitlab.e.foundation/api/v4/projects/315/packages/generic/eCloud/v26.0.2/eCloud-v26.0.2.tar.gz"
 #ARG USER_BACKEND_RAW_SQL_VERSION="2.0.1"
 ARG SELFHOST_THEME_VERSION="2.0.0"
 ARG IS_SELFHOST=true
@@ -149,7 +96,7 @@ RUN patch -u ${BASE_DIR}/lib/private/Authentication/Token/PublicKeyTokenProvider
 RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/014-add-mail-usage.patch
 RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/015-email-mail-template.patch
 RUN patch -u ${BASE_DIR}/core/Command/User/Setting.php -i ${TMP_PATCH_DIR}/018-occ-user-setting.patch
-RUN patch -u ${BASE_DIR}/apps/files/js/files.js -i ${TMP_PATCH_DIR}/021-repeated-storage-dialog-fix.patch
+#RUN patch -u ${BASE_DIR}/apps/files/js/files.js -i ${TMP_PATCH_DIR}/021-repeated-storage-dialog-fix.patch
 RUN cd ${BASE_DIR} && patch -u ${BASE_DIR}/3rdparty/sabre/vobject/lib/ITip/Broker.php -i ${TMP_PATCH_DIR}/022-significantchange.patch
 RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/026-primary-color-fix.patch
 RUN patch -u ${BASE_DIR}/lib/private/Template/JSResourceLocator.php -i ${TMP_PATCH_DIR}/031-theme-custom-app-translations.patch
@@ -160,12 +107,8 @@ RUN cd ${BASE_DIR} && patch -p1 < ${TMP_PATCH_DIR}/036-user-config-change-event.
 RUN rm -rf ${TMP_PATCH_DIR}
 
 # Custom theme
-RUN curl -fsSL -o eCloud-theme.tar.gz \
-  "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/nextcloud-theme/-/archive/${THEME_VERSION}/nextcloud-theme-${THEME_VERSION}.tar.gz" && \
-  tar -xf eCloud-theme.tar.gz -C /tmp/ && \
-  mv /tmp/nextcloud-theme-${THEME_VERSION}/ ${BASE_DIR}/themes/eCloud && \
-  chown -R www-data:www-data ${BASE_DIR}/themes/eCloud/ && \
-  rm -rf eCloud-theme.tar.gz ${BASE_DIR}/themes/example/
+RUN curl -sL ${THEME_VERSION} | tar xzf - -C ${BASE_DIR}/themes
+
 
 # User Backend
 #RUN curl -fsSL -o user_backend_sql_raw.tar.gz \
@@ -198,16 +141,16 @@ RUN sed -i 's/this.appLimit=e/this.appLimit=this.appList.length/' ${BASE_DIR}/di
 
 # Fix total quota value for users in settings and files
 RUN sed -i "s/'total'/'quota'/" ${BASE_DIR}/apps/settings/lib/Settings/Personal/PersonalInfo.php
-RUN sed -i "s/\['total'\]/\['quota'\]/" ${BASE_DIR}/apps/provisioning_api/lib/Controller/AUserData.php
+RUN sed -i "s/\['total'\]/\['quota'\]/" ${BASE_DIR}/apps/provisioning_api/lib/Controller/AUserDataOCSController.php
 
-# Fix API call in files script
-RUN sed -i "s/ajax\/getstoragestats/api\/v1\/stats/g" ${BASE_DIR}/apps/files/js/files.js
+# Fix API call in files script -Not needed in NC 31
+#RUN sed -i "s/ajax\/getstoragestats/api\/v1\/stats/g" ${BASE_DIR}/apps/files/js/files.js
 
 From selfhost as ecloud
 ARG BASE_DIR="/usr/src/nextcloud"
 ARG TMP_PATCH_DIR="/tmp/build_patches"
-ARG THEME_VERSION="v30.0.1"
-ARG LDAP_WRITE_SUPPORT_VERSION="1.12.1"
+ARG THEME_VERSION="https://gitlab.e.foundation/api/v4/projects/315/packages/generic/eCloud/v30.0.3/eCloud-v30.0.3.tar.gz"
+ARG LDAP_WRITE_SUPPORT_VERSION="1.13.0"
 ARG IS_SELFHOST=false
 
 RUN curl -fsSL -o ldap_write_support.tar.gz \
@@ -222,14 +165,16 @@ RUN patch -u ${BASE_DIR}/core/Controller/ContactsMenuController.php -i ${TMP_PAT
 RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/005-autocomplete-user-leak-core.patch
 RUN patch -u ${BASE_DIR}/core/templates/layout.guest.php -i ${TMP_PATCH_DIR}/016-login-screen.patch
 RUN patch -u ${BASE_DIR}/lib/private/Notification/Manager.php -i ${TMP_PATCH_DIR}/020-fairuse-notification-fix.patch
-RUN cd ${BASE_DIR} && patch -u ${BASE_DIR}/apps/user_ldap/lib/User_LDAP.php -i ${TMP_PATCH_DIR}/023-ldap-check-pwd-optimization.patch
+#RUN cd ${BASE_DIR} && patch -u ${BASE_DIR}/apps/user_ldap/lib/User_LDAP.php -i ${TMP_PATCH_DIR}/023-ldap-check-pwd-optimization.patch - already added in nc31
 RUN patch -u ${BASE_DIR}/lib/private/User/Manager.php -i ${TMP_PATCH_DIR}/025-optimize-get-by-email.patch
 RUN patch -u ${BASE_DIR}/apps/dav/lib/Connector/Sabre/Principal.php -i ${TMP_PATCH_DIR}/027-displayname-user-leak-dav.patch
 RUN patch -u ${BASE_DIR}/apps/dav/lib/HookManager.php -i ${TMP_PATCH_DIR}/028-default-task-calendar.patch
 RUN patch -u ${BASE_DIR}/apps/provisioning_api/lib/Controller/UsersController.php -i ${TMP_PATCH_DIR}/029-restrict-user-to-change-primary-email.patch
 RUN patch -u ${BASE_DIR}/lib/private/Security/VerificationToken/VerificationToken.php -i ${TMP_PATCH_DIR}/033-verification-token-private.patch
 RUN patch -u ${BASE_DIR}/lib/private/AppFramework/Middleware/Security/CORSMiddleware.php -i ${TMP_PATCH_DIR}/034-oidc-bearer-token-auth.patch
-
+RUN patch -u ${BASE_DIR}/custom_apps/snappymail/app/snappymail/v/2.38.2+murena-20250822/app/libraries/RainLoop/Actions/Contacts.php -i ${TMP_PATCH_DIR}/037-snappymail-contact.patch
+#Below patch will be removed after NC 31
+RUN patch -u ${BASE_DIR}/lib/private/App/AppManager.php -i ${TMP_PATCH_DIR}/038-add-hyphen-to-appid.patch
 RUN rm -rf ${TMP_PATCH_DIR}
 
 
@@ -243,7 +188,7 @@ RUN sed -i 's/$this->getAvatarImage($user)/null/' ${BASE_DIR}/apps/dav/lib/CardD
 # RUN cd ${BASE_DIR}/dist && sed -i 's/resetPassword:!1/resetPassword:!1||Z.showResetPassword==="1"/' core-login.js
 
 # add attr about how many notifications to notif icon
-RUN sed -i 's/attrs:{id:"notifications",/attrs:{id:"notifications","data-has-notifications":0!==u.notifications.length,/' ${BASE_DIR}/apps/notifications/js/NotificationsApp-DS2Cdf60.chunk.mjs
+RUN sed -i 's/attrs:{id:"notifications",/attrs:{id:"notifications","data-has-notifications":0!==u.notifications.length,/' ${BASE_DIR}/apps/notifications/js/NotificationsApp-BLfRaKfb.chunk.mjs 
 
 # Rename Memories to Gallery
 RUN sed -i 's/<name>Memories<\/name>/<name>Gallery<\/name>/g' ${BASE_DIR}/custom_apps/memories/appinfo/info.xml
@@ -279,13 +224,7 @@ RUN sed -i 's/{attrs:{name:t.t("theming","Navigation bar settings")}}/{staticCla
 
 
 # Custom theme
-RUN rm -rf ${BASE_DIR}/themes/eCloud && \
-  curl -fsSL -o eCloud-theme.tar.gz \
-  "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/nextcloud-theme/-/archive/${THEME_VERSION}/nextcloud-theme-${THEME_VERSION}.tar.gz" && \
-  tar -xf eCloud-theme.tar.gz -C /tmp/ && \
-  mv /tmp/nextcloud-theme-${THEME_VERSION}/ ${BASE_DIR}/themes/eCloud && \
-  chown -R www-data:www-data ${BASE_DIR}/themes/eCloud/ && \
-  rm -rf eCloud-theme.tar.gz ${BASE_DIR}/themes/example/
+RUN curl -sL ${THEME_VERSION} | tar xzf - -C ${BASE_DIR}/themes
 
 # Remove Selfhost theme
 RUN if [ "$IS_SELFHOST" = false ]; then \
diff --git a/custom_entrypoint.sh b/custom_entrypoint.sh
index 7cbfde62130376847d86ac5a26e93059548fbcae..08fc883505932482bb1e657f5c687452154da884 100644
--- a/custom_entrypoint.sh
+++ b/custom_entrypoint.sh
@@ -29,7 +29,7 @@ if version_greater "$image_version" "$installed_version"; then
     rsync $rsync_options --include "/integration_google/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/
     rsync $rsync_options --include "/ldap_write_support/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/
     rsync $rsync_options --include "/murena-dashboard/" --exclude '/*' $SRC_DIR/custom_apps/ /$DST_DIR/custom_apps/
-    #rsync $rsync_options --include "/snappymail/" --exclude '/*' $SRC_DIR/custom_apps/ /$DST_DIR/custom_apps/
+    rsync $rsync_options --include "/snappymail/" --exclude '/*' $SRC_DIR/custom_apps/ /$DST_DIR/custom_apps/
     rsync $rsync_options --include "/eCloud/" --exclude '/*' $SRC_DIR/themes/ $DST_DIR/themes/
     rsync $rsync_options --include "/Murena/" --exclude '/*' $SRC_DIR/themes/ $DST_DIR/themes/
     rsync $rsync_options --include "/memories/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/
diff --git a/patches/014-add-mail-usage.patch b/patches/014-add-mail-usage.patch
index 4418b3e15bc2307765220dfab542671e00c3ccc0..a8bf3a1d113bd5017c6d24fbd65ab36c071f3b1e 100644
--- a/patches/014-add-mail-usage.patch
+++ b/patches/014-add-mail-usage.patch
@@ -1,22 +1,24 @@
 --- lib/private/legacy/OC_Helper.php	2025-05-25 16:00:00.880495300 +0530
 +++ lib/private/legacy/OC_Helper-new.php	2025-05-25 16:02:00.970495300 +0530
-@@ -512,6 +512,12 @@
+@@ -512,6 +512,13 @@
  		}
  		try {
  			$free = $sourceStorage->free_space($rootInfo->getInternalPath());
-+			$ownerId = $storage->getOwner($path);
-+			$mailQuotaUsage = (int) \OC::$server->getConfig()->getUserValue($ownerId, 'ecloud-accounts', 'mailQuotaUsage', 0);
-+			$free = max(0, $free - $mailQuotaUsage);
-+			if($path === '/') {
-+				$used = $used + $mailQuotaUsage;
-+			}
++            $ownerId = $storage->getOwner($path);
++            $mailQuotaUsage = (int) \OC::$server->getConfig()->getUserValue($ownerId, 'ecloud-accounts', 'mailQuotaUsage', 0);
++            $free = max(0, $free - $mailQuotaUsage);
++            if ($path === '/') {
++                $used = $used + $mailQuotaUsage;
++            }
++
  			if (is_bool($free)) {
  				$free = 0.0;
  			}
-@@ -547,7 +553,6 @@
+@@ -547,7 +554,6 @@
  		 */
  		$isRemoteShare = $storage->instanceOfStorage(\OCA\Files_Sharing\External\Storage::class);
  
 -		$ownerId = $storage->getOwner($path);
- 		$hasOwnerId = $ownerId !== false && $ownerId !== null;
- 		$ownerDisplayName = '';
\ No newline at end of file
+ 		$ownerDisplayName = '';
+ 
+ 		if ($isRemoteShare === false && $ownerId !== false) {
\ No newline at end of file
diff --git a/patches/016-login-screen.patch b/patches/016-login-screen.patch
index d7d7b98af69044bcd7a358fdd9ef4d765aa7e3ab..79414a44a74476003a553309265fcef67ddab40c 100644
--- a/patches/016-login-screen.patch
+++ b/patches/016-login-screen.patch
@@ -1,5 +1,5 @@
---- layout.guest.php	2025-07-24 10:37:50
-+++ layout.guest-new.php	2025-07-24 10:58:20
+--- layout.guest.php	2025-10-10 12:39:23
++++ layout.guest-new.php	2025-10-10 12:53:43
 @@ -32,6 +32,7 @@
  		<link rel="mask-icon" sizes="any" href="<?php print_unescaped(image_path('core', 'favicon-mask.svg')); ?>" color="<?php p($theme->getColorPrimary()); ?>">
  		<link rel="manifest" href="<?php print_unescaped(image_path('core', 'manifest.json')); ?>" crossorigin="use-credentials">
@@ -8,63 +8,68 @@
  		<?php emit_script_loading_tags($_); ?>
  		<?php print_unescaped($_['headers']); ?>
  	</head>
-@@ -42,10 +43,38 @@
+@@ -42,10 +43,37 @@
  		<?php include 'layout.initial-state.php'; ?>
  		<div class="wrapper">
  			<div class="v-align">
 +				<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">
++				<?php if (array_key_exists("alt_login",$_)) { ?>
++					<div class="banner-right-align">
++						<div class="lines">
++						</div>
++						<div class="banner-content">
++							<div class="banner-content-get-free-murena"><p><?php p($l->t('Get your FREE Murena Workspace account now')); ?></p></div>
++							<div class="banner-content-why-murena">
++								<ol>
++									<li><?php p($l->t('1GB storage for FREE to store and sync your pictures & videos.')); ?></li>
++									<li><?php p($l->t('Edit your documents online.')); ?></li>
++									<li><?php p($l->t('Your unique email address @murena.io')); ?></li>
++									<li><?php p($l->t('Sync calendar and contacts with the cloud')); ?></li>
++									<li><?php p($l->t('and many new features added regularly!')); ?></li>
++								</ol>
 +							</div>
-+							<div class="banner-content">
-+								<div class="banner-content-get-free-murena"><p><?php p($l->t('Get your FREE Murena Workspace account now')); ?></p></div>
-+								<div class="banner-content-why-murena">
-+									<ol>
-+										<li><?php p($l->t('1GB storage for FREE to store and sync your pictures & videos.')); ?></li>
-+										<li><?php p($l->t('Edit your documents online.')); ?></li>
-+										<li><?php p($l->t('Your unique email address @murena.io')); ?></li>
-+										<li><?php p($l->t('Sync calendar and contacts with the cloud')); ?></li>
-+										<li><?php p($l->t('and many new features added regularly!')); ?></li>
-+									</ol>
-+								</div>
-+								<div class="banner-content-create-button">
-+									<a href="/signup" ><?php p($l->t('Create My Account')); ?></a>
-+								</div>
++							<div class="banner-content-create-button">
++								<a href="/signup" ><?php p($l->t('Create My Account')); ?></a>
 +							</div>
 +						</div>
-+					<?php } ?>
++					</div>
++				<?php } ?>
 +			<div class="v-align <?= (!array_key_exists("alt_login",$_)) ? 'warning-messsage':'' ?>">
  				<?php if ($_['bodyid'] === 'body-login'): ?>
  					<header>
  						<div id="header">
  							<div class="logo"></div>
-+							<?php if (array_key_exists("alt_login",$_)) { ?>
++							<?php if (array_key_exists("alt_login", $_)) { ?>
 +								<div class="sign-in-label sign-label"><?php p($l->t('Sign in to your account')); ?></div>
 +								<div class="sign-in-label fp-label" style="display: none"><?php p($l->t('Forgot Password')); ?></div>
 +							<?php } ?>
-+
  						</div>
  					</header>
  				<?php endif; ?>
-@@ -54,18 +83,24 @@
+@@ -54,18 +82,30 @@
  						<?php p($theme->getName()); ?>
  					</h1>
  					<?php print_unescaped($_['content']); ?>
-+					<?php if (array_key_exists("alt_login",$_)) { ?>
++					<?php if (array_key_exists("alt_login", $_)) { ?>
 +						<div class="have-an-account">
-+							<div class="createaccdesk"><?php p($l->t('Don\'t have an account yet?')); ?> <a href="/signup"><?php p($l->t('Create an account')); ?></a></div>
-+							<div class="createaccmob"><p><?php p($l->t('Don\'t have an account yet?')); ?></p> <p> <a href="/signup"><?php p($l->t('Create an account')); ?></a></p></div>
++							<div class="createaccdesk">
++								<?php p($l->t('Don\'t have an account yet?')); ?>
++								<a href="/signup"><?php p($l->t('Create an account')); ?></a>
++							</div>
++							<div class="createaccmob">
++								<p><?php p($l->t('Don\'t have an account yet?')); ?></p>
++								<p><a href="/signup"><?php p($l->t('Create an account')); ?></a></p>
++							</div>
 +						</div>
 +					<?php } ?>
- 				</main>
-+				<footer role="contentinfo" class="<?= (!array_key_exists("alt_login",$_)) ? 'forgotpass-footer':'' ?>">
+ 				</div>
++				<footer role="contentinfo" class="<?= (!array_key_exists("alt_login", $_)) ? 'forgotpass-footer' : '' ?>">
 +					<p class="info">
 +						<?php print_unescaped($theme->getLongFooter()); ?>
 +					</p>
 +				</footer>
  			</div>
-+			<footer role="contentinfo" class="<?= (!array_key_exists("alt_login",$_)) ? 'forgotpass-footer':'' ?>">
++			<footer role="contentinfo" class="<?= (!array_key_exists("alt_login", $_)) ? 'forgotpass-footer' : '' ?>">
 +				<p class="info">
 +					<?php print_unescaped($theme->getLongFooter()); ?>
 +				</p>
diff --git a/patches/023-ldap-check-pwd-optimization.patch b/patches/023-ldap-check-pwd-optimization.patch
deleted file mode 100644
index bda40f8b91b9c1d3ff93f105315dc7de8a0e68b9..0000000000000000000000000000000000000000
--- a/patches/023-ldap-check-pwd-optimization.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From: Akhil <akhil@e.email>
-Date: Wed, 04 Jan 2023 16:24 +0530
-Subject: [PATCH] This patch optimize the ldap checkPassword function to reduce number of LDAP binds and SQL UPDATE operations per password check
-
---- ./apps/user_ldap/lib/User_LDAP.php	2023-01-04 16:20:02.747181606 +0530
-+++ ./apps/user_ldap/lib/User_LDAP-new.php	2023-01-17 19:22:51.776857415 +0530
-@@ -76,11 +76,12 @@
- 	 * @return string|false
- 	 * @throws \Exception
- 	 */
--	public function loginName2UserName($loginName) {
-+	public function loginName2UserName($loginName, bool $forceLdapRefetch = false) {
- 		$cacheKey = 'loginName2UserName-' . $loginName;
- 		$username = $this->access->connection->getFromCache($cacheKey);
- 
--		if ($username !== null) {
-+		$ignoreCache = ($username === false && $forceLdapRefetch);
-+		if ($username !== null && !$ignoreCache) {
- 			return $username;
- 		}
- 
-@@ -96,6 +97,9 @@
- 			}
- 			$username = $user->getUsername();
- 			$this->access->connection->writeToCache($cacheKey, $username);
-+			if($forceLdapRefetch) {
-+				$user->processAttributes($ldapRecord);
-+			}
- 			return $username;
- 		} catch (NotOnLDAP $e) {
- 			$this->access->connection->writeToCache($cacheKey, false);
-@@ -142,16 +146,11 @@
- 	 * @return false|string
- 	 */
- 	public function checkPassword($uid, $password) {
--		try {
--			$ldapRecord = $this->getLDAPUserByLoginName($uid);
--		} catch (NotOnLDAP $e) {
--			$this->logger->debug(
--				$e->getMessage(),
--				['app' => 'user_ldap', 'exception' => $e]
--			);
-+		$username = $this->loginName2UserName($uid, true);
-+		if(!$username) {
- 			return false;
- 		}
--		$dn = $ldapRecord['dn'][0];
-+		$dn = $this->access->username2dn($username);
- 		$user = $this->access->userManager->get($dn);
- 
- 		if (!$user instanceof User) {
-@@ -164,7 +163,6 @@
- 			}
- 
- 			$this->access->cacheUserExists($user->getUsername());
--			$user->processAttributes($ldapRecord);
- 			$user->markLogin();
- 
- 			return $user->getUsername();
diff --git a/patches/031-theme-custom-app-translations.patch b/patches/031-theme-custom-app-translations.patch
index dd9bb2745065dcc9f4df1c96b4e40f0e6b02cb51..f8d3f3650897bfa44eddfd00243f77cc483be305 100644
--- a/patches/031-theme-custom-app-translations.patch
+++ b/patches/031-theme-custom-app-translations.patch
@@ -10,11 +10,12 @@
  			// For language files we try to load them all, so themes can overwrite
 @@ -57,7 +58,7 @@
  			$found += $this->appendScriptIfExist($this->serverroot, $script);
- 			$found += $this->appendScriptIfExist($this->serverroot, $theme_dir.$script);
+ 			$found += $this->appendScriptIfExist($this->serverroot, $theme_dir . $script);
  			$found += $this->appendScriptIfExist($appRoot, $script, $appWebRoot);
--			$found += $this->appendScriptIfExist($this->serverroot, $theme_dir.'apps/'.$script);
+-			$found += $this->appendScriptIfExist($this->serverroot, $theme_dir . 'apps/' . $script);
 +			$found += $this->appendScriptIfExist($this->serverroot, $theme_dir.$appDirName.'/'.$script);
  
  			if ($found) {
  				return;
 
+
diff --git a/patches/036-user-config-change-event.patch b/patches/036-user-config-change-event.patch
index c49c0e2e2f3ca6afecfda645d08b80deb3420973..0169edc66a072b61a51fb349d6be4704a4ca4d1a 100644
--- a/patches/036-user-config-change-event.patch
+++ b/patches/036-user-config-change-event.patch
@@ -1,41 +1,40 @@
 --- ./lib/private/AllConfig.php	2024-03-28 01:02:39
 +++ ./lib/private/AllConfig-new.php	2024-04-15 16:36:23
-@@ -12,6 +12,8 @@
+@@ -14,7 +14,10 @@
  use OCP\IConfig;
  use OCP\IDBConnection;
  use OCP\PreConditionNotMetException;
 +use OCP\EventDispatcher\IEventDispatcher;
 +use OCP\User\Events\UserConfigChangedEvent;
  
++
  /**
   * Class to combine all the configuration options ownCloud offers
-@@ -257,6 +259,8 @@
- 				$qb->executeStatement();
- 
- 				$this->userCache[$userId][$appName][$key] = (string) $value;
-+				$this->triggerUserValueChange($userId, $appName, $key, $value, $prevValue);
-+
- 				return;
+  */
+@@ -252,9 +255,18 @@
+ 			} catch (TypeConflictException) {
  			}
  		}
-@@ -282,6 +286,14 @@
- 				$this->userCache[$userId][$appName] = [];
- 			}
- 			$this->userCache[$userId][$appName][$key] = (string) $value;
-+		}
+-
++		$prevValue = $this->getUserValue($userId, $appName, $key, null);
+ 		$userPreferences->setValueMixed($userId, $appName, $key, (string)$value);
 +		$this->triggerUserValueChange($userId, $appName, $key, $value, $prevValue);
-+	}
-+	
+ 	}
++
 +	private function triggerUserValueChange($userId, $appId, $key, $value, $oldValue = null) {
 +		if (\OC::$server instanceof \OCP\IServerContainer) {
 +			$dispatcher = \OC::$server->get(IEventDispatcher::class);
 +			$dispatcher->dispatchTyped(new UserConfigChangedEvent($userId, $appId, $key, $value, $oldValue));
- 		}
- 	}
++		}
++	}
++
+ 
+ 	/**
+ 	 * Getting a user defined value
 
 --- ./lib/composer/composer/autoload_static.php	2024-03-28 01:02:39
 +++ ./lib/composer/composer/autoload_static-new.php	2024-04-15 16:34:18
-@@ -903,6 +903,7 @@
+@@ -982,6 +982,7 @@
          'OCP\\User\\Events\\PasswordUpdatedEvent' => __DIR__ . '/../../..' . '/lib/public/User/Events/PasswordUpdatedEvent.php',
          'OCP\\User\\Events\\PostLoginEvent' => __DIR__ . '/../../..' . '/lib/public/User/Events/PostLoginEvent.php',
          'OCP\\User\\Events\\UserChangedEvent' => __DIR__ . '/../../..' . '/lib/public/User/Events/UserChangedEvent.php',
@@ -46,7 +45,7 @@
 
 --- ./lib/composer/composer/autoload_classmap.php	2024-03-28 01:02:39
 +++ ./lib/composer/composer/autoload_classmap-new.php	2024-04-15 16:33:19
-@@ -877,6 +877,7 @@
+@@ -942,6 +942,7 @@
      'OCP\\User\\Events\\UserLoggedInEvent' => $baseDir . '/lib/public/User/Events/UserLoggedInEvent.php',
      'OCP\\User\\Events\\UserLoggedInWithCookieEvent' => $baseDir . '/lib/public/User/Events/UserLoggedInWithCookieEvent.php',
      'OCP\\User\\Events\\UserLoggedOutEvent' => $baseDir . '/lib/public/User/Events/UserLoggedOutEvent.php',
diff --git a/patches/037-snappymail-contact.patch b/patches/037-snappymail-contact.patch
new file mode 100644
index 0000000000000000000000000000000000000000..b9f8f2608532c8fe2d56d2b6c3ebd8c0551da0cf
--- /dev/null
+++ b/patches/037-snappymail-contact.patch
@@ -0,0 +1,23 @@
+--- ./custom_apps/snappymail/app/snappymail/v/2.38.2/app/libraries/RainLoop/Actions/Contacts.php	2024-03-28 01:02:39
++++ ./custom_apps/snappymail/app/snappymail/v/2.38.2/app/libraries/RainLoop/Actions/Contacts-new.php	2024-04-15 16:36:23
+@@ -227,7 +227,11 @@
+ 		if (!empty($sData)) {
+ 			$aData = \json_decode($sData, true);
+ 			if ($aData) {
+-				if ($aData['Password']) {
++				// as remote-sync is didsabled for us (murena workspace), we ignore all remote sync password setup
++				$aData['Password'] = '';
++				$aData['PasswordHMAC'] = null;
++				$aData['Mode'] = 0;
++				/* if ($aData['Password']) {
+ 					$oMainAccount = $this->getMainAccountFromToken();
+ 					// Verify oAccount password hasn't changed so that Password can be decrypted
+ 					if ($aData['PasswordHMAC'] !== \hash_hmac('sha1', $aData['Password'], $oMainAccount->CryptKey())) {
+@@ -243,7 +247,7 @@
+ 				}
+ 				if (!isset($aData['Mode'])) {
+ 					$aData['Mode'] = empty($aData['Enable']) ? 0 : 1;
+-				}
++				} */
+ 				return $aData;
+ 			}
\ No newline at end of file
diff --git a/patches/038-add-hyphen-to-appid.patch b/patches/038-add-hyphen-to-appid.patch
new file mode 100644
index 0000000000000000000000000000000000000000..72e715390005d21acc88744326063731ddb40538
--- /dev/null
+++ b/patches/038-add-hyphen-to-appid.patch
@@ -0,0 +1,17 @@
+From: Avinash <avinashg@e.email>
+Date: Mon, 13 Oct 2025 17:30 +0530
+Subject: [PATCH] Added Hyphen to AppId NC31
+
+Add Hyphen to App id for NC 31 and In NC 32 - this patch will be deleted.
+
+--- AppManager.php	2025-10-13 18:34:14
++++ AppManager-new.php	2025-10-13 18:34:56
+@@ -945,6 +945,6 @@
+ 	 */
+ 	public function cleanAppId(string $app): string {
+ 		/* Only lowercase alphanumeric is allowed */
+-		return preg_replace('/(^[0-9_]|[^a-z0-9_]+|_$)/', '', $app);
++		return preg_replace('/(^[0-9_-]+|[^a-z0-9_-]+|[_-]+$)/', '', $app);
+ 	}
+ }
+\ No newline at end of file