diff --git a/event-listener-provider/src/main/java/org/gcube/keycloak/event/NoOpEventPublisherProvider.java b/event-listener-provider/src/main/java/org/gcube/keycloak/event/NoOpEventPublisherProvider.java
index 74ed924..73ca804 100644
--- a/event-listener-provider/src/main/java/org/gcube/keycloak/event/NoOpEventPublisherProvider.java
+++ b/event-listener-provider/src/main/java/org/gcube/keycloak/event/NoOpEventPublisherProvider.java
@@ -1,11 +1,7 @@
 package org.gcube.keycloak.event;
 
-import java.util.EventListener;
-
-import org.gcube.event.publisher.AbstractEventPublisher;
 import org.gcube.event.publisher.EventSender;
 import org.keycloak.events.Event;
-import org.keycloak.events.EventListenerProvider;
 import org.keycloak.events.admin.AdminEvent;
 
 /**
@@ -14,7 +10,7 @@ import org.keycloak.events.admin.AdminEvent;
  * @author <a href="mailto:mauro.mugnaini@nubisware.com">Mauro Mugnaini</a>
  *
  */
-public class NoOpEventPublisherProvider extends AbstractEventPublisher implements EventListenerProvider, EventListener {
+public class NoOpEventPublisherProvider extends OrchestratorEventPublisherProvider {
 
     public NoOpEventPublisherProvider() {
         super();
diff --git a/event-listener-provider/src/main/java/org/gcube/keycloak/event/OrchestratorEventPublisherProviderFactory.java b/event-listener-provider/src/main/java/org/gcube/keycloak/event/OrchestratorEventPublisherProviderFactory.java
index 8157393..a3fe72c 100644
--- a/event-listener-provider/src/main/java/org/gcube/keycloak/event/OrchestratorEventPublisherProviderFactory.java
+++ b/event-listener-provider/src/main/java/org/gcube/keycloak/event/OrchestratorEventPublisherProviderFactory.java
@@ -5,7 +5,6 @@ import java.net.URL;
 
 import org.jboss.logging.Logger;
 import org.keycloak.Config.Scope;
-import org.keycloak.events.EventListenerProvider;
 import org.keycloak.events.EventListenerProviderFactory;
 import org.keycloak.models.ClientModel;
 import org.keycloak.models.KeycloakSession;
@@ -31,7 +30,7 @@ public class OrchestratorEventPublisherProviderFactory implements EventListenerP
     public static String KEYCLOAK_CLIENT_SECRET;
 
     protected Long lastEndpointCheck = new Long(0);
-    protected EventListenerProvider oepp;
+    protected OrchestratorEventPublisherProvider oepp;
 
     public OrchestratorEventPublisherProviderFactory() {
         logger.info("New OrchestratorEventPublisherProviderFactory has been created");
@@ -42,7 +41,7 @@ public class OrchestratorEventPublisherProviderFactory implements EventListenerP
     }
 
     @Override
-    public synchronized EventListenerProvider create(KeycloakSession keycloakSession) {
+    public synchronized OrchestratorEventPublisherProvider create(KeycloakSession keycloakSession) {
         Long now = System.currentTimeMillis();
         Long elapsed = now - lastEndpointCheck;
         if (oepp == null || elapsed > CHECK_DELAY) {