diff --git a/action.yml b/action.yml
index b374401..aaa8edd 100644
--- a/action.yml
+++ b/action.yml
@@ -69,5 +69,5 @@ runs:
           "ADDITIONAL_TEMPLATES=${{ inputs.additional_templates }}" \
           FLATPAK_REMOTE_NAME=${{ inputs.flatpak_remote_name }} \
           FLATPAK_REMOTE_URL=${{ inputs.flatpak_remote_url }} \
-          FLATPAK_REMOTE_REFS=${{ inputs.flatpak_remote_refs }}
+          "FLATPAK_REMOTE_REFS=${{ inputs.flatpak_remote_refs }}"
 
diff --git a/entrypoint.sh b/entrypoint.sh
index 4e72dc6..f776728 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -5,9 +5,10 @@ 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
 
-for entry in $@
+while (( "$#" ))
 do
-  export $entry
+  export "$1"
+  shift
 done
 
 # Pull container