diff --git a/Classes/Hook/UserAuthentication.php b/Classes/EventListener/LogoutListener.php
similarity index 69%
rename from Classes/Hook/UserAuthentication.php
rename to Classes/EventListener/LogoutListener.php
index 645be1f..70201d0 100644
--- a/Classes/Hook/UserAuthentication.php
+++ b/Classes/EventListener/LogoutListener.php
@@ -1,7 +1,9 @@
 <?php
 
-namespace Visol\ShibbolethAuth\Hook;
+namespace Visol\ShibbolethAuth\EventListener;
 
+use TYPO3\CMS\Core\Attribute\AsEventListener;
+use TYPO3\CMS\Core\Authentication\Event\AfterUserLoggedOutEvent;
 use TYPO3\CMS\Core\Utility\StringUtility;
 
 /**
@@ -17,10 +19,13 @@
  * The TYPO3 project - inspiring people to share!
  */
 
-class UserAuthentication
+#[AsEventListener(
+    identifier: 'shibboleth-auth/logout-listener',
+)]
+final readonly class LogoutListener
 {
 
-    public function backendLogoutHandler()
+    public function __invoke(AfterUserLoggedOutEvent $event): void
     {
         // Delete the Shibboleth session cookie
         foreach ($_COOKIE as $name => $value) {
diff --git a/ext_localconf.php b/ext_localconf.php
index 587857c..e2f155b 100644
--- a/ext_localconf.php
+++ b/ext_localconf.php
@@ -3,7 +3,6 @@
 use Visol\ShibbolethAuth\Controller\FrontendLoginController;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Configuration\ExtensionConfiguration;
-use Visol\ShibbolethAuth\Hook\UserAuthentication;
 use Visol\ShibbolethAuth\LoginProvider\ShibbolethLoginProvider;
 use TYPO3\CMS\Extbase\Utility\ExtensionUtility;
 use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
@@ -23,10 +22,6 @@
 
         $GLOBALS['TYPO3_CONF_VARS']['SVCONF']['auth']['setup']['BE_fetchUserIfNoSession'] = $extensionConfiguration['BE_fetchUserIfNoSession'];
 
-        // Register backend logout handler
-        // TODO: Replace with https://docs.typo3.org/permalink/t3coreapi:afteruserloggedoutevent
-        $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_userauth.php']['logoff_post_processing'][] = UserAuthentication::class . '->backendLogoutHandler';
-
         $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['backend']['loginProviders'][1518433441] = [
             'provider' => ShibbolethLoginProvider::class,
             'sorting' => 60,