diff --git a/AUTHORS.md b/AUTHORS.md
index 5612bf4a1..a2aeb30a1 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -13,6 +13,7 @@
 - Lukas Reschke <lukas@statuscode.ch>
 - Richard Steinmetz <richard@steinmetz.cloud>
 - Robin Appelman <robin@icewind.nl>
+- Thomas Citharel <nextcloud@tcit.fr>
 - Thomas Müller <thomas.mueller@tmit.eu>
 - Nextcloud GmbH
 - ownCloud, Inc.
diff --git a/docs/endpoint-v2.md b/docs/endpoint-v2.md
index 64b6fff89..9b8466f1d 100644
--- a/docs/endpoint-v2.md
+++ b/docs/endpoint-v2.md
@@ -1,5 +1,6 @@
 <!--
   - SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
+  - SPDX-FileCopyrightText: 2016 ownCloud, Inc.
   - SPDX-License-Identifier: CC0-1.0
 -->
 # Endpoint documentation
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index 8ca34fbca..14e409577 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -1,9 +1,9 @@
 <?php
 /**
+ * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 namespace OCA\Activity\AppInfo;
 
 use OC\DB\ConnectionAdapter;
diff --git a/lib/BackgroundJob/EmailNotification.php b/lib/BackgroundJob/EmailNotification.php
index 7cdc24267..c5ab795d0 100644
--- a/lib/BackgroundJob/EmailNotification.php
+++ b/lib/BackgroundJob/EmailNotification.php
@@ -1,9 +1,9 @@
 <?php
 /**
+ * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 namespace OCA\Activity\BackgroundJob;
 
 use OCA\Activity\MailQueueHandler;
diff --git a/lib/BackgroundJob/ExpireActivities.php b/lib/BackgroundJob/ExpireActivities.php
index f7163c80b..cb79b6a87 100644
--- a/lib/BackgroundJob/ExpireActivities.php
+++ b/lib/BackgroundJob/ExpireActivities.php
@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 /**
+ * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 namespace OCA\Activity\BackgroundJob;
 
 use OCA\Activity\Data;
diff --git a/lib/Consumer.php b/lib/Consumer.php
index e292e62a3..19d7f726f 100644
--- a/lib/Consumer.php
+++ b/lib/Consumer.php
@@ -1,9 +1,9 @@
 <?php
 /**
+ * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 namespace OCA\Activity;
 
 use OCP\Activity\IConsumer;
diff --git a/lib/Controller/APIv2Controller.php b/lib/Controller/APIv2Controller.php
index 542395737..2c38a3319 100644
--- a/lib/Controller/APIv2Controller.php
+++ b/lib/Controller/APIv2Controller.php
@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 /**
+ * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 namespace OCA\Activity\Controller;
 
 use OCA\Activity\Data;
diff --git a/lib/Controller/ActivitiesController.php b/lib/Controller/ActivitiesController.php
index c8dc068fc..7ca063d13 100644
--- a/lib/Controller/ActivitiesController.php
+++ b/lib/Controller/ActivitiesController.php
@@ -1,9 +1,9 @@
 <?php
 /**
+ * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 namespace OCA\Activity\Controller;
 
 use OCA\Activity\Data;
diff --git a/lib/Controller/FeedController.php b/lib/Controller/FeedController.php
index 16f09ddf8..32694c74d 100644
--- a/lib/Controller/FeedController.php
+++ b/lib/Controller/FeedController.php
@@ -1,9 +1,9 @@
 <?php
 /**
+ * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 namespace OCA\Activity\Controller;
 
 use OCA\Activity\Data;
diff --git a/lib/Controller/SettingsController.php b/lib/Controller/SettingsController.php
index 27b2b22af..aaf30d79c 100644
--- a/lib/Controller/SettingsController.php
+++ b/lib/Controller/SettingsController.php
@@ -1,9 +1,9 @@
 <?php
 /**
+ * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 namespace OCA\Activity\Controller;
 
 use OCA\Activity\CurrentUser;
diff --git a/lib/Data.php b/lib/Data.php
index d925014fe..35f04f960 100755
--- a/lib/Data.php
+++ b/lib/Data.php
@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 /**
+ * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 namespace OCA\Activity;
 
 use Doctrine\DBAL\Platforms\MySQLPlatform;
diff --git a/lib/FilesHooks.php b/lib/FilesHooks.php
index 8cbbec332..296f90bd3 100755
--- a/lib/FilesHooks.php
+++ b/lib/FilesHooks.php
@@ -1,9 +1,9 @@
 <?php
 /**
+ * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 namespace OCA\Activity;
 
 use OC\Files\Filesystem;
diff --git a/lib/GroupHelper.php b/lib/GroupHelper.php
index 16d319520..dfc37cafc 100644
--- a/lib/GroupHelper.php
+++ b/lib/GroupHelper.php
@@ -1,9 +1,9 @@
 <?php
 /**
+ * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 namespace OCA\Activity;
 
 use OCP\Activity\Exceptions\UnknownActivityException;
diff --git a/templates/rss.php b/templates/rss.php
index f208ba5a4..eaaad8f91 100644
--- a/templates/rss.php
+++ b/templates/rss.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2014-2016 ownCloud, Inc.
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 echo '<?xml version="1.0" encoding="UTF-8"?>';
diff --git a/templates/stream.app.navigation.php b/templates/stream.app.navigation.php
index 77c68806f..6b9bcbbda 100644
--- a/templates/stream.app.navigation.php
+++ b/templates/stream.app.navigation.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2015-2016 ownCloud, Inc.
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 ?>
diff --git a/templates/stream.body.php b/templates/stream.body.php
index f9032b547..c26966053 100755
--- a/templates/stream.body.php
+++ b/templates/stream.body.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2015-2016 ownCloud, Inc.
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 script('activity', [