diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
index 921808f31..7a6fa01cb 100755
--- a/docker/docker-entrypoint.sh
+++ b/docker/docker-entrypoint.sh
@@ -95,7 +95,7 @@ initialize() {
 	done
 	set -e
 
-	${gosu_cmd[@]} /sbin/docker-prepare.sh
+	"${gosu_cmd[@]}" /sbin/docker-prepare.sh
 }
 
 install_languages() {
@@ -138,7 +138,7 @@ install_languages() {
 echo "Paperless-ngx docker container starting..."
 
 gosu_cmd=(gosu paperless)
-if [ $(id -u) == $(id -u paperless) ]; then
+if [ "$(id -u)" == "$(id -u paperless)" ]; then
 	gosu_cmd=()
 fi
 
@@ -151,7 +151,7 @@ initialize
 
 if [[ "$1" != "/"* ]]; then
 	echo Executing management command "$@"
-	exec ${gosu_cmd[@]} python3 manage.py "$@"
+	exec "${gosu_cmd[@]}" python3 manage.py "$@"
 else
 	echo Executing "$@"
 	exec "$@"
diff --git a/docker/paperless_cmd.sh b/docker/paperless_cmd.sh
index 2c8c1364a..cdeaf68c4 100755
--- a/docker/paperless_cmd.sh
+++ b/docker/paperless_cmd.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 rootless_args=()
-if [ $(id -u) == $(id -u paperless) ]; then
+if [ "$(id -u)" == "$(id -u paperless)" ]; then
 	rootless_args=(
 		--user
 		paperless
@@ -12,4 +12,4 @@ if [ $(id -u) == $(id -u paperless) ]; then
 	)
 fi
 
-/usr/local/bin/supervisord -c /etc/supervisord.conf ${rootless_args[@]}
+/usr/local/bin/supervisord -c /etc/supervisord.conf "${rootless_args[@]}"
diff --git a/src-ui/src/manifest.webmanifest b/src-ui/src/manifest.webmanifest
index aff3085fb..700365e28 100644
--- a/src-ui/src/manifest.webmanifest
+++ b/src-ui/src/manifest.webmanifest
@@ -15,4 +15,4 @@
   "name": "Paperless-ngx",
   "short_name": "Paperless-ngx",
   "start_url": "/"
-}
\ No newline at end of file
+}