diff --git a/provider/storage-aws/build-aws/buildspec.yaml b/provider/storage-aws/build-aws/buildspec.yaml
index 50f747611855b1a91066e6e648d8c3df1a2ab503..a94e63b00ec587f97011693faf3b8fd1c34edcda 100644
--- a/provider/storage-aws/build-aws/buildspec.yaml
+++ b/provider/storage-aws/build-aws/buildspec.yaml
@@ -54,7 +54,9 @@ phases:
   pre_build:
     commands:
       - echo "Logging in to Amazon ECR..."
-      - $(aws ecr get-login --no-include-email --region $AWS_REGION) # authenticate with ECR via the AWS CLI
+      - aws ecr get-login-password --region us-east-1 | docker login --username AWS --password-stdin ${ECR_REGISTRY}
+      - echo "Logging into Docker Hub..."
+      - docker login -u ${DOCKER_USERNAME} -p ${DOCKER_PASSWORD}
   build:
     commands:
       - export REPO_NAME=${PWD##*/}
@@ -85,9 +87,6 @@ phases:
       - echo "--Copying Helm Charts to ${OUTPUT_DIR:-dist}--"
       - rsync -r devops/aws/* "${OUTPUT_DIR:-dist}"
 
-      - echo "Logging into Docker Hub..."
-      - docker login -u ${DOCKER_USERNAME} -p ${DOCKER_PASSWORD}
-
       - echo "Building docker image..."
       - docker build -f provider/storage-aws/build-aws/Dockerfile -t ${ECR_IMAGE} .
       - docker tag  ${ECR_IMAGE} ${ECR_IMAGE_BRANCH_LATEST}
@@ -102,7 +101,7 @@ phases:
           --artifact ${ECR_IMAGE}
   post_build:
     commands:
-      - cp provider/storage-aws/target/dependency-check-report.html ${OUTPUT_DIR}
+      - # cp provider/storage-aws/target/dependency-check-report.html ${OUTPUT_DIR}
 reports:
   SurefireReports: # CodeBuild will create a report group called "SurefireReports".
     files: #Store all of the files
diff --git a/provider/storage-aws/build-aws/entrypoint.sh b/provider/storage-aws/build-aws/entrypoint.sh
index 6b4b3b53fb4aef0c5cccc4d6994788af69506e50..51ad952cfaf3f739101525c913a49b3f222432be 100755
--- a/provider/storage-aws/build-aws/entrypoint.sh
+++ b/provider/storage-aws/build-aws/entrypoint.sh
@@ -1 +1 @@
-java $JAVA_OPTS -jar /app.jar
\ No newline at end of file
+java $JAVA_OPTS --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED -jar /app.jar
\ No newline at end of file
diff --git a/provider/storage-aws/pom.xml b/provider/storage-aws/pom.xml
index 0ce9e670adbf311e7100c9667cd2c0e397e71c70..9cafe4da1dbb1268e79f6ed66dccbae95f87d100 100644
--- a/provider/storage-aws/pom.xml
+++ b/provider/storage-aws/pom.xml
@@ -69,7 +69,7 @@
         <dependency>
             <groupId>org.opengroup.osdu.core.aws</groupId>
             <artifactId>os-core-lib-aws</artifactId>
-            <version>0.21.0-rc5</version>
+            <version>0.23.0-rc2</version>
         </dependency>
         <dependency>
             <groupId>org.opengroup.osdu</groupId>