diff --git a/script/bootstrap b/script/bootstrap
index a8e9be6c..aee63a27 100755
--- a/script/bootstrap
+++ b/script/bootstrap
@@ -4,7 +4,7 @@
 set -e
 
 # Ensure we are in the app root directory (not the /script directory)
-cd "$(dirname "$0")/.."
+cd "$(dirname "${0}")/.."
 
 # Activate virtual environment
 source .venv/bin/activate
diff --git a/script/server b/script/server
index 0bd415e0..ce8dd094 100755
--- a/script/server
+++ b/script/server
@@ -4,10 +4,10 @@
 set -e
 
 # Ensure we are in the app root directory (not the /script directory)
-cd "$(dirname "$0")/.."
+cd "$(dirname "${0}")/.."
 
 # Activate virtual environment
 source .venv/bin/activate
 
 # Launch the app
-python3 app.py $@
+python3 app.py ${@}
diff --git a/script/setup b/script/setup
index 19a8e225..ca645716 100755
--- a/script/setup
+++ b/script/setup
@@ -4,7 +4,7 @@
 set -e
 
 # Ensure we are in the app root directory (not the /script directory)
-cd "$(dirname "$0")/.."
+cd "$(dirname "${0}")/.."
 
 # Install virtualenv
 pip install virtualenv
diff --git a/script/test b/script/test
index 7c92f24e..9a910fa4 100755
--- a/script/test
+++ b/script/test
@@ -4,7 +4,7 @@
 set -e
 
 # Ensure we are in the app root directory (not the /script directory)
-cd "$(dirname "$0")/.."
+cd "$(dirname "${0}")/.."
 
 # Activate virtual environment
 source .venv/bin/activate
diff --git a/script/update b/script/update
index d8f9af45..db23ee2d 100755
--- a/script/update
+++ b/script/update
@@ -4,7 +4,7 @@
 set -e
 
 # Ensure we are in the app root directory (not the /script directory)
-cd "$(dirname "$0")/.."
+cd "$(dirname "${0}")/.."
 
 # Activate virtual environment
 source .venv/bin/activate