diff --git a/entrypoint.sh b/entrypoint.sh
index ab637f0..225790c 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -131,7 +131,10 @@ else
   export SHOPIFY_PASSWORD="$SHOP_APP_PASSWORD"
 fi
 
-shopify login
+export SHOPIFY_FLAG_STORE="$SHOPIFY_SHOP"
+export SHOPIFY_CLI_THEME_TOKEN="$SHOPIFY_PASSWORD"
+export SHOPIFY_CLI_TTY=0
+# shopify auth login
 
 host="https://${SHOP_STORE#*(https://|http://)}"
 theme_root="${THEME_ROOT:-.}"
@@ -149,9 +152,9 @@ if [[ -n "${SHOP_PULL_THEME+x}" ]]; then
 fi
 
 theme_push_log="$(mktemp)"
-shopify theme push --development --json $theme_root > "$theme_push_log" && cat "$theme_push_log"
-preview_url="$(cat "$theme_push_log" | tail -n 1 | jq -r '.theme.preview_url')"
-preview_id="$(cat "$theme_push_log" | tail -n 1 | jq -r '.theme.id')"
+shopify theme push --development --json --path $theme_root > "$theme_push_log" && cat "$theme_push_log"
+preview_url="$(cat "$theme_push_log" | jq -r '.theme.preview_url')"
+preview_id="$(cat "$theme_push_log" | jq -r '.theme.id')"
 
 step "Configuring Lighthouse CI"