diff --git a/build-image-files.sh b/build-image-files.sh
index 92a7cf3..e2f10cc 100755
--- a/build-image-files.sh
+++ b/build-image-files.sh
@@ -7,14 +7,14 @@ BUILD_TAG="fedora-${BASE_TAG}-${NOW}"
 IMAGE_FILE="steamcmd-${BUILD_TAG}.img"
 
 echo "Building image steamcmd:${BUILD_TAG}"
-podman build --tag steamcmd:${BUILD_TAG} .
-podman save localhost/steamcmd:${BUILD_TAG} > ${IMAGE_FILE}
+podman build --tag steamcmd:"${BUILD_TAG}" .
+podman save localhost/steamcmd:"${BUILD_TAG}" > "${IMAGE_FILE}"
 echo ""
 echo "Wrote ${IMAGE_FILE}, cleaning up"
-podman rmi steamcmd:${BUILD_TAG}
+podman rmi steamcmd:"${BUILD_TAG}"
 echo ""
 echo "Attempting to compress the image (begin comforting music)"
-xz --keep --compress -9 --extreme --threads=$(nproc) ${IMAGE_FILE}
+xz --keep --compress -9 --extreme --threads="$(nproc)" "${IMAGE_FILE}"
 echo ""
 echo "Finished, (non)compressed images created:"
-ls --color=auto -lah ${IMAGE_FILE}*
+ls --color=auto -lah "${IMAGE_FILE}"*