diff --git a/config/services.yaml b/config/services.yaml
index dd7e784a9..fb365761c 100644
--- a/config/services.yaml
+++ b/config/services.yaml
@@ -28,3 +28,5 @@ services:
             - '@twig'
             - []
             - '@logger'
+
+    Surfnet\ServiceProviderDashboard\Infrastructure\DashboardBundle\Security\Authentication\Session\SessionLifetimeGuard:
diff --git a/src/Surfnet/ServiceProviderDashboard/Infrastructure/DashboardBundle/EventListener/ExplicitSessionTimeoutListener.php b/src/Surfnet/ServiceProviderDashboard/Infrastructure/DashboardBundle/EventListener/ExplicitSessionTimeoutListener.php
index c3d19bd26..3493d7f86 100644
--- a/src/Surfnet/ServiceProviderDashboard/Infrastructure/DashboardBundle/EventListener/ExplicitSessionTimeoutListener.php
+++ b/src/Surfnet/ServiceProviderDashboard/Infrastructure/DashboardBundle/EventListener/ExplicitSessionTimeoutListener.php
@@ -21,8 +21,8 @@
 namespace Surfnet\ServiceProviderDashboard\Infrastructure\DashboardBundle\EventListener;
 
 use Psr\Log\LoggerInterface;
-use Surfnet\StepupSelfService\SelfServiceBundle\Security\Authentication\AuthenticatedSessionStateHandler;
-use Surfnet\StepupSelfService\SelfServiceBundle\Security\Authentication\Session\SessionLifetimeGuard;
+use Surfnet\ServiceProviderDashboard\Infrastructure\DashboardSamlBundle\Security\Authentication\AuthenticatedSessionStateHandler;
+use Surfnet\ServiceProviderDashboard\Infrastructure\DashboardSamlBundle\Security\Authentication\Session\SessionLifetimeGuard;
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
@@ -38,8 +38,8 @@
     public function __construct(
         private TokenStorageInterface            $tokenStorage,
         private AuthenticatedSessionStateHandler $authenticatedSession,
-        #[Autowire(service: 'self_service.security.authentication.session.session_lifetime_guard')]
-        private SessionLifetimeGuard             $sessionLifetimeGuard,
+        #[Autowire(service: SessionLifetimeGuard::class)]
+        private SessionLifetimeGuard           $sessionLifetimeGuard,
         private RouterInterface                  $router,
         private LoggerInterface                  $logger,
         private EventDispatcherInterface         $eventDispatcher,