diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
index 9e39697a38799..a4b5255e3257a 100644
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@@ -166,6 +166,7 @@ The development container provides several convenience features for development:
 *   Pay attention to the IONOS-specific scripts and configurations when working on related features.
 *   Use the `IONOS/configure.sh` script for most configuration tasks rather than manual OCC commands.
 *   Before committing any changes, make sure to run the relevant tests and linters.
+*   **Recurring Tasks Documentation:** For common development tasks (e.g., delegating settings to admin, adding apps, etc.), check `../<tools-dir>/docs/recurring-tasks/` for step-by-step guides.
 
 ## Code Organization & Structure
 
diff --git a/.gitmodules b/.gitmodules
index a7c0d60e7e858..37edeacb61d4e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -24,7 +24,7 @@
 	url = git@github.com:nextcloud/notify_push.git
 [submodule "apps-external/activity"]
 	path = apps-external/activity
-	url = git@github.com:nextcloud/activity.git
+	url = git@github.com:IONOS-Productivity/nc-activity.git
 [submodule "apps-external/tasks"]
 	path = apps-external/tasks
 	url = git@github.com:nextcloud/tasks.git
diff --git a/IONOS b/IONOS
index bacda907219ef..c6b270f0fced4 160000
--- a/IONOS
+++ b/IONOS
@@ -1 +1 @@
-Subproject commit bacda907219ef50d09e60f9cd9d1667708135606
+Subproject commit c6b270f0fced4f741442cab01b5cb68df70c46bb
diff --git a/apps-external/activity b/apps-external/activity
index d5a969a1c52a7..ca3cd2e5e5883 160000
--- a/apps-external/activity
+++ b/apps-external/activity
@@ -1 +1 @@
-Subproject commit d5a969a1c52a7fbc42431df0949f383933419576
+Subproject commit ca3cd2e5e58839d62e5ec3e6afbac0b58d52f8a0