diff --git a/scripts/create.taskcat_overrides.sh b/scripts/create.taskcat_overrides.sh
index 9570d7d..1457222 100755
--- a/scripts/create.taskcat_overrides.sh
+++ b/scripts/create.taskcat_overrides.sh
@@ -3,7 +3,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
 cat << EOF
-PublicKey: "${ATLAS_PUBLIC_KEY}"
-PrivateKey: "${ATLAS_PRIVATE_KEY}"
-OrgId: "${ATLAS_ORG_ID}"
+PublicKey: "${MONGODB_ATLAS_PUBLIC_KEY}"
+PrivateKey: "${MONGODB_ATLAS_PRIVATE_KEY}"
+OrgId: "${MONGODB_ATLAS_ORG_ID}"
 EOF
diff --git a/scripts/export-mongocli-config.py b/scripts/export-mongocli-config.py
index 28f161a..4320029 100755
--- a/scripts/export-mongocli-config.py
+++ b/scripts/export-mongocli-config.py
@@ -15,6 +15,6 @@
 if not profile in t:
     raise Exception(f"No profile '{profile}' found in {config}")
 d=t[profile]
-print(f"export ATLAS_PUBLIC_KEY={d['public_api_key']}")
-print(f"export ATLAS_PRIVATE_KEY={d['private_api_key']}")
-print(f"export ATLAS_ORG_ID={d['org_id']}")
+print(f"export MONGODB_ATLAS_PUBLIC_KEY={d['public_api_key']}")
+print(f"export MONGODB_ATLAS_PRIVATE_KEY={d['private_api_key']}")
+print(f"export MONGODB_ATLAS_ORG_ID={d['org_id']}")
diff --git a/scripts/launch-new-quickstart.sh b/scripts/launch-new-quickstart.sh
index b6c3c75..08bf4bd 100755
--- a/scripts/launch-new-quickstart.sh
+++ b/scripts/launch-new-quickstart.sh
@@ -3,7 +3,7 @@ STACK_NAME="${1:-aws-quickstart}"
 aws cloudformation create-stack \
   --capabilities CAPABILITY_IAM --disable-rollback \
   --template-body file://templates/mongodb-atlas.template.yaml \
-  --parameters ParameterKey=PublicKey,ParameterValue=${ATLAS_PUBLIC_KEY} \
-               ParameterKey=PrivateKey,ParameterValue=${ATLAS_PRIVATE_KEY} \
-               ParameterKey=OrgId,ParameterValue=${ATLAS_ORG_ID} \
+  --parameters ParameterKey=PublicKey,ParameterValue=${MONGODB_ATLAS_PUBLIC_KEY} \
+               ParameterKey=PrivateKey,ParameterValue=${MONGODB_ATLAS_PRIVATE_KEY} \
+               ParameterKey=OrgId,ParameterValue=${MONGODB_ATLAS_ORG_ID} \
   --stack-name "${STACK_NAME}"
diff --git a/scripts/launch-x-quickstart.sh b/scripts/launch-x-quickstart.sh
index b41d20b..2749817 100755
--- a/scripts/launch-x-quickstart.sh
+++ b/scripts/launch-x-quickstart.sh
@@ -8,8 +8,8 @@ echo "EXTRA_PARAMS=${EXTRA_PARAMS}"
 aws cloudformation create-stack \
   --capabilities CAPABILITY_IAM --disable-rollback \
   --template-body "file://${TEMPLATE}" \
-  --parameters ParameterKey=PublicKey,ParameterValue=${ATLAS_PUBLIC_KEY} \
-               ParameterKey=PrivateKey,ParameterValue=${ATLAS_PRIVATE_KEY} \
-               ParameterKey=OrgId,ParameterValue=${ATLAS_ORG_ID} \
+  --parameters ParameterKey=PublicKey,ParameterValue=${MONGODB_ATLAS_PUBLIC_KEY} \
+               ParameterKey=PrivateKey,ParameterValue=${MONGODB_ATLAS_PRIVATE_KEY} \
+               ParameterKey=OrgId,ParameterValue=${MONGODB_ATLAS_ORG_ID} \
                ${EXTRA_PARAMS} \
   --stack-name "${STACK_NAME}"