diff --git a/appinfo/app.php b/appinfo/app.php
deleted file mode 100644
index 507897707..000000000
--- a/appinfo/app.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-
-/**
- * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
- * SPDX-License-Identifier: AGPL-3.0-or-later
- */
-
-use OC\User\LoginException;
-use OCA\User_SAML\GroupBackend;
-use OCA\User_SAML\SAMLSettings;
-use OCA\User_SAML\UserBackend;
-use OCP\IGroupManager;
-use Psr\Log\LoggerInterface;
-
-require_once __DIR__ . '/../vendor/autoload.php';
-
-// If we run in CLI mode do not set up the app as it can fail the OCC execution
-// since the URLGenerator isn't accessible.
-$cli = false;
-if (OC::$CLI) {
-	$cli = true;
-}
-try {
-	$urlGenerator = \OC::$server->getURLGenerator();
-	$l = \OC::$server->getL10N('user_saml');
-	$config = \OC::$server->getConfig();
-	$request = \OC::$server->getRequest();
-	$userSession = \OC::$server->getUserSession();
-	$session = \OC::$server->getSession();
-} catch (Throwable $e) {
-	$logger = \OCP\Server::get(LoggerInterface::class);
-	$logger->critical($e->getMessage(), ['exception' => $e, 'app' => 'user_saml']);
-	return;
-}
-
-$groupBackend = \OC::$server->get(GroupBackend::class);
-\OC::$server->get(IGroupManager::class)->addBackend($groupBackend);
-
-$samlSettings = \OC::$server->get(SAMLSettings::class);
-
-$userBackend = \OCP\Server::get(UserBackend::class);
-$userBackend->registerBackends(\OC::$server->getUserManager()->getBackends());
-OC_User::useBackend($userBackend);
-
-$params = [];
-
-// Setting up the one login config may fail, if so, do not catch the requests later.
-$returnScript = false;
-$type = '';
-switch ($config->getAppValue('user_saml', 'type')) {
-	case 'saml':
-		$type = 'saml';
-		break;
-	case 'environment-variable':
-		$type = 'environment-variable';
-		break;
-	default:
-		return;
-}
-
-if ($type === 'environment-variable') {
-	// We should ignore oauth2 token endpoint (oauth can send the credentials as basic auth which will fail with apache auth)
-	$uri = $request->getRequestUri();
-	if (substr($uri, -24) === '/apps/oauth/api/v1/token') {
-		return;
-	}
-
-	try {
-		OC_User::handleApacheAuth();
-	} catch (LoginException $e) {
-		if ($request->getPathInfo() === '/apps/user_saml/saml/error') {
-			return;
-		}
-		$targetUrl = $urlGenerator->linkToRouteAbsolute(
-			'user_saml.SAML.genericError',
-			[
-				'message' => $e->getMessage()
-			]
-		);
-		header('Location: ' . $targetUrl);
-		exit();
-	}
-}
-
-if ($returnScript === true) {
-	return;
-}
-
-$app = \OC::$server->query(\OCA\User_SAML\AppInfo\Application::class);
-$app->registerDavAuth();
-
-$redirectSituation = false;
-
-$user = $userSession->getUser();
-if ($user !== null) {
-	$enabled = $user->isEnabled();
-	if ($enabled === false) {
-		if ($request->getPathInfo() === '/apps/user_saml/saml/error') {
-			return;
-		}
-		$targetUrl = $urlGenerator->linkToRouteAbsolute(
-			'user_saml.SAML.genericError',
-			[
-				'message' => $l->t('This user account is disabled, please contact your administrator.')
-			]
-		);
-		header('Location: ' . $targetUrl);
-		exit();
-	}
-}
-
-// All requests that are not authenticated and match against the "/login" route are
-// redirected to the SAML login endpoint
-if (!$cli &&
-	!$userSession->isLoggedIn() &&
-	\OC::$server->getRequest()->getPathInfo() === '/login' &&
-	$type !== '') {
-	try {
-		$params = $request->getParams();
-	} catch (\LogicException $e) {
-		// ignore exception when PUT is called since getParams cannot parse parameters in that case
-	}
-	if (isset($params['direct']) && ($params['direct'] === 1 || $params['direct'] === '1')) {
-		return;
-	}
-	$redirectSituation = true;
-}
-
-$multipleUserBackEnds = $samlSettings->allowMultipleUserBackEnds();
-$configuredIdps = $samlSettings->getListOfIdps();
-$showLoginOptions = ($multipleUserBackEnds || count($configuredIdps) > 1) && $type === 'saml';
-
-if ($redirectSituation === true && $showLoginOptions) {
-	try {
-		$params = $request->getParams();
-	} catch (\LogicException $e) {
-		// ignore exception when PUT is called since getParams cannot parse parameters in that case
-	}
-	$redirectUrl = '';
-	if (isset($params['redirect_url'])) {
-		$redirectUrl = $params['redirect_url'];
-	}
-
-	$targetUrl = $urlGenerator->linkToRouteAbsolute(
-		'user_saml.SAML.selectUserBackEnd',
-		[
-			'redirectUrl' => $redirectUrl
-		]
-	);
-	header('Location: ' . $targetUrl);
-	exit();
-}
-
-if ($redirectSituation === true) {
-	try {
-		$params = $request->getParams();
-	} catch (\LogicException $e) {
-		// ignore exception when PUT is called since getParams cannot parse parameters in that case
-	}
-	$originalUrl = '';
-	if (isset($params['redirect_url'])) {
-		$originalUrl = $urlGenerator->getAbsoluteURL($params['redirect_url']);
-	}
-
-	$csrfToken = \OC::$server->getCsrfTokenManager()->getToken();
-	$targetUrl = $urlGenerator->linkToRouteAbsolute(
-		'user_saml.SAML.login',
-		[
-			'requesttoken' => $csrfToken->getEncryptedValue(),
-			'originalUrl' => $originalUrl,
-			'idp' => array_keys($configuredIdps)[0] ?? '',
-		]
-	);
-	header('Location: ' . $targetUrl);
-	exit();
-}
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 0dd691cfd..2225101ec 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -26,6 +26,7 @@ While theoretically any other authentication provider implementing either one of
 	<namespace>User_SAML</namespace>
 	<types>
 		<authentication/>
