diff --git a/.project_automation/functional_tests/entrypoint.sh b/.project_automation/functional_tests/entrypoint.sh
index fbb9a54..d83ecf6 100755
--- a/.project_automation/functional_tests/entrypoint.sh
+++ b/.project_automation/functional_tests/entrypoint.sh
@@ -30,7 +30,8 @@ run_test() {
     echo $AWS_DEFAULT_REGION
     unset AWS_DEFAULT_REGION
     echo $AWS_DEFAULT_REGION
-    taskcat test run -t $1
+    taskcat test run -n -t $1
+    .project_automation/functional_tests/scoutsuite/scoutsuite.sh
 }
 
 acct_id=$(aws sts get-caller-identity --output text --query 'Account')
diff --git a/.project_automation/functional_tests/entrypoint.sh.rej b/.project_automation/functional_tests/entrypoint.sh.rej
deleted file mode 100644
index b991fd7..0000000
--- a/.project_automation/functional_tests/entrypoint.sh.rej
+++ /dev/null
@@ -1,15 +0,0 @@
-diff a/.project_automation/functional_tests/entrypoint.sh b/.project_automation/functional_tests/entrypoint.sh	(rejected hunks)
-@@ -9,2 +9,13 @@ cd ${PROJECT_PATH}
- 
-+export AWS_DEFAULT_REGION='us-east-1'
-+
-+aws ec2 describe-regions --query 'Regions[?OptInStatus==`opt-in-not-required`].RegionName' --output text | xargs -n 1 | while read dn
-+do
-+    echo "Cleanup running in region: $dn"
-+    export AWS_DEFAULT_REGION=$dn
-+    python3 scripts/cleanup_config.py -C scripts/cleanup_config.json
-+done
-+
-+unset AWS_DEFAULT_REGION
-+
- # Run taskcat e2e test
diff --git a/.project_automation/functional_tests/entrypoint_scotsuite.sh b/.project_automation/functional_tests/entrypoint_scotsuite.sh
deleted file mode 100755
index c8a574f..0000000
--- a/.project_automation/functional_tests/entrypoint_scotsuite.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/bash -ex
-
-
-## NOTE: paths may differ when running in a managed task. To ensure behavior is consistent between
-# managed and local tasks always use these variables for the project and project type path
-PROJECT_PATH=${BASE_PATH}/project
-PROJECT_TYPE_PATH=${BASE_PATH}/projecttype
-
-cd ${PROJECT_PATH}
-
-regions=(us-east-1 us-east-2 us-west-2 us-west-1)
-for region in ${regions[@]}
-do
-    echo "Cleanup running in region: $region"
-    export AWS_DEFAULT_REGION=$region
-    python3 scripts/cleanup_config.py -C scripts/cleanup_config.json
-done
-
-echo $AWS_DEFAULT_REGION
-unset AWS_DEFAULT_REGION
-
-echo $AWS_DEFAULT_REGION
-# Run taskcat e2e test without deleting resources
-taskcat test run -n
-#Create Scoutsuite security scan custom rule
-python3 .project_automation/functional_tests/create-scoutsuite-custom-rule.py
-# Execute Scoutsuite security scan
-scout aws -r us-east-1 --ruleset .project_automation/functional_tests/abi-scoutsuite-custom-ruleset.json --no-browser --max-rate 5 --max-workers 5
-# Upload Scoutsuite security scan results to S3 bucket named scoutsuite-results-aws-AWS-ACCOUNT-ID
-python3 .project_automation/functional_tests/process-scoutsuite-report.py
-# Delete taskcat e2e test resources
-taskcat test clean ALL
-# Check Scoutsuite security scan result for Danger level findings (Non-0 exit code)
-scoutsuite_sysout_result=$(cat scoutsuite_sysout.txt)
-rm scoutsuite_sysout.txt
-if [ "$scoutsuite_sysout_result" -ne 0 ]; then
-    # The value is non-zero, indicating Scoutsuite report needs to be checked for security issues
-    exit 1 
-fi
-
-#sleep 1800 
-#Use the command above to allow for a sleep timer buffer between sequential execution of Taskcat so that the Cloudformation resources from the previous Taskcat execution can be fully deleted until this is fixed in https://github.com/aws-ia/taskcat/issues/809
-
-## Executing ash tool
-
-#find ${PROJECT_PATH} -name lambda.zip -exec rm -rf {} \;
-
-#git clone https://github.com/aws-samples/automated-security-helper.git /tmp/ash
-
-# Set the repo path in your shell for easier access
-#export PATH=$PATH:/tmp/ash
-
-#ash --source-dir .
-#cat aggregated_results.txt
-
diff --git a/.project_automation/functional_tests/abi-cloudtrail-no-encryption-with-kms.json b/.project_automation/functional_tests/scoutsuite/abi-cloudtrail-no-encryption-with-kms.json
similarity index 100%
rename from .project_automation/functional_tests/abi-cloudtrail-no-encryption-with-kms.json
rename to .project_automation/functional_tests/scoutsuite/abi-cloudtrail-no-encryption-with-kms.json
diff --git a/.project_automation/functional_tests/abi-iam-assume-role-lacks-external-id-and-mfa.json b/.project_automation/functional_tests/scoutsuite/abi-iam-assume-role-lacks-external-id-and-mfa.json
similarity index 100%
rename from .project_automation/functional_tests/abi-iam-assume-role-lacks-external-id-and-mfa.json
rename to .project_automation/functional_tests/scoutsuite/abi-iam-assume-role-lacks-external-id-and-mfa.json
diff --git a/.project_automation/functional_tests/abi-scoutsuite-custom-ruleset.json b/.project_automation/functional_tests/scoutsuite/abi-scoutsuite-custom-ruleset.json
similarity index 98%
rename from .project_automation/functional_tests/abi-scoutsuite-custom-ruleset.json
rename to .project_automation/functional_tests/scoutsuite/abi-scoutsuite-custom-ruleset.json
index 5558b3a..8504d09 100644
--- a/.project_automation/functional_tests/abi-scoutsuite-custom-ruleset.json
+++ b/.project_automation/functional_tests/scoutsuite/abi-scoutsuite-custom-ruleset.json
@@ -1,5 +1,5 @@
 {
-    "about": "This is a simplified ruleset intended for use by CDO Securtiy Certifiers and is maintained by Amazon's CloudSecurity team.",
+    "about": "This is a simplified ruleset intended for use with AWS ABI test environments.",
     "rules": {
         "cloudtrail-not-configured.json": [
             {
diff --git a/.project_automation/functional_tests/create-scoutsuite-custom-rule.py b/.project_automation/functional_tests/scoutsuite/create-scoutsuite-custom-rule.py
similarity index 96%
rename from .project_automation/functional_tests/create-scoutsuite-custom-rule.py
rename to .project_automation/functional_tests/scoutsuite/create-scoutsuite-custom-rule.py
index 26d0e4a..2941192 100644
--- a/.project_automation/functional_tests/create-scoutsuite-custom-rule.py
+++ b/.project_automation/functional_tests/scoutsuite/create-scoutsuite-custom-rule.py
@@ -40,7 +40,7 @@ def create_scoutsuite_custom_rule_file(file_name):
     if not os.path.exists(scoutsuite_cloudtrail_json_file_path):
         # If the file does not exist, create it   
         # Source path
-        src = '.project_automation/functional_tests/'+file_name
+        src = '.project_automation/functional_tests/scoutsuite/'+file_name
         copy_file(src, scoutsuite_cloudtrail_json_file_path)
     else:
         logging.info(f'File {scoutsuite_cloudtrail_json_file_path} already exists')
diff --git a/.project_automation/functional_tests/lambda_functions/source/lambda_s3_presignedurl/lambda_function.py b/.project_automation/functional_tests/scoutsuite/lambda_functions/source/lambda_s3_presignedurl/lambda_function.py
similarity index 100%
rename from .project_automation/functional_tests/lambda_functions/source/lambda_s3_presignedurl/lambda_function.py
rename to .project_automation/functional_tests/scoutsuite/lambda_functions/source/lambda_s3_presignedurl/lambda_function.py
diff --git a/.project_automation/functional_tests/lambda_functions/source/lambda_s3_presignedurl/requirements.txt b/.project_automation/functional_tests/scoutsuite/lambda_functions/source/lambda_s3_presignedurl/requirements.txt
similarity index 100%
rename from .project_automation/functional_tests/lambda_functions/source/lambda_s3_presignedurl/requirements.txt
rename to .project_automation/functional_tests/scoutsuite/lambda_functions/source/lambda_s3_presignedurl/requirements.txt
diff --git a/.project_automation/functional_tests/lambda_s3_presignedurl.yaml b/.project_automation/functional_tests/scoutsuite/lambda_s3_presignedurl.yaml
similarity index 100%
rename from .project_automation/functional_tests/lambda_s3_presignedurl.yaml
rename to .project_automation/functional_tests/scoutsuite/lambda_s3_presignedurl.yaml
diff --git a/.project_automation/functional_tests/process-scoutsuite-report.py b/.project_automation/functional_tests/scoutsuite/process-scoutsuite-report.py
similarity index 97%
rename from .project_automation/functional_tests/process-scoutsuite-report.py
rename to .project_automation/functional_tests/scoutsuite/process-scoutsuite-report.py
index aedb607..c7e15db 100755
--- a/.project_automation/functional_tests/process-scoutsuite-report.py
+++ b/.project_automation/functional_tests/scoutsuite/process-scoutsuite-report.py
@@ -81,7 +81,7 @@ def create_lambda_s3_presignedurl():
     '''Function that creates the Lambda function that generates S3 presigned URLs'''
 
     # Create the ZIP deployment package for Lambda
-    lambda_zipped_code = zip_folder_to_bytesio('./.project_automation/functional_tests/lambda_functions/source/lambda_s3_presignedurl')
+    lambda_zipped_code = zip_folder_to_bytesio('./.project_automation/functional_tests/scoutsuite/lambda_functions/source/lambda_s3_presignedurl')
     lambda_zipped_code.seek(0) # Reset the cursor of the BytesIO object to the beginning
 
     s3_client = session.client('s3')
@@ -95,7 +95,7 @@ def create_lambda_s3_presignedurl():
     # Use the session to create a client for CloudFormation
     cf_client = session.client('cloudformation')
 
-    with open('./.project_automation/functional_tests/lambda_s3_presignedurl.yaml', 'r') as file:
+    with open('./.project_automation/functional_tests/scoutsuite/lambda_s3_presignedurl.yaml', 'r') as file:
         template_body = file.read()
     # Check if the stack already exists
     try:
@@ -277,6 +277,8 @@ def upload_scoutsuite_results_zip_to_s3(scoutsuite_zip_file_path, zip_name):
         s3_file_with_key = time_key + '-' + zip_name
         # Upload the Scoutsuite results zip to an S3 bucket
         s3.upload_file(scoutsuite_zip_file_path, bucket_name, s3_file_with_key)
+        with open("scoutsuite_s3_filename.txt", "w") as file:
+            file.write(str(s3_file_with_key))   
 
     except ClientError as error:
         logging.exception (error)
diff --git a/.project_automation/functional_tests/scoutsuite/scoutsuite.sh b/.project_automation/functional_tests/scoutsuite/scoutsuite.sh
new file mode 100755
index 0000000..1cad0e2
--- /dev/null
+++ b/.project_automation/functional_tests/scoutsuite/scoutsuite.sh
@@ -0,0 +1,40 @@
+#!/bin/bash -ex
+
+
+## NOTE: paths may differ when running in a managed task. To ensure behavior is consistent between
+# managed and local tasks always use these variables for the project and project type path
+PROJECT_PATH=${BASE_PATH}/project
+PROJECT_TYPE_PATH=${BASE_PATH}/projecttype
+
+cd ${PROJECT_PATH}
+
+# Retrieve the AWS account ID and store it in a variable
+AWS_ACCOUNT_ID=$(aws sts get-caller-identity --query "Account" --output text)
+
+run_scoutsuite() {
+    #Create Scoutsuite security scan custom rule
+    python3 .project_automation/functional_tests/scoutsuite/create-scoutsuite-custom-rule.py
+    # Execute Scoutsuite security scan
+    scout aws -r us-east-1 --ruleset .project_automation/functional_tests/scoutsuite/abi-scoutsuite-custom-ruleset.json --no-browser --max-rate 5 --max-workers 5 -f
+    # Upload Scoutsuite security scan results to S3 bucket named scoutsuite-results-aws-AWS-ACCOUNT-ID
+    python3 .project_automation/functional_tests/scoutsuite/process-scoutsuite-report.py
+    # Delete taskcat e2e test resources
+    taskcat test clean ALL
+    process_scoutsuite_report
+}
+
+process_scoutsuite_report() {
+    # Check Scoutsuite security scan result for Danger level findings (Non-0 exit code)
+    scoutsuite_sysout_result=$(cat scoutsuite_sysout.txt)
+    scoutsuite_s3_filename=$(cat scoutsuite_s3_filename.txt)
+    rm scoutsuite_sysout.txt
+    rm scoutsuite_s3_filename.txt
+    if [ "$scoutsuite_sysout_result" -ne 0 ]; then       
+        # The value is non-zero, indicating Scoutsuite report needs to be checked for security issues
+        echo "Scoutsuite report contains security issues. For details please check the log messages above or the file $scoutsuite_s3_filename in the S3 bucket named scoutsuite-results-aws-$AWS_ACCOUNT_ID in the AWS test account provided by the ABI team."
+        exit 1 
+    fi
+}
+
+#Run Scoutsuite security test
+run_scoutsuite
\ No newline at end of file
diff --git a/.project_automation/publication/entrypoint.sh b/.project_automation/publication/entrypoint.sh
index 0569f74..be5e31f 100755
--- a/.project_automation/publication/entrypoint.sh
+++ b/.project_automation/publication/entrypoint.sh
@@ -14,7 +14,7 @@ REPO_NAME=$(git config --get remote.origin.url | cut -d '/' -f5 | cut -d '.' -f1
 VERSION=$(cat VERSION)
 
 BASE_URL="this would be the path to s3 bucket/${REPO_NAME}/"
-S3_URI="s3://aws-abi-pilot/guide/${REPO_NAME}/"
+S3_URI="s3://aws-abi/guide/${REPO_NAME}/"
 
 print_header() {
   printf "\n\n%s\n" "$*"
@@ -36,7 +36,7 @@ printf "\nPublished at ${BASE_URL}\n"
 
 cd ${PROJECT_PATH}
 
-taskcat upload --bucket-name aws-abi-pilot --object-acl public-read
+taskcat upload --bucket-name aws-abi --object-acl public-read
 
 # if [ -n "${BASE_PATH}" ]
 # then
diff --git a/templates/enable_integrations/partner1-enable-integrations.yaml b/templates/enable_integrations/partner1-enable-integrations.yaml
index 8c7e1e9..1753ca9 100644
--- a/templates/enable_integrations/partner1-enable-integrations.yaml
+++ b/templates/enable_integrations/partner1-enable-integrations.yaml
@@ -244,6 +244,10 @@ Resources:
             Action: s3:GetObject
             Principal: '*'
             Resource: !Sub arn:${AWS::Partition}:s3:::${rABIStagingS3Bucket}/*
+            Condition:
+              ArnLike:
+                aws:PrincipalArn:
+                  - !Sub arn:${AWS::Partition}:iam::*:role/tCaT-launch-partner-solution-*
           - Sid: DenyExternalPrincipals
             Effect: Deny
             Action: 's3:*'