diff --git a/.github/workflows/easycloud-build.yml b/.github/workflows/easycloud-build.yml
index 75890fb66dd85..2964152509581 100644
--- a/.github/workflows/easycloud-build.yml
+++ b/.github/workflows/easycloud-build.yml
@@ -1,7 +1,7 @@
 name: EasyCloud Build
 
 # The EasyCloud source is packaged as a container image.
-# This is a workaround because releases can not be created without tags 
+# This is a workaround because releases can not be created without tags
 # and we want to be able to create snapshots from branches.
 
 on:
@@ -46,6 +46,31 @@ jobs:
         with:
           submodules: true
 
+      - name: Set up node with version from package.json's engines
+        uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
+        with:
+          node-version-file: "package.json"
+
+      - name: Install dependencies & build simplesettings app
+        env:
+          CYPRESS_INSTALL_BINARY: 0
+          PUPPETEER_SKIP_DOWNLOAD: true
+        run: |
+          cd apps-custom/simplesettings
+          npm ci
+          npm run build
+          cd ../..
+
+      - name: Install dependencies & build user_oidc app
+        env:
+          CYPRESS_INSTALL_BINARY: 0
+          PUPPETEER_SKIP_DOWNLOAD: true
+        run: |
+          cd apps-external/user_oidc
+          npm ci
+          npm run build
+          cd ../..
+
       - name: Zip dependencies
         run: |
           buildDate=$(date +%s)
@@ -89,7 +114,11 @@ jobs:
             version.json  \
           -x "apps/theming/img/background/**" \
           -x "apps/*/tests/**" \
-          -x "apps-external/*/tests**" \
+          -x "apps-*/*/.git" \
+          -x "apps-*/*/.github" \
+          -x "apps-*/*/src**" \
+          -x "apps-*/*/node_modules**" \
+          -x "apps-*/*/tests**" \
           -x "**/cypress/**" \
           -x "*.git*" \
           -x "*.editorconfig*"
diff --git a/.gitignore b/.gitignore
index 95e3a66756453..941885efa2a83 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,6 +50,7 @@
 /apps/files_external/tests/config.*.php
 # IONOS: this should not be upsteamed!
 !/apps-external/viewer
+!/apps-external/user_oidc
 !/apps-custom/*
 
 # apps modules
diff --git a/.gitmodules b/.gitmodules
index 16861b2f9fe6b..1809970b9b5d7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,3 +13,6 @@
 [submodule "apps-custom/simplesettings"]
 	path = apps-custom/simplesettings
 	url = git@github.com:IONOS-Productivity/nc-simplesettings.git
+[submodule "apps-external/user_oidc"]
+	path = apps-external/user_oidc
+	url = https://github.com/nextcloud/user_oidc.git
diff --git a/IONOS b/IONOS
index 737dc0b163d2e..93ce4f86a9722 160000
--- a/IONOS
+++ b/IONOS
@@ -1 +1 @@
-Subproject commit 737dc0b163d2e95d99e94b4b3c17cd2a987f2e80
+Subproject commit 93ce4f86a9722b2a9acbcf5aaa12ed6cefc92b00
diff --git a/apps-custom/simplesettings b/apps-custom/simplesettings
index 085a81e7fafc7..9f367f0d31cd4 160000
--- a/apps-custom/simplesettings
+++ b/apps-custom/simplesettings
@@ -1 +1 @@
-Subproject commit 085a81e7fafc72ca69690a8b7d8efeb5adbc0931
+Subproject commit 9f367f0d31cd4c6605ba335842d144725e063f96
diff --git a/apps-external/user_oidc b/apps-external/user_oidc
new file mode 160000
index 0000000000000..eaec3bbcb6d57
--- /dev/null
+++ b/apps-external/user_oidc
@@ -0,0 +1 @@
+Subproject commit eaec3bbcb6d57c96250738ea01e25ba34ab88546
diff --git a/package.json b/package.json
index 96563b47050d5..c8d4b59da1d40 100644
--- a/package.json
+++ b/package.json
@@ -194,8 +194,8 @@
     "extends @nextcloud/browserslist-config"
   ],
   "engines": {
-    "node": "^20.0.0",
-    "npm": "^10.0.0"
+    "node": "^20.15.0",
+    "npm": "^10.7.0"
   },
   "overrides": {
     "colors": "1.4.0"