diff --git a/deployment/bin/deploy b/deployment/bin/deploy
index 5129496d..46f8bacb 100755
--- a/deployment/bin/deploy
+++ b/deployment/bin/deploy
@@ -84,6 +84,12 @@ setup_env
 echo "===== Running Deploy ====="
 echo "IMAGE_TAG: ${IMAGE_TAG}"
 
+if [ -z "$ARM_CLIENT_ID" ]; then
+  export ARM_CLIENT_ID=$(az account show --query user.name -o tsv)
+  echo "Using Azure CLI auth with username: ${ARM_CLIENT_ID}"
+fi
+
+
 # ---------------------------------------------------
 
 if [ "${BASH_SOURCE[0]}" = "${0}" ]; then
diff --git a/deployment/docker-compose.yml b/deployment/docker-compose.yml
index 74a75886..da67cbbe 100644
--- a/deployment/docker-compose.yml
+++ b/deployment/docker-compose.yml
@@ -13,7 +13,7 @@ services:
 
       - ARM_SUBSCRIPTION_ID=${ARM_SUBSCRIPTION_ID:-a84a690d-585b-4c7c-80d9-851a48af5a50}
       - ARM_TENANT_ID=${ARM_TENANT_ID:-72f988bf-86f1-41af-91ab-2d7cd011db47}
-      - ARM_CLIENT_ID=mmcfarland@microsoft.com
+      - ARM_CLIENT_ID
       - ARM_USE_OIDC
       - ARM_OIDC_TOKEN
       - ACTIONS_ID_TOKEN_REQUEST_URL