diff --git a/notification-core/src/main/java/org/opengroup/osdu/notification/api/PubsubEndpoint.java b/notification-core/src/main/java/org/opengroup/osdu/notification/api/PubsubEndpoint.java
index edbce0c44ab6f27f5a949bd58240db67ca2ef2e0..bfe12ea15cd875a091ea47f00c6d885d2f3aee91 100644
--- a/notification-core/src/main/java/org/opengroup/osdu/notification/api/PubsubEndpoint.java
+++ b/notification-core/src/main/java/org/opengroup/osdu/notification/api/PubsubEndpoint.java
@@ -154,6 +154,10 @@ public class PubsubEndpoint {
     }
 
     private String querySubscriptionAndUpdateCache(String notificationId) throws Exception {
+        Map<String,String> hmap = headers.getHeaders();
+        String auth_header = hmap.get("authorization");
+        System.out.println("Notification token before creating subscription service= "+auth_header);
+
         ISubscriptionService service = subscriptionFactory.create(headers);
 
         List<Subscription> subscriptionList = service.query(notificationId);
diff --git a/provider/notification-aws/src/main/java/org/opengroup/osdu/notification/provider/aws/impl/ServiceAccountJwtAwsClientImpl.java b/provider/notification-aws/src/main/java/org/opengroup/osdu/notification/provider/aws/impl/ServiceAccountJwtAwsClientImpl.java
index 02e2b91e7f64abc56a6ecafa648183337e4fe2df..7fe6b354a3a321f50fe57a0dc478306c4cbbf53e 100644
--- a/provider/notification-aws/src/main/java/org/opengroup/osdu/notification/provider/aws/impl/ServiceAccountJwtAwsClientImpl.java
+++ b/provider/notification-aws/src/main/java/org/opengroup/osdu/notification/provider/aws/impl/ServiceAccountJwtAwsClientImpl.java
@@ -105,6 +105,7 @@ public class ServiceAccountJwtAwsClientImpl implements IServiceAccountJwtClient
     @Override
     public String getIdToken(String s) {
         String token=  sp.getServicePrincipalAccessToken(client_credentials_clientid,client_credentials_secret);
+        System.out.println("This is the client credentials token = " + token);
         return token;
     }