diff --git a/scripts/travis/copy_ags_to_release_bucket.sh b/scripts/travis/copy_ags_to_release_bucket.sh
index 5f5a0bcd0..905026623 100644
--- a/scripts/travis/copy_ags_to_release_bucket.sh
+++ b/scripts/travis/copy_ags_to_release_bucket.sh
@@ -17,11 +17,7 @@ DESTINATION="s3://eu.dl.alfresco.com/release/community/RM/${RELEASE_VERSION}"
 
 printf "\n%s\n%s\n" "${SOURCE}" "${DESTINATION}"
 
-aws s3 cp --acl private \
-  "${SOURCE}/alfresco-governance-services-community-${RELEASE_VERSION}.zip" \
-  "${DESTINATION}/alfresco-governance-services-community-${RELEASE_VERSION}.zip"
-
+aws s3 cp --acl private --recursive "${SOURCE}" "${DESTINATION}"
 
 set +vex
 echo "=========================== Finishing Copy to Release Bucket Script =========================="
-
diff --git a/scripts/travis/copy_to_release_bucket.sh b/scripts/travis/copy_to_release_bucket.sh
index e613476dc..a9eff092e 100755
--- a/scripts/travis/copy_to_release_bucket.sh
+++ b/scripts/travis/copy_to_release_bucket.sh
@@ -17,15 +17,7 @@ DESTINATION="s3://eu.dl.alfresco.com/release/community/${RELEASE_VERSION}-build-
 
 printf "\n%s\n%s\n" "${SOURCE}" "${DESTINATION}"
 
-aws s3 cp --acl private \
-  "${SOURCE}/alfresco.war" \
-  "${DESTINATION}/alfresco.war"
-
-aws s3 cp --acl private \
-  "${SOURCE}/alfresco-content-services-community-distribution-${RELEASE_VERSION}.zip" \
-  "${DESTINATION}/alfresco-content-services-community-distribution-${RELEASE_VERSION}.zip"
-
+aws s3 cp --acl private --recursive "${SOURCE}" "${DESTINATION}"
 
 set +vex
 echo "=========================== Finishing Copy to Release Bucket Script =========================="
-
diff --git a/scripts/travis/prepare_staging_deploy.sh b/scripts/travis/prepare_staging_deploy.sh
index 97867fb55..ff98376e7 100755
--- a/scripts/travis/prepare_staging_deploy.sh
+++ b/scripts/travis/prepare_staging_deploy.sh
@@ -16,7 +16,15 @@ mkdir -p deploy_dir
 cp distribution/target/alfresco.war deploy_dir
 cp distribution/target/*-distribution*.zip deploy_dir
 # Create third party license csv file and add it to the deploy directory.
-python3 ./third-party-license-overrides/thirdPartyLicenseCSVCreator.py --project "`pwd`" --version "${VERSION}" --combined --output "deploy_dir"
+unzip deploy_dir/*-distribution*.zip -d deploy_dir/community-acs
+zippaths=""
+for file in `find deploy_dir/community-acs -name "*.amp" -o -name "*.war" -not -name "ROOT.war" -not -name "_vti_bin.war"`
+do
+    zippaths+="$file|"
+done
+zippaths=${zippaths::-1}
+python3 ./third-party-license-overrides/thirdPartyLicenseCSVCreator.py --zippaths "${zippaths}" --version "${VERSION}" --combined --output "deploy_dir"
+rm -rf deploy_dir/community-acs
 echo "Local deploy directory content:"
 ls -lA deploy_dir