diff --git a/.travis.yml b/.travis.yml
index 933db6b24a..a6bedbcc53 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,4 +28,4 @@ deploy:
       branch: topic-101-vm-simple-linux
 
 # TODO: possibly use Azure CLI to delete the resource group
-after_deploy: docker run --rm -it azuresdk/azure-cli-python az login --service-principal -u $ARM_CLIENT_ID -p $ARM_CLIENT_SECRET --tenant $ARM_TENANT_ID; az group delete -y -n $KEY
+after_deploy: docker run --rm -it azuresdk/azure-cli-python sh -c "az login --service-principal -u $ARM_CLIENT_ID -p $ARM_CLIENT_SECRET --tenant $ARM_TENANT_ID; az group delete -y -n $KEY"
diff --git a/examples/azure-vm-simple-linux/deploy.sh b/examples/azure-vm-simple-linux/deploy.sh
index 25b99956fc..899385f27a 100755
--- a/examples/azure-vm-simple-linux/deploy.sh
+++ b/examples/azure-vm-simple-linux/deploy.sh
@@ -6,34 +6,15 @@ set -o errexit -o nounset
 # KEY=$(cat /dev/urandom | tr -cd 'a-z' | head -c 12)
 # PASSWORD=$KEY$(cat /dev/urandom | tr -cd 'A-Z' | head -c 2)$(cat /dev/urandom | tr -cd '0-9' | head -c 2)
 
-docker run --rm -it \
-  -v $(pwd):/data -w /data \
-  hashicorp/terraform:light \
-  get
-
 docker run --rm -it \
   -e ARM_CLIENT_ID \
   -e ARM_CLIENT_SECRET \
   -e ARM_SUBSCRIPTION_ID \
   -e ARM_TENANT_ID \
-  -v $(pwd):/data -w /data \
+  -v $(pwd):/data \
+  --entrypoint "/bin/sh" \
   hashicorp/terraform:light \
-  plan -var dns_name=$KEY -var resource_group=$KEY -var admin_username=$KEY -var admin_password=$PASSWORD -out=out.tfplan
-
-docker run --rm -it \
-  -e ARM_CLIENT_ID \
-  -e ARM_CLIENT_SECRET \
-  -e ARM_SUBSCRIPTION_ID \
-  -e ARM_TENANT_ID \
-  -v $(pwd):/data -w /data \
-  hashicorp/terraform:light \
-  apply out.tfplan
-
-# terraform get
-#
-# terraform plan -var 'dns_name='$KEY -var 'admin_password='$PASSWORD -var 'admin_username='$KEY -var 'resource_group='$KEY -out=out.tfplan
-#
-# terraform apply out.tfplan
+  -c "cd /data; /bin/terraform get; /bin/terraform plan -var dns_name=$KEY -var resource_group=$KEY -var admin_username=$KEY -var admin_password=$PASSWORD -out=out.tfplan; /bin/terraform apply out.tfplan"
 
 # TODO: determine external validation, possibly Azure CLI