diff --git a/local_tests/build-docker-runtime.sh b/local_tests/build-docker-runtime.sh
index 4405fa22..3b9cad3f 100755
--- a/local_tests/build-docker-runtime.sh
+++ b/local_tests/build-docker-runtime.sh
@@ -66,7 +66,7 @@ fi
 cd "$CURRENT_PATH/local_tests"
 if [ -z "$LAYER_PATH" ] && [ -n "$LAYER_NAME" ]; then
     # Get the latest available version
-    LATEST_AVAILABLE_VERSION=$(aws-vault exec serverless-sandbox-account-admin \
+    LATEST_AVAILABLE_VERSION=$(aws-vault exec sso-serverless-sandbox-account-admin \
     -- aws lambda list-layer-versions --layer-name $LAYER_NAME --region sa-east-1 --max-items 1 \
     | jq -r ".LayerVersions | .[0] |  .Version")
 
@@ -77,7 +77,7 @@ if [ -z "$LAYER_PATH" ] && [ -n "$LAYER_NAME" ]; then
         echo "The layer has already been downloaded, skipping"
     else
         echo "Downloading the latest $RUNTIME layer (version $LATEST_AVAILABLE_VERSION)"
-        URL=$(aws-vault exec serverless-sandbox-account-admin \
+        URL=$(aws-vault exec sso-serverless-sandbox-account-admin \
             -- aws lambda get-layer-version --layer-name $LAYER_NAME --version-number $LATEST_AVAILABLE_VERSION \
             --query Content.Location --region sa-east-1 --output text)
         curl -k $URL -o "$LAYER"
diff --git a/scripts/publish_prod.sh b/scripts/publish_prod.sh
index befb9730..2b7ea557 100755
--- a/scripts/publish_prod.sh
+++ b/scripts/publish_prod.sh
@@ -64,7 +64,7 @@ fi
 docker login
 
 echo "Checking that you have access to the commercial AWS account"
-aws-vault exec prod-engineering -- aws sts get-caller-identity
+aws-vault exec sso-prod-engineering -- aws sts get-caller-identity
 
 echo "Checking that you have access to the GovCloud AWS account"
 ddsaml2aws login -a govcloud-us1-fed-human-engineering
@@ -73,10 +73,10 @@ AWS_PROFILE=govcloud-us1-fed-human-engineering aws sts get-caller-identity
 VERSION=$VERSION AGENT_VERSION=$AGENT_VERSION ./scripts/build_binary_and_layer_dockerized.sh
 
 echo "Signing the layer"
-aws-vault exec prod-engineering -- ./scripts/sign_layers.sh prod
+aws-vault exec sso-prod-engineering -- ./scripts/sign_layers.sh prod
 
 echo "Publishing layers to commercial AWS regions"
-aws-vault exec prod-engineering --no-session -- ./scripts/publish_layers.sh
+aws-vault exec sso-prod-engineering --no-session -- ./scripts/publish_layers.sh
 
 echo "Publishing layers to GovCloud AWS regions"
 ddsaml2aws login -a govcloud-us1-fed-human-engineering