diff --git a/notification-core/src/main/java/org/opengroup/osdu/notification/pubsub/IPubsubHandshakeHandler.java b/notification-core/src/main/java/org/opengroup/osdu/notification/pubsub/IPubsubHandshakeHandler.java
index e8f8f043c20ea7e71457ff4c143b514c3a7b8593..bf560c3435aba580d112b44871285363d1f58158 100644
--- a/notification-core/src/main/java/org/opengroup/osdu/notification/pubsub/IPubsubHandshakeHandler.java
+++ b/notification-core/src/main/java/org/opengroup/osdu/notification/pubsub/IPubsubHandshakeHandler.java
@@ -3,7 +3,6 @@ package org.opengroup.osdu.notification.pubsub;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
 
-@Component
 public interface IPubsubHandshakeHandler {
     ResponseEntity getHandshakeResponse();
 }
diff --git a/notification-core/src/main/java/org/opengroup/osdu/notification/pubsub/IPubsubRequestBodyExtractor.java b/notification-core/src/main/java/org/opengroup/osdu/notification/pubsub/IPubsubRequestBodyExtractor.java
index 613effe1769af74039023433b383de2db1494931..1a98f88b36fbc2e3912a39e616abedcb1499012a 100644
--- a/notification-core/src/main/java/org/opengroup/osdu/notification/pubsub/IPubsubRequestBodyExtractor.java
+++ b/notification-core/src/main/java/org/opengroup/osdu/notification/pubsub/IPubsubRequestBodyExtractor.java
@@ -5,7 +5,6 @@ import org.springframework.http.ResponseEntity;
 
 import java.util.Map;
 
-@Component
 public interface IPubsubRequestBodyExtractor {
     Map<String, String> extractAttributesFromRequestBody() ;
 
diff --git a/provider/notification-azure/src/main/java/org/opengroup/osdu/notification/provider/azure/pubsub/PubsubHandshakeHandler.java b/provider/notification-azure/src/main/java/org/opengroup/osdu/notification/provider/azure/pubsub/PubsubHandshakeHandler.java
deleted file mode 100644
index 88c21efd3ecd8cdb1a4989c0cd793c4da275b107..0000000000000000000000000000000000000000
--- a/provider/notification-azure/src/main/java/org/opengroup/osdu/notification/provider/azure/pubsub/PubsubHandshakeHandler.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.opengroup.osdu.notification.provider.azure.pubsub;
-
-import org.opengroup.osdu.notification.pubsub.IPubsubHandshakeHandler;
-import org.springframework.http.ResponseEntity;
-
-public class PubsubHandshakeHandler implements IPubsubHandshakeHandler {
-
-    @Override
-    public ResponseEntity getHandshakeResponse() {
-        return null;
-    }
-}
diff --git a/provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/pubsub/PubsubHandshakeHandler.java b/provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/pubsub/PubsubHandshakeHandler.java
index 33b9b156267067c7bf003c2d87d1fd859e461882..55f9890392dcc22f597ae773e63eb5bcd3a960d4 100644
--- a/provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/pubsub/PubsubHandshakeHandler.java
+++ b/provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/pubsub/PubsubHandshakeHandler.java
@@ -1,8 +1,12 @@
 package org.opengroup.osdu.notification.provider.gcp.pubsub;
 
 import org.opengroup.osdu.notification.pubsub.IPubsubHandshakeHandler;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Component;
 
+@Component
+@Lazy
 public class PubsubHandshakeHandler implements IPubsubHandshakeHandler {
 
     @Override