diff --git a/apps/dav/lib/AppInfo/Application.php b/apps/dav/lib/AppInfo/Application.php
index a22b2cea72ecc..f9511f5e2cb65 100644
--- a/apps/dav/lib/AppInfo/Application.php
+++ b/apps/dav/lib/AppInfo/Application.php
@@ -76,7 +76,6 @@
 use OCP\AppFramework\Bootstrap\IBootContext;
 use OCP\AppFramework\Bootstrap\IBootstrap;
 use OCP\AppFramework\Bootstrap\IRegistrationContext;
-use OCP\AppFramework\IAppContainer;
 use OCP\Calendar\Events\CalendarObjectCreatedEvent;
 use OCP\Calendar\Events\CalendarObjectDeletedEvent;
 use OCP\Calendar\Events\CalendarObjectMovedEvent;
@@ -90,6 +89,7 @@
 use OCP\DB\Events\AddMissingIndicesEvent;
 use OCP\Federation\Events\TrustedServerRemovedEvent;
 use OCP\Federation\ICloudFederationProviderManager;
+use OCP\IURLGenerator;
 use OCP\IUserSession;
 use OCP\Server;
 use OCP\Settings\Events\DeclarativeSettingsGetValueEvent;
@@ -243,7 +243,7 @@ public function boot(IBootContext $context): void {
 		$context->injectFn($this->registerCloudFederationProvider(...));
 	}
 
-	public function registerContactsManager(IContactsManager $cm, IAppContainer $container): void {
+	public function registerContactsManager(IContactsManager $cm, ContainerInterface $container): void {
 		$cm->register(function () use ($container, $cm): void {
 			$user = Server::get(IUserSession::class)->getUser();
 			if (!is_null($user)) {
@@ -255,23 +255,21 @@ public function registerContactsManager(IContactsManager $cm, IAppContainer $con
 	}
 
 	private function setupContactsProvider(IContactsManager $contactsManager,
-		IAppContainer $container,
+		ContainerInterface $container,
 		string $userID): void {
-		/** @var ContactsManager $cm */
-		$cm = $container->query(ContactsManager::class);
-		$urlGenerator = $container->getServer()->getURLGenerator();
+		$cm = $container->get(ContactsManager::class);
+		$urlGenerator = $container->get(IURLGenerator::class);
 		$cm->setupContactsProvider($contactsManager, $userID, $urlGenerator);
 	}
 
-	private function setupSystemContactsProvider(IContactsManager $contactsManager, IAppContainer $container): void {
-		/** @var ContactsManager $cm */
-		$cm = $container->query(ContactsManager::class);
-		$urlGenerator = $container->getServer()->getURLGenerator();
+	private function setupSystemContactsProvider(IContactsManager $contactsManager, ContainerInterface $container): void {
+		$cm = $container->get(ContactsManager::class);
+		$urlGenerator = $container->get(IURLGenerator::class);
 		$cm->setupSystemContactsProvider($contactsManager, null, $urlGenerator);
 	}
 
 	public function registerCalendarManager(ICalendarManager $calendarManager,
-		IAppContainer $container): void {
+		ContainerInterface $container): void {
 		$calendarManager->register(function () use ($container, $calendarManager): void {
 			$user = Server::get(IUserSession::class)->getUser();
 			if ($user !== null) {
@@ -281,9 +279,9 @@ public function registerCalendarManager(ICalendarManager $calendarManager,
 	}
 
 	private function setupCalendarProvider(ICalendarManager $calendarManager,
-		IAppContainer $container,
-		$userId) {
-		$cm = $container->query(CalendarManager::class);
+		ContainerInterface $container,
+		$userId): void {
+		$cm = $container->get(CalendarManager::class);
 		$cm->setupCalendarProvider($calendarManager, $userId);
 	}
 
diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml
index 5eb8ac0549908..b198266da15c6 100644
--- a/build/psalm-baseline.xml
+++ b/build/psalm-baseline.xml
@@ -145,21 +145,7 @@
     </UndefinedGlobalVariable>
   </file>
   <file src="apps/dav/lib/AppInfo/Application.php">
-    <DeprecatedInterface>
-      <code><![CDATA[IAppContainer]]></code>
-      <code><![CDATA[IAppContainer]]></code>
-      <code><![CDATA[IAppContainer]]></code>
-      <code><![CDATA[IAppContainer]]></code>
-      <code><![CDATA[IAppContainer]]></code>
-    </DeprecatedInterface>
     <DeprecatedMethod>
-      <code><![CDATA[getServer]]></code>
-      <code><![CDATA[getServer]]></code>
-      <code><![CDATA[getURLGenerator]]></code>
-      <code><![CDATA[getURLGenerator]]></code>
-      <code><![CDATA[query]]></code>
-      <code><![CDATA[query]]></code>
-      <code><![CDATA[query]]></code>
       <code><![CDATA[register]]></code>
     </DeprecatedMethod>
     <InvalidArgument>