diff --git a/build/aws/build-aws/build-info.py b/build/aws/build-aws/build-info.py
index 1ea9b54bde9216cd158e4ea43eef41f06b8da1be..489362b2d17a342ac4cac0e12eeb332fa1c6858f 100644
--- a/build/aws/build-aws/build-info.py
+++ b/build/aws/build-aws/build-info.py
@@ -18,12 +18,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="")
@@ -31,7 +30,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
@@ -45,7 +43,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
@@ -56,29 +57,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/build/aws/build-aws/buildspec.yaml b/build/aws/build-aws/buildspec.yaml
index 0d3fb6cd910846782df369eed098dc728099f748..1e544b9645100d06691df3f63e222fefa3a9ff5b 100644
--- a/build/aws/build-aws/buildspec.yaml
+++ b/build/aws/build-aws/buildspec.yaml
@@ -35,12 +35,8 @@ phases:
       java: corretto17
       python: 3.12
     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
      # Install git secrets
-     #TODO temporarily adding hotfix, due to https://github.com/awslabs/git-secrets/issues/220
-     - export SAY_LOCATION=`ln -s "$(which echo)" say`
-     - export PATH="$PATH:$SAY_LOCATION"
 
      - git clone https://github.com/awslabs/git-secrets.git
      - cd git-secrets && make install && cd ..
@@ -53,10 +49,8 @@ phases:
   build:
     commands:
       - export AWS_ACCOUNT_ID=`aws sts get-caller-identity --query Account --output text`
-      - 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}
       - mkdir -p ${OUTPUT_DIR}/bin
@@ -90,12 +84,13 @@ phases:
 
       - echo "Generate build-info.json"
       - |
-        python build/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 build/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}
 artifacts:
   files:
     - "**/*"
   base-directory: "dist"
-  name: ${REPO_NAME}_${BRANCH_NAME}_$(date +%F)_${CODEBUILD_BUILD_NUMBER}.zip
+  name: ${BRANCH_NAME}/${PACKAGE_NAME}.zip