diff --git a/lib/Listener/AnalyticsDatasourceListener.php b/lib/Listener/AnalyticsDatasourceListener.php
index 28d1723..a89c108 100644
--- a/lib/Listener/AnalyticsDatasourceListener.php
+++ b/lib/Listener/AnalyticsDatasourceListener.php
@@ -31,6 +31,9 @@
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 
+/**
+ * @template-implements IEventListener<Event|DatasourceEvent>
+ */
 class AnalyticsDatasourceListener implements IEventListener {
 	public function handle(Event $event): void {
 		if (!($event instanceof DatasourceEvent)) {
diff --git a/lib/Listener/UserCreatedEventListener.php b/lib/Listener/UserCreatedEventListener.php
index 6b90b8d..46393b9 100644
--- a/lib/Listener/UserCreatedEventListener.php
+++ b/lib/Listener/UserCreatedEventListener.php
@@ -33,6 +33,9 @@
 use OCP\User\Events\UserCreatedEvent;
 use Psr\Log\LoggerInterface;
 
+/**
+ * @template-implements IEventListener<Event|UserCreatedEvent>
+ */
 class UserCreatedEventListener implements IEventListener {
 	public function __construct(
 		private IGroupManager $groupManager,
diff --git a/tests/psalm-baseline.xml b/tests/psalm-baseline.xml
index 4d624ea..07d720f 100644
--- a/tests/psalm-baseline.xml
+++ b/tests/psalm-baseline.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <files psalm-version="5.15.0@5c774aca4746caf3d239d9c8cadb9f882ca29352">
   <file src="lib/AppInfo/Application.php">
+    <InvalidArgument>
+      <code>AnalyticsDatasourceListener::class</code>
+    </InvalidArgument>
     <UndefinedClass>
       <code>DatasourceEvent</code>
       <code>PublicShareTemplateProvider</code>
@@ -63,12 +66,18 @@
     </UndefinedInterfaceMethod>
   </file>
   <file src="lib/Listener/AnalyticsDatasourceListener.php">
-    <MissingTemplateParam>
+    <InvalidTemplateParam>
       <code>IEventListener</code>
-    </MissingTemplateParam>
+    </InvalidTemplateParam>
+    <MoreSpecificImplementedParamType>
+      <code>$event</code>
+    </MoreSpecificImplementedParamType>
     <UndefinedClass>
       <code>DatasourceEvent</code>
     </UndefinedClass>
+    <UndefinedDocblockClass>
+      <code>AnalyticsDatasourceListener</code>
+    </UndefinedDocblockClass>
   </file>
   <file src="lib/Middleware/InjectionMiddleware.php">
     <UndefinedClass>