diff --git a/Dockerfile b/Dockerfile
index 238cb041e7a840d8d88dacc77f09568d52ba7db4..b9e6028f14ffc8b6570afbe0582a0a45b65158de 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,21 +1,21 @@
-FROM nextcloud:25.0.6-fpm AS nextcloud
+FROM nextcloud:25.0.8-fpm AS nextcloud
 ARG BASE_DIR="/usr/src/nextcloud"
 ARG TMP_PATCH_DIR="/tmp/build_patches"
-ARG THEME_HELPER_JOB_ID="583519"
-ARG NOTES_VERSION="4.7.2"
-ARG CONTACTS_JOB_ID="582012"
-ARG CALENDAR_JOB_ID="582001"
+ARG THEME_HELPER_JOB_ID="635069"
+ARG NOTES_VERSION="4.8.0"
+ARG CONTACTS_JOB_ID="620997"
+ARG CALENDAR_JOB_ID="628427"
 ARG EMAIL_RECOVERY_JOB_ID="582038"
-ARG EA_JOB_ID="582028"
-ARG LAUNCHER_JOB_ID="582666"
+ARG EA_JOB_ID="625302"
+ARG LAUNCHER_JOB_ID="616075"
 ARG GOOGLE_INTEGRATION_VERSION="1.0.9"
-ARG DASHBOARD_JOB_ID="582062"
+ARG DASHBOARD_JOB_ID="616067"
 ARG SNAPPY_VERSION="2.27.2"
-ARG SNAPPY_THEME_VERSION="2.0.0"
+ARG SNAPPY_THEME_VERSION="2.0.7"
 ARG USER_MIGRATION_JOB_ID="608716"
 ARG MEMORIES_VERSION="5.1.0"
 
-RUN sed -i 's/25,0,6,1/25,0,6,6/' ${BASE_DIR}/version.php
+RUN sed -i 's/25,0,8,2/25,0,8,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
@@ -177,9 +177,9 @@ RUN sed -i "s/\['total'\]/\['quota'\]/" ${BASE_DIR}/apps/provisioning_api/lib/Co
 From selfhost as ecloud
 ARG BASE_DIR="/usr/src/nextcloud"
 ARG TMP_PATCH_DIR="/tmp/build_patches"
-ARG THEME_VERSION="25.0.6"
+ARG THEME_VERSION="25.0.12"
 ARG LDAP_WRITE_SUPPORT_VERSION="1.7.0"
-ARG OIDC_LOGIN_VERSION="2.5.1"
+ARG OIDC_LOGIN_VERSION="2.6.0"
 
 # Patches
 COPY patches/ ${TMP_PATCH_DIR}/
@@ -225,6 +225,9 @@ RUN sed -i 's/{name:"archive",icon:la,title:(0,be.Iu)("memories","Archive")},//g
 RUN cd ${BASE_DIR}/custom_apps/contacts && sed -i 's/"GROUP","INDIVIDUAL"/"INDIVIDUAL"/g' js/contacts-main.js
 RUN cd ${BASE_DIR}/custom_apps/calendar && sed -i 's/"GROUP","INDIVIDUAL"/"INDIVIDUAL"/g' js/calendar-main.js
 RUN cd ${BASE_DIR}/custom_apps/calendar && sed -i 's/{name:\[o,"displayname"\]},//' js/calendar-main.js
+RUN cd ${BASE_DIR}/custom_apps/notes && sed -i 's/<step>OCA\\Notes\\Migration\\EditorHint<\/step>//g' appinfo/info.xml
+RUN cd ${BASE_DIR}/apps/theming && sed -i 's/<step>OCA\\Theming\\Migration\\MigrateUserConfig<\/step>//g' appinfo/info.xml
+
 
 # Remove colored background from email template logo
 RUN sed -i 's/$this->header, \[$this->themingDefaults->getColorPrimary()/$this->header, \["none"/' ${BASE_DIR}/lib/private/Mail/EMailTemplate.php