diff --git a/.github/workflows/build-artifact.yml b/.github/workflows/build-artifact.yml
index ec4b7d7a72281..9729316d9c11f 100644
--- a/.github/workflows/build-artifact.yml
+++ b/.github/workflows/build-artifact.yml
@@ -78,6 +78,13 @@ jobs:
               "has_npm": false,
               "has_composer": true,
               "makefile_target": "build_files_antivirus_app"
+            },
+            {
+              "name": "notify_push",
+              "path": "apps-external/notify_push",
+              "has_npm": false,
+              "has_composer": true,
+              "makefile_target": "build_notify_push_app"
             }
           ]'
 
@@ -165,23 +172,44 @@ jobs:
           submodules: true
           fetch-depth: '1'
 
-      - name: Download richdocuments app
+      - name: Download build external apps
         uses: actions/download-artifact@v5
         with:
-          name: external-app-build-richdocuments
-          path: apps-external/richdocuments
+          pattern: external-app-build-*
+          path: apps-external/
 
-      - name: Download viewer app
-        uses: actions/download-artifact@v5
-        with:
-          name: external-app-build-viewer
-          path: apps-external/viewer
+      - name: Reorganize downloaded apps-external artifacts
+        run: |
+          cd apps-external/
+
+          echo "Initial structure:"
+          ls -la
+
+          # Move contents from external-app-build-* directories to their target directories
+          for artifact_dir in external-app-build-*; do
+            if [ -d "$artifact_dir" ]; then
+              # Extract app name from artifact directory name
+              app_name=${artifact_dir#external-app-build-}
+
+              echo "Processing artifact: $artifact_dir -> $app_name"
+
+              # If target directory exists, merge the contents from the artifact directory containing build artifacts
+              if [ -d "$app_name" ]; then
+                echo "Target directory $app_name exists, merging contents from $artifact_dir"
+                # Copy contents from artifact directory to target directory
+                cp -r "$artifact_dir"/* "$app_name"/
+                # Remove the now-empty artifact directory
+                rm -rf "$artifact_dir"
+              else
+                # Move the artifact directory to the proper app name
+                echo "Moving $artifact_dir to $app_name"
+                mv "$artifact_dir" "$app_name"
+              fi
+            fi
+          done
 
-      - name: Download contacts app
-        uses: actions/download-artifact@v5
-        with:
-          name: external-app-build-contacts
-          path: apps-external/contacts
+          echo "Reorganization complete. Final structure:"
+          ls -la
 
       - name: Verify downloaded artifacts structure
         run: |
@@ -306,7 +334,7 @@ jobs:
           fi
 
       - name: Download artifact zip
-        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
+        uses: actions/download-artifact@v5
         with:
           name: nextcloud_workspace_build_artifact
 
@@ -372,7 +400,7 @@ jobs:
 
     steps:
       - name: Download artifact zip
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: nextcloud_workspace_build_artifact
 
diff --git a/.gitmodules b/.gitmodules
index 841953a853cf1..2d07ef262b146 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -19,3 +19,6 @@
 [submodule "apps-external/files_antivirus"]
 	path = apps-external/files_antivirus
 	url = git@github.com:nextcloud/files_antivirus.git
+[submodule "apps-external/notify_push"]
+	path = apps-external/notify_push
+	url = git@github.com:nextcloud/notify_push.git
diff --git a/IONOS b/IONOS
index 3697fa53b20b4..eeecdff03b812 160000
--- a/IONOS
+++ b/IONOS
@@ -1 +1 @@
-Subproject commit 3697fa53b20b490f2ca3425f4ebf1afc561dc01e
+Subproject commit eeecdff03b812ccc88898ef0fec0925619dee03a
diff --git a/apps-external/notify_push b/apps-external/notify_push
new file mode 160000
index 0000000000000..c721a4c3a39dd
--- /dev/null
+++ b/apps-external/notify_push
@@ -0,0 +1 @@
+Subproject commit c721a4c3a39ddabf56a5b3459c4e2a8dadfe62b1