diff --git a/provider/legal-aws/build-aws/build-info.py b/provider/legal-aws/build-aws/build-info.py
index 5112d1231b073facd7ee2471986844e5e1701e03..f6933ba1d42883325afd9aeafe1b8ccb69490729 100644
--- a/provider/legal-aws/build-aws/build-info.py
+++ b/provider/legal-aws/build-aws/build-info.py
@@ -19,12 +19,11 @@ import argparse
 
 # Create the build-info.json
 parser = argparse.ArgumentParser(description="")
-
-# env - CODEBUILD_SOURCE_VERSION
 parser.add_argument("--branch", type=str, help="")
-
-# env - CODEBUILD_RESOLVED_SOURCE_VERSION
-parser.add_argument("--commit", type=str,  help="")
+parser.add_argument("--commitId", type=str,  help="")
+parser.add_argument("--commitMessage", type=str,  help="")
+parser.add_argument("--commitAuthor", type=str,  help="")
+parser.add_argument("--commitDate", type=str,  help="")
 
 # env - CODEBUILD_BUILD_ID
 parser.add_argument("--buildid", type=str,  help="")
@@ -32,7 +31,6 @@ parser.add_argument("--buildid", type=str,  help="")
 # env - CODEBUILD_BUILD_NUMBER
 parser.add_argument("--buildnumber", type=str,  help="")
 
-# Get from directory name
 parser.add_argument("--reponame", type=str,  help="")
 
 # env OUTPUT_DIR
@@ -46,7 +44,10 @@ parser.add_argument("--artifact", type=str, action="append", help="")
 args = parser.parse_args()
 
 branch = args.branch
-commitId = args.commit
+commitId = args.commitId
+commitMessage = args.commitMessage
+commitAuthor = args.commitAuthor
+commitDate = args.commitDate
 buildId = args.buildid
 buildNumber = args.buildnumber
 repoName = args.reponame
@@ -57,29 +58,16 @@ buildInfoFilePath = os.path.join(".", outputDir, "build-info.json")
 
 print(buildInfoFilePath)
 
-commitArgs = {
-    "repositoryName": repoName,
-    "commitId": commitId
-}
-
-commitDetail = {
-    "commit": ""
-}
-
-# get the commit detail
-try:
-    codecommit = boto3.client("codecommit")
-    commitDetail = codecommit.get_commit(**commitArgs)
-except Exception as e:
-    print("Getting commit information from codecommit failed")
-
 buildInfo = {
     "branch": branch,
     "build-id": buildId,
     "build-number": buildNumber,
     "repo": repoName,
     "artifacts": artifacts,
-    "commit": commitDetail["commit"]
+    "commit-id": commitId,
+    "commit-message": commitMessage,
+    "commit-author": commitAuthor,
+    "commit-date":commitDate
 }
 print(json.dumps(buildInfo, sort_keys=True, indent=4))
 
diff --git a/provider/legal-aws/build-aws/buildspec.yaml b/provider/legal-aws/build-aws/buildspec.yaml
index c11be1da91bafa8feb60ed6c2e15f77acbdaa916..fa4a63c06c45ba4133b4598e7bc8ee6dd9151e69 100644
--- a/provider/legal-aws/build-aws/buildspec.yaml
+++ b/provider/legal-aws/build-aws/buildspec.yaml
@@ -30,7 +30,6 @@ phases:
     runtime-versions:
       java: corretto17
     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
       - java -version
       - mvn -version
       # - mvn -B clean # .m2 is not created until the first Maven command
@@ -47,10 +46,8 @@ phases:
       - aws ecr get-login-password --region us-east-1 | docker login --username AWS --password-stdin ${ECR_REGISTRY}
   build:
     commands:
-      - export REPO_NAME=${PWD##*/}
       - export OUTPUT_DIR="dist"
-      - export BRANCH_NAME=`echo ${CODEBUILD_SOURCE_VERSION} | awk '{gsub("refs/heads/","");gsub("\\.","-");gsub("[[:space:]]","-")}1' | sed 's/\//-/g' | awk '{print tolower($0)}'`
-      - export ECR_TAG=`echo build.${BRANCH_NAME}.${CODEBUILD_BUILD_NUMBER}.${CODEBUILD_RESOLVED_SOURCE_VERSION} | cut -c 1-120`
+      - export ECR_TAG=`echo build.${BRANCH_NAME}.${CODEBUILD_BUILD_NUMBER}.${COMMIT_ID} | cut -c 1-120`
       - export ECR_IMAGE=${ECR_REGISTRY}:${ECR_TAG}
       - export ECR_IMAGE_BRANCH_LATEST=${ECR_REGISTRY}:${BRANCH_NAME}
       - export INTEGRATION_TEST_OUTPUT=${OUTPUT_DIR}/testing/integration
@@ -79,9 +76,10 @@ phases:
 
       - echo "Generate build-info.json"
       - |
-        python provider/legal-aws/build-aws/build-info.py --branch ${CODEBUILD_SOURCE_VERSION} --commit ${CODEBUILD_RESOLVED_SOURCE_VERSION} \
-          --buildid ${CODEBUILD_BUILD_ID} --buildnumber ${CODEBUILD_BUILD_NUMBER} --reponame ${REPO_NAME} --outdir ${OUTPUT_DIR} \
-          --artifact ${ECR_IMAGE}
+        python provider/legal-aws/build-aws/build-info.py --branch ${BRANCH_NAME} --commitId ${COMMIT_ID} \
+        --commitMessage "\"${COMMIT_MESSAGE}\"" --commitAuthor "\"${COMMIT_AUTHOR}\"" --commitDate "\"${COMMIT_DATE}\"" \
+        --buildid ${CODEBUILD_BUILD_ID} --buildnumber ${CODEBUILD_BUILD_NUMBER} --reponame ${REPO_NAME} --outdir ${OUTPUT_DIR} \
+        --artifact ${ECR_IMAGE}
 
 reports:
   SurefireReports: # CodeBuild will create a report group called "SurefireReports".
@@ -93,7 +91,7 @@ artifacts:
   files:
     - "**/*"
   base-directory: "dist"
-  name: ${REPO_NAME}_${BRANCH_NAME}_$(date +%F)_${CODEBUILD_BUILD_NUMBER}.zip
+  name: ${BRANCH_NAME}/${PACKAGE_NAME}.zip
 cache:
   paths:
     - "/root/.m2/**/*"