+		<dav/>
 	</types>
 	<documentation>
 		<admin>https://portal.nextcloud.com/article/configuring-single-sign-on-10.html</admin>
@@ -60,4 +61,9 @@ While theoretically any other authentication provider implementing either one of
 		<admin>OCA\User_SAML\Settings\Admin</admin>
 		<admin-section>OCA\User_SAML\Settings\Section</admin-section>
 	</settings>
+	<sabre>
+		<plugins>
+			<plugin>OCA\User_SAML\DavPlugin</plugin>
+		</plugins>
+	</sabre>
 </info>
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index c9e517e91..150f395a2 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
@@ -7,39 +9,48 @@
 
 namespace OCA\User_SAML\AppInfo;
 
-use OCA\Files\Event\LoadAdditionalScriptsEvent;
+use OC\Security\CSRF\CsrfTokenManager;
+use OC\User\LoginException;
+use OC_User;
 use OCA\User_SAML\DavPlugin;
+use OCA\User_SAML\GroupBackend;
+use OCA\User_SAML\GroupManager;
+use OCA\User_SAML\Listener\LoadAdditionalScriptsListener;
 use OCA\User_SAML\Middleware\OnlyLoggedInMiddleware;
 use OCA\User_SAML\SAMLSettings;
+use OCA\User_SAML\UserBackend;
 use OCP\AppFramework\App;
-use OCP\AppFramework\Utility\IControllerMethodReflector;
+use OCP\AppFramework\Bootstrap\IBootContext;
+use OCP\AppFramework\Bootstrap\IBootstrap;
+use OCP\AppFramework\Bootstrap\IRegistrationContext;
+use OCP\AppFramework\Http\Events\BeforeTemplateRenderedEvent;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\IConfig;
+use OCP\IDBConnection;
+use OCP\IGroupManager;
+use OCP\IL10N;
+use OCP\IRequest;
 use OCP\ISession;
 use OCP\IURLGenerator;
+use OCP\IUserManager;
 use OCP\IUserSession;
-use OCP\SabrePluginEvent;
+use OCP\L10N\IFactory;
 use OCP\Server;
-use OCP\Util;
 use Psr\Container\ContainerInterface;
+use Psr\Log\LoggerInterface;
+use Throwable;
+
+require_once __DIR__ . '/../../vendor/autoload.php';
 
