diff --git a/appinfo/app.php b/appinfo/app.php
deleted file mode 100644
index dc7ca7c1..00000000
--- a/appinfo/app.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/**
- * @author 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/>.
- *
- */
-include_once __DIR__ . '/../vendor/autoload.php';
-
-// Query the app instance in the hope it's instantiated exactly once
-OC::$server->query(\OCA\SuspiciousLogin\AppInfo\Application::class);
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index b5bc842f..3b2c750b 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -24,14 +24,65 @@
 
 namespace OCA\SuspiciousLogin\AppInfo;
 
+use OCA\SuspiciousLogin\Event\PostLoginEvent;
+use OCA\SuspiciousLogin\Event\SuspiciousLoginEvent;
+use OCA\SuspiciousLogin\Listener\LoginListener;
+use OCA\SuspiciousLogin\Listener\LoginMailListener;
+use OCA\SuspiciousLogin\Listener\LoginNotificationListener;
+use OCA\SuspiciousLogin\Notifications\Notifier;
 use OCP\AppFramework\App;
+use OCP\AppFramework\Bootstrap\IBootContext;
+use OCP\AppFramework\Bootstrap\IBootstrap;
+use OCP\AppFramework\Bootstrap\IRegistrationContext;
+use OCP\EventDispatcher\IEventDispatcher;
+use OCP\Util;
 
-class Application extends App {
+class Application extends App implements IBootstrap {
 	public const APP_ID = 'suspicious_login';
 
 	public function __construct(array $urlParams = []) {
 		parent::__construct(self::APP_ID, $urlParams);
+	}
+
+	public function register(IRegistrationContext $context): void {
+		include_once __DIR__ . '/../../vendor/autoload.php';
+
+		$context->registerEventListener(SuspiciousLoginEvent::class, LoginNotificationListener::class);
+		$context->registerEventListener(SuspiciousLoginEvent::class, LoginMailListener::class);
+		$context->registerEventListener(PostLoginEvent::class, LoginListener::class);
+
+		$context->registerNotifierService(Notifier::class);
+	}
+
+	public function boot(IBootContext $context): void {
+		$context->injectFn(function (IEventDispatcher $dispatcher) {
+			$loginHookAdapter = new class($dispatcher) {
+				/** @var IEventDispatcher */
+				private $dispatcher;
+
+				public function __construct(IEventDispatcher $dispatcher) {
+					$this->dispatcher = $dispatcher;
+				}
+
+				public function handle(array $data) {
+					if (!isset($data['uid'], $data['isTokenLogin'])) {
+						// Ignore invalid data
+						return;
+					}
+
+					$this->dispatcher->dispatch(
+						PostLoginEvent::class,
+						new PostLoginEvent($data['uid'], $data['isTokenLogin'])
+					);
+				}
+			};
 
-		BootstrapSingleton::getInstance($this->getContainer())->boot();
+			Util::connectHook(
+				'OC_User',
+				'post_login',
+				$loginHookAdapter,
+				'handle'
+			);
+		});
 	}
 }
diff --git a/lib/AppInfo/BootstrapSingleton.php b/lib/AppInfo/BootstrapSingleton.php
deleted file mode 100644
index 5da148dd..00000000
--- a/lib/AppInfo/BootstrapSingleton.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/**
- * @copyright 2019 Christoph Wurst <christoph@winzerhof-wurst.at>
- *
- * @author 2019 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/>.
- */
-
-namespace OCA\SuspiciousLogin\AppInfo;
-
-use OCA\SuspiciousLogin\Event\PostLoginEvent;
-use OCA\SuspiciousLogin\Event\SuspiciousLoginEvent;
-use OCA\SuspiciousLogin\Listener\LoginListener;
-use OCA\SuspiciousLogin\Listener\LoginMailListener;
-use OCA\SuspiciousLogin\Listener\LoginNotificationListener;
-use OCA\SuspiciousLogin\Notifications\Notifier;
-use OCP\AppFramework\IAppContainer;
-use OCP\EventDispatcher\IEventDispatcher;
-use OCP\Notification\IManager;
-use OCP\Util;
-
-class BootstrapSingleton {
-
-	/** @var BootstrapSingleton */
-	private static $instance = null;
-
-	/** @var bool */
-	private $booted = false;
-
-	/** @var IAppContainer */
-	private $container;
-
-	private function __construct(IAppContainer $container) {
-		$this->container = $container;
-	}
-
-	public static function getInstance(IAppContainer $container): BootstrapSingleton {
-		if (self::$instance === null) {
-			self::$instance = new static($container);
-		}
-
-		return self::$instance;
-	}
-
-	public function boot(): void {
-		if ($this->booted) {
-			return;
-		}
-
-		$this->registerEvents($this->container);
-		$this->registerNotification($this->container);
-
-		$this->booted = true;
-	}
-
-	private function registerEvents(IAppContainer $container): void {
-		/** @var IEventDispatcher $dispatcher */
-		$dispatcher = $container->query(IEventDispatcher::class);
-		$dispatcher->addServiceListener(SuspiciousLoginEvent::class, LoginNotificationListener::class);
-		$dispatcher->addServiceListener(SuspiciousLoginEvent::class, LoginMailListener::class);
-		$dispatcher->addServiceListener(PostLoginEvent::class, LoginListener::class);
-
-		$loginHookAdapter = new class($dispatcher) {
-			/** @var IEventDispatcher */
-			private $dispatcher;
-
-			public function __construct(IEventDispatcher $dispatcher) {
-				$this->dispatcher = $dispatcher;
-			}
-
-			public function handle(array $data) {
-				if (!isset($data['uid'], $data['isTokenLogin'])) {
-					// Ignore invalid data
-					return;
-				}
-
-				$this->dispatcher->dispatch(
-					PostLoginEvent::class,
-					new PostLoginEvent($data['uid'], $data['isTokenLogin'])
-				);
-			}
-		};
-
-		Util::connectHook(
-			'OC_User',
-			'post_login',
-			$loginHookAdapter,
-			'handle'
-		);
-	}
-
-	private function registerNotification(IAppContainer $container) {
-		/** @var IManager $manager */
-		$manager = $container->query(IManager::class);
-		$manager->registerNotifierService(Notifier::class);
-	}
-}