diff --git a/azure-cli b/azure-cli
index 7132d62..1179a7a 100755
--- a/azure-cli
+++ b/azure-cli
@@ -107,11 +107,10 @@ fi
 EXTRA_ARGS+=(
     "--mount" "type=volume,source=$VOLUME_NAME,target=/home/${USER_NAME}"
     "--mount" "type=bind,source=$(pwd),target=/workdir"
+    "--env" "ACCOUNT_NAME=$ACCOUNT_NAME"
+    "--name" "azure-cli-$VOLUME_NAME"
+    "--workdir" "/workdir"
 )
 
 # Run the container
-$CMD run --rm -it \
-    ${EXTRA_ARGS[@]} \
-    --name "azure-cli-$VOLUME_NAME" \
-    --workdir /workdir \
-    $IMAGE_NAME --user "$USER_NAME" "$@"
+$CMD run --rm -it ${EXTRA_ARGS[@]} $IMAGE_NAME --user "$USER_NAME" "$@"