diff --git a/apps/dav/lib/Listener/CalendarDeletionDefaultUpdaterListener.php b/apps/dav/lib/Listener/CalendarDeletionDefaultUpdaterListener.php
index 7bb535383c05e..bfc538e59eccf 100644
--- a/apps/dav/lib/Listener/CalendarDeletionDefaultUpdaterListener.php
+++ b/apps/dav/lib/Listener/CalendarDeletionDefaultUpdaterListener.php
@@ -33,9 +33,6 @@
 use Throwable;
 use function strpos;
 
-/**
- * @template-implements IEventListener<\OCA\DAV\Events\CalendarDeletedEvent>
- */
 class CalendarDeletionDefaultUpdaterListener implements IEventListener {
 
 	/** @var IConfig */
diff --git a/apps/settings/lib/Listener/AppPasswordCreatedActivityListener.php b/apps/settings/lib/Listener/AppPasswordCreatedActivityListener.php
index 587d626ef9778..287fb5fad5554 100644
--- a/apps/settings/lib/Listener/AppPasswordCreatedActivityListener.php
+++ b/apps/settings/lib/Listener/AppPasswordCreatedActivityListener.php
@@ -34,9 +34,6 @@
 use OCP\IUserSession;
 use Psr\Log\LoggerInterface;
 
-/**
- * @template-implements IEventListener<\OC\Authentication\Events\AppPasswordCreatedEvent>
- */
 class AppPasswordCreatedActivityListener implements IEventListener {
 	/** @var IActivityManager */
 	private $activityManager;
diff --git a/lib/private/Accounts/Hooks.php b/lib/private/Accounts/Hooks.php
index a6c52275d2dd4..cae704fcb92de 100644
--- a/lib/private/Accounts/Hooks.php
+++ b/lib/private/Accounts/Hooks.php
@@ -32,9 +32,6 @@
 use OCP\User\Events\UserChangedEvent;
 use Psr\Log\LoggerInterface;
 
-/**
- * @template-implements IEventListener<UserChangedEvent>
- */
 class Hooks implements IEventListener {
 	/** @var IAccountManager */
 	private $accountManager;
diff --git a/lib/private/Authentication/Listeners/LoginFailedListener.php b/lib/private/Authentication/Listeners/LoginFailedListener.php
index d2971e07b55e7..2d900b3d9248f 100644
--- a/lib/private/Authentication/Listeners/LoginFailedListener.php
+++ b/lib/private/Authentication/Listeners/LoginFailedListener.php
@@ -35,9 +35,6 @@
 use OCP\IUserManager;
 use OCP\Util;
 
-/**
- * @template-implements IEventListener<\OC\Authentication\Events\LoginFailed>
- */
 class LoginFailedListener implements IEventListener {
 	/** @var IEventDispatcher */
 	private $dispatcher;
diff --git a/lib/private/Authentication/Listeners/RemoteWipeActivityListener.php b/lib/private/Authentication/Listeners/RemoteWipeActivityListener.php
index edebb2a2641a9..e341e4b79a5c7 100644
--- a/lib/private/Authentication/Listeners/RemoteWipeActivityListener.php
+++ b/lib/private/Authentication/Listeners/RemoteWipeActivityListener.php
@@ -35,9 +35,6 @@
 use OCP\EventDispatcher\IEventListener;
 use Psr\Log\LoggerInterface;
 
-/**
- * @template-implements IEventListener<\OC\Authentication\Events\ARemoteWipeEvent>
- */
 class RemoteWipeActivityListener implements IEventListener {
 	/** @var IActvityManager */
 	private $activityManager;
diff --git a/lib/private/Authentication/Listeners/RemoteWipeEmailListener.php b/lib/private/Authentication/Listeners/RemoteWipeEmailListener.php
index cba2b18358984..7bba8ba6057d2 100644
--- a/lib/private/Authentication/Listeners/RemoteWipeEmailListener.php
+++ b/lib/private/Authentication/Listeners/RemoteWipeEmailListener.php
@@ -40,9 +40,6 @@
 use Psr\Log\LoggerInterface;
 use function substr;
 
-/**
- * @template-implements IEventListener<\OC\Authentication\Events\ARemoteWipeEvent>
- */
 class RemoteWipeEmailListener implements IEventListener {
 	/** @var IMailer */
 	private $mailer;
diff --git a/lib/private/Authentication/Listeners/RemoteWipeNotificationsListener.php b/lib/private/Authentication/Listeners/RemoteWipeNotificationsListener.php
index 81feab32746f0..849e088ad2d28 100644
--- a/lib/private/Authentication/Listeners/RemoteWipeNotificationsListener.php
+++ b/lib/private/Authentication/Listeners/RemoteWipeNotificationsListener.php
@@ -34,9 +34,6 @@
 use OCP\EventDispatcher\IEventListener;
 use OCP\Notification\IManager as INotificationManager;
 
-/**
- * @template-implements IEventListener<\OC\Authentication\Events\ARemoteWipeEvent>
- */
 class RemoteWipeNotificationsListener implements IEventListener {
 	/** @var INotificationManager */
 	private $notificationManager;
diff --git a/lib/private/Authentication/Listeners/UserDeletedStoreCleanupListener.php b/lib/private/Authentication/Listeners/UserDeletedStoreCleanupListener.php
index e478c21239f26..497def3159aca 100644
--- a/lib/private/Authentication/Listeners/UserDeletedStoreCleanupListener.php
+++ b/lib/private/Authentication/Listeners/UserDeletedStoreCleanupListener.php
@@ -30,9 +30,6 @@
 use OCP\EventDispatcher\IEventListener;
 use OCP\User\Events\UserDeletedEvent;
 
-/**
- * @template-implements IEventListener<\OCP\User\Events\UserDeletedEvent>
- */
 class UserDeletedStoreCleanupListener implements IEventListener {
 	/** @var Registry */
 	private $registry;
diff --git a/lib/private/Authentication/Listeners/UserDeletedTokenCleanupListener.php b/lib/private/Authentication/Listeners/UserDeletedTokenCleanupListener.php
index a09a08568d545..f06d7cdd87939 100644
--- a/lib/private/Authentication/Listeners/UserDeletedTokenCleanupListener.php
+++ b/lib/private/Authentication/Listeners/UserDeletedTokenCleanupListener.php
@@ -33,9 +33,6 @@
 use Psr\Log\LoggerInterface;
 use Throwable;
 
-/**
- * @template-implements IEventListener<\OCP\User\Events\UserDeletedEvent>
- */
 class UserDeletedTokenCleanupListener implements IEventListener {
 	/** @var Manager */
 	private $manager;
diff --git a/lib/private/Authentication/Listeners/UserLoggedInListener.php b/lib/private/Authentication/Listeners/UserLoggedInListener.php
index df030c447493a..7f405eef7b738 100644
--- a/lib/private/Authentication/Listeners/UserLoggedInListener.php
+++ b/lib/private/Authentication/Listeners/UserLoggedInListener.php
@@ -31,9 +31,6 @@
 use OCP\EventDispatcher\IEventListener;
 use OCP\User\Events\PostLoginEvent;
 
-/**
- * @template-implements IEventListener<\OCP\User\Events\PostLoginEvent>
- */
 class UserLoggedInListener implements IEventListener {
 	/** @var Manager */
 	private $manager;
diff --git a/lib/private/Collaboration/Reference/File/FileReferenceEventListener.php b/lib/private/Collaboration/Reference/File/FileReferenceEventListener.php
index 1dbe8e3bc3588..4143e745e3c05 100644
--- a/lib/private/Collaboration/Reference/File/FileReferenceEventListener.php
+++ b/lib/private/Collaboration/Reference/File/FileReferenceEventListener.php
@@ -34,7 +34,6 @@
 use OCP\Share\Events\ShareCreatedEvent;
 use OCP\Share\Events\ShareDeletedEvent;
 
-/** @template-implements IEventListener<Event|NodeDeletedEvent|ShareDeletedEvent|ShareCreatedEvent> */
 class FileReferenceEventListener implements IEventListener {
 	private IReferenceManager $manager;
 
diff --git a/lib/private/Collaboration/Reference/RenderReferenceEventListener.php b/lib/private/Collaboration/Reference/RenderReferenceEventListener.php
index dc2c56126662a..f23aae92afa2b 100644
--- a/lib/private/Collaboration/Reference/RenderReferenceEventListener.php
+++ b/lib/private/Collaboration/Reference/RenderReferenceEventListener.php
@@ -32,7 +32,6 @@
 use OCP\EventDispatcher\IEventListener;
 use OCP\IInitialStateService;
 
-/** @template-implements IEventListener<Event|RenderReferenceEvent> */
 class RenderReferenceEventListener implements IEventListener {
 	private IReferenceManager $manager;
 	private IInitialStateService $initialStateService;
diff --git a/lib/private/Metadata/FileEventListener.php b/lib/private/Metadata/FileEventListener.php
index 162e85ff3aa9d..6d41ccdef3092 100644
--- a/lib/private/Metadata/FileEventListener.php
+++ b/lib/private/Metadata/FileEventListener.php
@@ -33,11 +33,6 @@
 use OCP\Files\FileInfo;
 use Psr\Log\LoggerInterface;
 
-/**
- * @template-implements IEventListener<NodeRemovedFromCache>
- * @template-implements IEventListener<NodeDeletedEvent>
- * @template-implements IEventListener<NodeWrittenEvent>
- */
 class FileEventListener implements IEventListener {
 	private IMetadataManager $manager;
 	private LoggerInterface $logger;
diff --git a/lib/private/Share20/UserRemovedListener.php b/lib/private/Share20/UserRemovedListener.php
index 3af7b5a365047..a789aeb578ab0 100644
--- a/lib/private/Share20/UserRemovedListener.php
+++ b/lib/private/Share20/UserRemovedListener.php
@@ -30,9 +30,6 @@
 use OCP\Group\Events\UserRemovedEvent;
 use OCP\Share\IManager;
 
-/**
- * @template-implements IEventListener<UserRemovedEvent>
- */
 class UserRemovedListener implements IEventListener {
 	/** @var IManager */
 	protected $shareManager;
diff --git a/lib/private/TagManager.php b/lib/private/TagManager.php
index 82c4dd2188d8d..695cde9e02e7e 100644
--- a/lib/private/TagManager.php
+++ b/lib/private/TagManager.php
@@ -38,9 +38,6 @@
 use OCP\Db\Exception as DBException;
 use Psr\Log\LoggerInterface;
 
-/**
- * @template-implements IEventListener<UserDeletedEvent>
- */
 class TagManager implements ITagManager, IEventListener {
 	private TagMapper $mapper;
 	private IUserSession $userSession;
diff --git a/lib/private/User/Listeners/BeforeUserDeletedListener.php b/lib/private/User/Listeners/BeforeUserDeletedListener.php
index ec1f80c5413a8..3ffb307f98673 100644
--- a/lib/private/User/Listeners/BeforeUserDeletedListener.php
+++ b/lib/private/User/Listeners/BeforeUserDeletedListener.php
@@ -30,9 +30,6 @@
 use OCP\IAvatarManager;
 use Psr\Log\LoggerInterface;
 
-/**
- * @template-implements IEventListener<BeforeUserDeletedEvent>
- */
 class BeforeUserDeletedListener implements IEventListener {
 	private IAvatarManager $avatarManager;
 	private LoggerInterface $logger;
diff --git a/lib/private/User/Listeners/UserChangedListener.php b/lib/private/User/Listeners/UserChangedListener.php
index a561db2423dcc..7d5aca0e1c6cc 100644
--- a/lib/private/User/Listeners/UserChangedListener.php
+++ b/lib/private/User/Listeners/UserChangedListener.php
@@ -29,9 +29,6 @@
 use OCP\Files\NotFoundException;
 use OCP\IAvatarManager;
 
-/**
- * @template-implements IEventListener<UserChangedEvent>
- */
 class UserChangedListener implements IEventListener {
 	private IAvatarManager $avatarManager;
 
@@ -43,7 +40,7 @@ public function handle(Event $event): void {
 		if (!($event instanceof UserChangedEvent)) {
 			return;
 		}
-		
+
 		$user = $event->getUser();
 		$feature = $event->getFeature();
 		$oldValue = $event->getOldValue();
diff --git a/lib/public/EventDispatcher/IEventDispatcher.php b/lib/public/EventDispatcher/IEventDispatcher.php
index 0a96fa799d402..6a7f0e6348fa8 100644
--- a/lib/public/EventDispatcher/IEventDispatcher.php
+++ b/lib/public/EventDispatcher/IEventDispatcher.php
@@ -61,7 +61,7 @@ public function removeListener(string $eventName, callable $listener): void;
 	 * @param string $eventName preferably the fully-qualified class name of the Event sub class to listen for
 	 * @psalm-param string|class-string<T> $eventName preferably the fully-qualified class name of the Event sub class to listen for
 	 * @param string $className fully qualified class name (or ::class notation) of a \OCP\EventDispatcher\IEventListener that can be built by the DI container
-	 * @psalm-param class-string<\OCP\EventDispatcher\IEventListener<T>> $className fully qualified class name that can be built by the DI container
+	 * @psalm-param class-string<\OCP\EventDispatcher\IEventListener> $className fully qualified class name that can be built by the DI container
 	 * @param int $priority The higher this value, the earlier an event
 	 *                      listener will be triggered in the chain (defaults to 0)
 	 *
diff --git a/lib/public/EventDispatcher/IEventListener.php b/lib/public/EventDispatcher/IEventListener.php
index 829a8769be241..ce9fc9fe80121 100644
--- a/lib/public/EventDispatcher/IEventListener.php
+++ b/lib/public/EventDispatcher/IEventListener.php
@@ -27,13 +27,10 @@
 
 /**
  * @since 17.0.0
- *
- * @template T of Event
  */
 interface IEventListener {
 	/**
 	 * @param Event $event
-	 * @psalm-param T $event
 	 *
 	 * @since 17.0.0
 	 */