diff --git a/NOTICE b/NOTICE
index c24c2db2a346f53bad350064a21920cd174d4229..703b40825112d1e1863bb6fed41dc46f05aadf13 100644
--- a/NOTICE
+++ b/NOTICE
@@ -79,7 +79,7 @@ The following software have components provided under the terms of this license:
 - Apache HttpCore (from http://hc.apache.org/httpcomponents-core-ga, http://hc.apache.org/httpcomponents-core-ga/, http://hc.apache.org/httpcomponents-core/)
 - Apache Log4j API (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-api)
 - Apache Log4j Core (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-core)
-- Apache Log4j JUL Handler (from https://logging.apache.org/log4j/3.x/)
+- Apache Log4j JUL Handler (from https://logging.apache.org/log4j/3.x/, https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-jul)
 - Apache Log4j SLF4J Binding (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-slf4j-impl)
 - Apache Log4j to SLF4J Adapter (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-to-slf4j)
 - AssertJ Core (from https://assertj.github.io/doc/#assertj-core)
diff --git a/notification-core-plus/src/main/java/org/opengroup/osdu/notification/CorePlusApplication.java b/notification-core-plus/src/main/java/org/opengroup/osdu/notification/CorePlusApplication.java
index 940fb9054d5c83f540474932204d8a697740eb9d..9aa9c5dd0eab107e768dd91323bbdc26b16b2a9a 100644
--- a/notification-core-plus/src/main/java/org/opengroup/osdu/notification/CorePlusApplication.java
+++ b/notification-core-plus/src/main/java/org/opengroup/osdu/notification/CorePlusApplication.java
@@ -16,14 +16,22 @@
 
 package org.opengroup.osdu.notification;
 
+import org.opengroup.osdu.notification.api.PubsubEndpoint;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.FilterType;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.scheduling.annotation.EnableAsync;
 
 @SpringBootApplication
-@ComponentScan(value = {"org.opengroup.osdu"})
+@ComponentScan(value = {"org.opengroup.osdu"}, excludeFilters = {
+		@ComponentScan.Filter(
+				type = FilterType.ASSIGNABLE_TYPE,
+				value = {
+						PubsubEndpoint.class
+			})
+})
 @EnableAsync
 @PropertySource("classpath:swagger.properties")
 public class CorePlusApplication {
diff --git a/provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/GcApplication.java b/provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/GcApplication.java
index 26f748dea6d1daaf3474096431c938714514d53a..be0a5cc8af1c42e07b5102b82a3bdbc5c3dbbf3a 100644
--- a/provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/GcApplication.java
+++ b/provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/GcApplication.java
@@ -16,6 +16,7 @@
 
 package org.opengroup.osdu.notification.provider.gcp;
 
+import org.opengroup.osdu.notification.api.PubsubEndpoint;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.ComponentScan;
@@ -26,6 +27,11 @@ import org.springframework.scheduling.annotation.EnableAsync;
 
 @SpringBootApplication
 @ComponentScan(value = {"org.opengroup.osdu"}, excludeFilters = {
+		@Filter(
+				type = FilterType.ASSIGNABLE_TYPE,
+				value = {
+						PubsubEndpoint.class
+				}),
 		@Filter(
 				type = FilterType.REGEX,
 				pattern = {"org.opengroup.osdu.core.gcp.multitenancy.StorageFactory"}