diff --git a/provider/notification-aws/build-aws/buildspec.yaml b/provider/notification-aws/build-aws/buildspec.yaml
index c5c22facff40de0b23a33877bd5ce98e249cff5c..d711e43981fe8983540a77346dd79b8c8872e0d2 100644
--- a/provider/notification-aws/build-aws/buildspec.yaml
+++ b/provider/notification-aws/build-aws/buildspec.yaml
@@ -28,8 +28,8 @@ phases:
       java: corretto8
     commands:
       - if [ $(echo $CODEBUILD_SOURCE_VERSION | grep -c  ^refs/heads.*) -eq 1 ]; then echo "Branch name found"; else echo "This build only supports branch builds" && exit 1; fi
-      - apt-get update -y
-      - apt-get install -y maven
+      - apt-get update -y -qq > /dev/null
+      - apt-get install -y maven -qq >/dev/null
       - java -version
       - mvn -version
       - mkdir -p /root/.m2
@@ -56,7 +56,7 @@ phases:
       - printenv
 
       - echo "Building primary service assemblies..."
-      - mvn -B test install -pl notification-core,provider/notification-aws -Ddeployment.environment=prod
+      - mvn -ntp -B test install -pl notification-core,provider/notification-aws -Ddeployment.environment=prod
 
       - echo "Building integration testing assemblies and gathering artifacts..."
       - ./testing/notification-test-aws/build-aws/prepare-dist.sh
diff --git a/provider/notification-aws/pom.xml b/provider/notification-aws/pom.xml
index 52bb168f518abaf046e7a6e148314d72ce1d6606..afadab0411b33db848d13f379f64cdb3880b8655 100644
--- a/provider/notification-aws/pom.xml
+++ b/provider/notification-aws/pom.xml
@@ -48,7 +48,7 @@
         <dependency>
             <groupId>org.opengroup.osdu.core.aws</groupId>
             <artifactId>os-core-lib-aws</artifactId>
-            <version>0.3.14</version>
+            <version>0.3.16</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/com.amazonaws/aws-java-sdk-secretsmanager -->
diff --git a/provider/notification-aws/src/main/java/org/opengroup/osdu/notification/provider/aws/utils/AwsCognitoClient.java b/provider/notification-aws/src/main/java/org/opengroup/osdu/notification/provider/aws/utils/AwsCognitoClient.java
index d8c9fe16334706f8bb091cf866099a1a3f46b796..ea906d1eea19b18b892378e5072ac8bf5cc07bfe 100644
--- a/provider/notification-aws/src/main/java/org/opengroup/osdu/notification/provider/aws/utils/AwsCognitoClient.java
+++ b/provider/notification-aws/src/main/java/org/opengroup/osdu/notification/provider/aws/utils/AwsCognitoClient.java
@@ -79,10 +79,12 @@ public class AwsCognitoClient {
 
     public  static AWSCognitoIdentityProvider generateCognitoClient(String region)
     {
-        return AWSCognitoIdentityProviderClientBuilder.standard()
-                .withCredentials(IAMConfig.amazonAWSCredentials())
-                .withRegion(region)
-                .build();
+        if (System.getenv("AWS_COGNITO_REGION") != null) {
+            region = System.getenv("AWS_COGNITO_REGION");
+        }
+        return AWSCognitoIdentityProviderClientBuilder.standard().
+                withCredentials(IAMConfig.amazonAWSCredentials()).
+                withRegion(region).build();
     }
 
     public void setPassword(String username, String password,String userPoolId){
diff --git a/testing/notification-test-aws/src/test/java/org/opengroup/osdu/notification/util/AwsCognitoClient.java b/testing/notification-test-aws/src/test/java/org/opengroup/osdu/notification/util/AwsCognitoClient.java
index e63144347ea286fa15ebc2c4189c0a58c0c95b98..5bfb1f859fe1319f93f72bef136f58240739b7bf 100644
--- a/testing/notification-test-aws/src/test/java/org/opengroup/osdu/notification/util/AwsCognitoClient.java
+++ b/testing/notification-test-aws/src/test/java/org/opengroup/osdu/notification/util/AwsCognitoClient.java
@@ -85,9 +85,14 @@ public class AwsCognitoClient {
 
     public  static AWSCognitoIdentityProvider generateCognitoClient()
     {
-        return AWSCognitoIdentityProviderClientBuilder.standard()
-                .withCredentials(IAMConfig.amazonAWSCredentials())
-                .withRegion(AwsConfig.getAwsRegion())
-                .build();
+        String region = System.getenv("AWS_COGNITO_REGION");
+        AWSCognitoIdentityProviderClientBuilder builder = AWSCognitoIdentityProviderClientBuilder.standard()
+                .withCredentials(IAMConfig.amazonAWSCredentials());
+        if ( region!= null) {
+            builder.withRegion(region);
+        }else{
+            builder.withRegion(AwsConfig.getAwsRegion());
+        }
+        return  builder.build();
     }
 }