diff --git a/entrypoint.sh b/entrypoint.sh
index 9075039..81e17c8 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -5,21 +5,23 @@ set -ex
 # Create /dev/loop0 if it doesn't already exist. `losetup` has an issue creating it during the first run
 mknod -m 0660 /dev/loop0 b 7 0 2>/dev/null || true
 
+args=""
 for i
 do
   key=$(echo ${i} | cut -d= -f1)
   value=$(echo ${i} | cut -d= -f2-)
   export ${key}="${value}"
+  args="${args} ${key}=\"${value}\""
 done
 
 # Pull container
-make container/${IMAGE_NAME}-${IMAGE_TAG} $@
+make container/${IMAGE_NAME}-${IMAGE_TAG} $args
 
 # Build base ISO
-make boot.iso $@
+make boot.iso $args
 
 # Add container to ISO
-make build/deploy.iso $@
+make build/deploy.iso $args
 
 # Make output dir in github workspace
 mkdir /github/workspace/build || true