diff --git a/entrypoint.sh b/entrypoint.sh
index d16eba5..e9e19a0 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,11 +1,20 @@
 #!/bin/sh -l
 
+echo $(env)
+
 if [ -n "$FLY_PROJECT_PATH" ]; then
   PREV_PATH=$(pwd)
   # Allow user to change directories in which to run Fly commands
   cd "$FLY_PROJECT_PATH" || exit
 fi
-sh -c "flyctl $*"
+
+echo "FLY_APP=$FLY_APP"
+
+if [ -n "$FLY_APP" ]; then
+  sh -c "FLY_APP=$FLY_APP flyctl $*"
+else
+  sh -c "flyctl $*"
+fi
 
 ACTUAL_EXIT="$?"