diff --git a/apps/comments/appinfo/app.php b/apps/comments/appinfo/app.php
deleted file mode 100644
index c12c7345d89..00000000000
--- a/apps/comments/appinfo/app.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2018, Joas Schilling <coding@schilljs.com>
- *
- * @author John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
- * @author Vincent Petry <pvince81@owncloud.com>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-\OC::$server->query(\OCA\Comments\AppInfo\Application::class);
diff --git a/apps/contactsinteraction/appinfo/app.php b/apps/contactsinteraction/appinfo/app.php
deleted file mode 100644
index 7bc55c958dd..00000000000
--- a/apps/contactsinteraction/appinfo/app.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/**
- * @copyright 2020 Christoph Wurst <christoph@winzerhof-wurst.at>
- *
- * @author 2020 Christoph Wurst <christoph@winzerhof-wurst.at>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-\OC::$server->query(\OCA\ContactsInteraction\AppInfo\Application::class);
diff --git a/apps/contactsinteraction/lib/AppInfo/Application.php b/apps/contactsinteraction/lib/AppInfo/Application.php
index a3cb74f408b..8d0e2fd4e71 100644
--- a/apps/contactsinteraction/lib/AppInfo/Application.php
+++ b/apps/contactsinteraction/lib/AppInfo/Application.php
@@ -27,19 +27,22 @@ namespace OCA\ContactsInteraction\AppInfo;
 
 use OCA\ContactsInteraction\Listeners\ContactInteractionListener;
 use OCP\AppFramework\App;
+use OCP\AppFramework\Bootstrap\IBootContext;
+use OCP\AppFramework\Bootstrap\IBootstrap;
+use OCP\AppFramework\Bootstrap\IRegistrationContext;
 use OCP\Contacts\Events\ContactInteractedWithEvent;
-use OCP\EventDispatcher\IEventDispatcher;
 
-class Application extends App {
+class Application extends App implements IBootstrap {
 	public const APP_ID = 'contactsinteraction';
 
 	public function __construct() {
 		parent::__construct(self::APP_ID);
+	}
 
-		$this->registerListeners($this->getContainer()->query(IEventDispatcher::class));
+	public function register(IRegistrationContext $context): void {
+		$context->registerEventListener(ContactInteractedWithEvent::class, ContactInteractionListener::class);
 	}
 
-	private function registerListeners(IEventDispatcher $dispatcher): void {
-		$dispatcher->addServiceListener(ContactInteractedWithEvent::class, ContactInteractionListener::class);
+	public function boot(IBootContext $context): void {
 	}
 }