-class Application extends App {
+class Application extends App implements IBootstrap {
 	public function __construct(array $urlParams = []) {
 		parent::__construct('user_saml', $urlParams);
-		$container = $this->getContainer();
-
-		/**
-		 * Middleware
-		 */
-		$container->registerService('OnlyLoggedInMiddleware', function (ContainerInterface $c) {
-			return new OnlyLoggedInMiddleware(
-				$c->get(IControllerMethodReflector::class),
-				$c->get(IUserSession::class),
-				$c->get(IURLGenerator::class)
-			);
-		});
+	}
 
-		$container->registerService(DavPlugin::class, function (ContainerInterface $c) {
+	public function register(IRegistrationContext $context): void {
+		$context->registerMiddleware(OnlyLoggedInMiddleware::class);
+		$context->registerEventListener(BeforeTemplateRenderedEvent::class, LoadAdditionalScriptsListener::class);
+		$context->registerService(DavPlugin::class, function (ContainerInterface $c) {
 			return new DavPlugin(
 				$c->get(ISession::class),
 				$c->get(IConfig::class),
@@ -47,36 +58,164 @@ public function __construct(array $urlParams = []) {
 				$c->get(SAMLSettings::class)
 			);
 		});
-
-		$container->registerMiddleWare('OnlyLoggedInMiddleware');
-		$this->timezoneHandling();
 	}
 
-	public function registerDavAuth(): void {
-		$dispatcher = Server::get(IEventDispatcher::class);
-		$dispatcher->addListener('OCA\DAV\Connector\Sabre::addPlugin', function (SabrePluginEvent $event) {
-			$event->getServer()->addPlugin(Server::get(DavPlugin::class));
-		});
-	}
+	public function boot(IBootContext $context): void {
+		try {
+			$context->injectFn(function (
+				IL10N $l10n,
+				IURLGenerator $urlGenerator,
+				IConfig $config,
+				IRequest $request,
+				IUserSession $userSession,
+				ISession $session,
+				IFactory $factory,
+				SAMLSettings $samlSettings,
+				IUserManager $userManager,
+				IDBConnection $connection,
+				LoggerInterface $logger,
+				GroupManager $groupManager,
+				IEventDispatcher $dispatcher,
+				CsrfTokenManager $csrfTokenManager,
+				bool $isCLI,
+			) {
+				$groupBackend = Server::get(GroupBackend::class);
+				Server::get(IGroupManager::class)->addBackend($groupBackend);
 
-	private function timezoneHandling(): void {
-		$userSession = Server::get(IUserSession::class);
-		$session = Server::get(ISession::class);
-		$config = Server::get(IConfig::class);
+				$samlSettings = Server::get(SAMLSettings::class);
 
-		$dispatcher = Server::get(IEventDispatcher::class);
-		$dispatcher->addListener(LoadAdditionalScriptsEvent::class, function () use ($session, $config, $userSession) {
-			if (!$userSession->isLoggedIn()) {
-				return;
-			}
+				$userBackend = Server::get(UserBackend::class);
 
-			$user = $userSession->getUser();
-			$timezoneDB = $config->getUserValue($user->getUID(), 'core', 'timezone', '');
+				$userBackend->registerBackends($userManager->getBackends());
+				OC_User::useBackend($userBackend);
 
-			if ($timezoneDB === '' || !$session->exists('timezone')) {
-				Util::addScript('user_saml', 'vendor/jstz.min');
-				Util::addScript('user_saml', 'timezone');
-			}
-		});
+				$params = [];
+
+				// Setting up the one login config may fail, if so, do not catch the requests later.
+				switch ($config->getAppValue('user_saml', 'type')) {
+					case 'saml':
+						$type = 'saml';
+						break;
+					case 'environment-variable':
+						$type = 'environment-variable';
+						break;
+					default:
+						return;
+				}
+
+				if ($type === 'environment-variable') {
+					// We should ignore oauth2 token endpoint (oauth can send the credentials as basic auth which will fail with apache auth)
+					$uri = $request->getRequestUri();
+					if (str_ends_with($uri, '/apps/oauth/api/v1/token')) {
+						return;
+					}
+
+					try {
+						OC_User::handleApacheAuth();
+					} catch (LoginException $e) {
+						if ($request->getPathInfo() === '/apps/user_saml/saml/error') {
+							return;
+						}
+						$targetUrl = $urlGenerator->linkToRouteAbsolute(
+							'user_saml.SAML.genericError',
+							[
+								'message' => $e->getMessage()
+							]
+						);
+						header('Location: ' . $targetUrl);
+						exit();
+					}
+				}
+
+				$redirectSituation = false;
+
+				$user = $userSession->getUser();
+				if ($user !== null) {
+					$enabled = $user->isEnabled();
+					if ($enabled === false) {
+						if ($request->getPathInfo() === '/apps/user_saml/saml/error') {
+							return;
+						}
+						$targetUrl = $urlGenerator->linkToRouteAbsolute(
+							'user_saml.SAML.genericError',
+							[
+								'message' => $l10n->t('This user account is disabled, please contact your administrator.')
+							]
+						);
+						header('Location: ' . $targetUrl);
+						exit();
+					}
+				}
+
+				// All requests that are not authenticated and match against the "/login" route are
+				// redirected to the SAML login endpoint
+				if (!$isCLI &&
+					!$userSession->isLoggedIn() &&
+					($request->getPathInfo() === '/login')) {
+					try {
+						$params = $request->getParams();
+					} catch (\LogicException $e) {
+						// ignore exception when PUT is called since getParams cannot parse parameters in that case
+					}
+					if (isset($params['direct']) && ($params['direct'] === 1 || $params['direct'] === '1')) {
+						return;
+					}
+					$redirectSituation = true;
+				}
+
+				$multipleUserBackEnds = $samlSettings->allowMultipleUserBackEnds();
+				$configuredIdps = $samlSettings->getListOfIdps();
+				$showLoginOptions = $multipleUserBackEnds || count($configuredIdps) > 1;
+
+				if ($redirectSituation === true && $showLoginOptions) {
+					try {
+						$params = $request->getParams();
+					} catch (\LogicException $e) {
+						// ignore exception when PUT is called since getParams cannot parse parameters in that case
+					}
+					$redirectUrl = '';
+					if (isset($params['redirect_url'])) {
+						$redirectUrl = $params['redirect_url'];
+					}
+
+					$targetUrl = $urlGenerator->linkToRouteAbsolute(
+						'user_saml.SAML.selectUserBackEnd',
+						[
+							'redirectUrl' => $redirectUrl
+						]
+					);
+					header('Location: ' . $targetUrl);
+					exit();
+				}
+
+				if ($redirectSituation === true) {
+					try {
+						$params = $request->getParams();
+					} catch (\LogicException $e) {
+						// ignore exception when PUT is called since getParams cannot parse parameters in that case
+					}
+					$originalUrl = '';
+					if (isset($params['redirect_url'])) {
+						$originalUrl = $urlGenerator->getAbsoluteURL($params['redirect_url']);
+					}
+
+					$csrfToken = $csrfTokenManager->getToken();
+					$targetUrl = $urlGenerator->linkToRouteAbsolute(
+						'user_saml.SAML.login',
+						[
+							'requesttoken' => $csrfToken->getEncryptedValue(),
+							'originalUrl' => $originalUrl,
+							'idp' => array_keys($configuredIdps)[0] ?? '',
+						]
+					);
+					header('Location: ' . $targetUrl);
+					exit();
+				}
+			});
+		} catch (Throwable $e) {
+			Server::get(LoggerInterface::class)->critical('Error when loading user_saml app', [
+				'exception' => $e,
+			]);
+		}
 	}
 }
diff --git a/lib/Listener/LoadAdditionalScriptsListener.php b/lib/Listener/LoadAdditionalScriptsListener.php
new file mode 100644
index 000000000..dd5b29331
--- /dev/null
+++ b/lib/Listener/LoadAdditionalScriptsListener.php
@@ -0,0 +1,46 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\User_SAML\Listener;
+
+use OCP\AppFramework\Http\Events\BeforeTemplateRenderedEvent;
+use OCP\EventDispatcher\Event;
+use OCP\EventDispatcher\IEventListener;
+use OCP\IConfig;
+use OCP\ISession;
+use OCP\IUserSession;
+use OCP\Util;
+
+/** @template-implements IEventListener<BeforeTemplateRenderedEvent|Event> */
+class LoadAdditionalScriptsListener implements IEventListener {
+	public function __construct(
+		private ISession $session,
+		private IUserSession $userSession,
+		private IConfig $config,
+	) {
+	}
+
+	public function handle(Event $event): void {
+		if (!$event instanceof BeforeTemplateRenderedEvent) {
+			return;
+		}
+
+		if (!$event->isLoggedIn()) {
+			return;
+		}
+
+		$user = $this->userSession->getUser();
+		$timezoneDB = $this->config->getUserValue($user->getUID(), 'core', 'timezone', '');
+
+		if ($timezoneDB === '' || !$this->session->exists('timezone')) {
+			Util::addScript('user_saml', 'vendor/jstz.min');
+			Util::addScript('user_saml', 'timezone');
+		}
+	}
+}
diff --git a/tests/psalm-baseline.xml b/tests/psalm-baseline.xml
index 9772c2300..dd0a1ef0d 100644
--- a/tests/psalm-baseline.xml
+++ b/tests/psalm-baseline.xml
@@ -5,19 +5,10 @@
 -->
 <files psalm-version="5.26.1@d747f6500b38ac4f7dfc5edbcae6e4b637d7add0">
   <file src="lib/AppInfo/Application.php">
-    <DeprecatedMethod>
-      <code><![CDATA[registerMiddleWare]]></code>
-      <code><![CDATA[registerService]]></code>
-      <code><![CDATA[registerService]]></code>
-    </DeprecatedMethod>
     <MissingDependency>
       <code><![CDATA[DavPlugin]]></code>
       <code><![CDATA[DavPlugin]]></code>
-      <code><![CDATA[DavPlugin]]></code>
     </MissingDependency>
-    <UndefinedDocblockClass>
-      <code><![CDATA[$event->getServer()]]></code>
-    </UndefinedDocblockClass>
   </file>
   <file src="lib/Controller/SAMLController.php">
     <RedundantCondition>
@@ -36,12 +27,7 @@
       <code><![CDATA[ClientFlowLoginV2Controller]]></code>
       <code><![CDATA[ClientFlowLoginV2Controller]]></code>
       <code><![CDATA[ClientFlowLoginV2Controller]]></code>
-      <code><![CDATA[CsrfTokenManager]]></code>
     </UndefinedClass>
-    <UndefinedDocblockClass>
-      <code><![CDATA[$csrfTokenManager]]></code>
-      <code><![CDATA[$csrfTokenManager]]></code>
-    </UndefinedDocblockClass>
   </file>
   <file src="lib/DavPlugin.php">
     <UndefinedClass>
@@ -91,7 +77,6 @@
       <code><![CDATA[$offset]]></code>
     </InvalidArgument>
     <UndefinedClass>
-      <code><![CDATA[CsrfTokenManager]]></code>
       <code><![CDATA[\OC]]></code>
       <code><![CDATA[\OC]]></code>
     </UndefinedClass>
diff --git a/tests/stub.phpstub b/tests/stub.phpstub
index 8cfa75fd9..04451c801 100644
--- a/tests/stub.phpstub
+++ b/tests/stub.phpstub
@@ -52,3 +52,24 @@ namespace OC\DB\Exceptions {
 namespace OCP\Log {
 	public function logger(?string $appId = null): \Psr\Log\LoggerInterface;
 }
+
+namespace OC\Security\CSRF {
+	class CsrfToken {
+		public function getEncryptedValue(): string {
+			return 'token';
+		}
+	}
+	class CsrfTokenManager {
+			abstract public function getToken(): CsrfToken;
+	}
+}
+
+namespace OC\User {
+	class LoginException extends \Exception {
+	}
+}
+
+class OC_User {
+	public static function useBackend($userBackend): void;
+	public static function handleApacheAuth(): void;
+}
diff --git a/tests/unit/AppInfo/ApplicationTest.php b/tests/unit/AppInfo/ApplicationTest.php
index 2398354ac..db394e555 100644
--- a/tests/unit/AppInfo/ApplicationTest.php
+++ b/tests/unit/AppInfo/ApplicationTest.php
@@ -28,7 +28,7 @@ public function testContainerAppName() {
 
 	public function queryData() {
 		return [
-			['OnlyLoggedInMiddleware', OnlyLoggedInMiddleware::class],
+			[OnlyLoggedInMiddleware::class],
 		];
 	}
 
@@ -37,10 +37,7 @@ public function queryData() {
 	 * @param string $service
 	 * @param string $expected
 	 */
-	public function testContainerQuery($service, $expected = null) {
-		if ($expected === null) {
-			$expected = $service;
-		}
-		$this->assertTrue($this->container->query($service) instanceof $expected);
+	public function testContainerQuery($serviceClass) {
+		$this->assertTrue($this->container->query($serviceClass) instanceof $serviceClass);
 	}
 }