diff --git a/scripts/publish_sandbox.sh b/scripts/publish_sandbox.sh
index 0517c65a..4dec5889 100755
--- a/scripts/publish_sandbox.sh
+++ b/scripts/publish_sandbox.sh
@@ -4,8 +4,8 @@
 set -e
 
 ./scripts/build_layers.sh
-aws-vault exec sandbox-account-admin -- ./scripts/sign_layers.sh sandbox
-aws-vault exec sandbox-account-admin -- ./scripts/publish_layers.sh
+aws-vault exec serverless-sandbox-account-admin -- ./scripts/sign_layers.sh sandbox
+aws-vault exec serverless-sandbox-account-admin -- ./scripts/publish_layers.sh
 
 # Automatically create PR against github.com/DataDog/documentation
 # If you'd like to test, please uncomment the below line
diff --git a/scripts/run_integration_tests.sh b/scripts/run_integration_tests.sh
index f23adcf6..2d0e1c8f 100755
--- a/scripts/run_integration_tests.sh
+++ b/scripts/run_integration_tests.sh
@@ -2,9 +2,9 @@
 
 # Usage - run commands from repo root:
 # To check if new changes to the layer cause changes to any snapshots:
-#   BUILD_LAYERS=true DD_API_KEY=XXXX aws-vault exec sandbox-account-admin -- ./scripts/run_integration_tests
+#   BUILD_LAYERS=true DD_API_KEY=XXXX aws-vault exec serverless-sandbox-account-admin -- ./scripts/run_integration_tests
 # To regenerate snapshots:
-#   UPDATE_SNAPSHOTS=true DD_API_KEY=XXXX aws-vault exec sandbox-account-admin -- ./scripts/run_integration_tests
+#   UPDATE_SNAPSHOTS=true DD_API_KEY=XXXX aws-vault exec serverless-sandbox-account-admin -- ./scripts/run_integration_tests
 
 set -e
 
diff --git a/scripts/sign_layers.sh b/scripts/sign_layers.sh
index 56337dd1..5a7e7921 100755
--- a/scripts/sign_layers.sh
+++ b/scripts/sign_layers.sh
@@ -29,7 +29,7 @@ if [[ ! "${VALID_ACCOUNTS[@]}" =~ $1 ]]; then
 fi
 if [ "$1" = "sandbox" ]; then
     REGION="sa-east-1"
-    S3_BUCKET_NAME="dd-lambda-signing-bucket-sandbox"
+    S3_BUCKET_NAME="dd-lambda-signing-bucket-serverless-sandbox"
 fi
 if [ "$1" = "prod" ]; then
     REGION="us-east-1"