diff --git a/scripts/_common.sh b/scripts/_common.sh
index bec851d..2c9a529 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -13,47 +13,47 @@ postgresql_version="$(psql -V | cut -d' ' -f3 | cut -d. -f1)"
 
 install_source() {
     # Clean venv is it was on python with an old version in case major upgrade of debian
-    if [ ! -e $install_dir/venv/lib/python$python_version ] || ! grep -qF "$install_dir/venv/bin/python" "$install_dir"/venv/bin/pip; then
-        ynh_secure_remove --file=$install_dir/venv/bin
-        ynh_secure_remove --file=$install_dir/venv/lib
-        ynh_secure_remove --file=$install_dir/venv/lib64
-        ynh_secure_remove --file=$install_dir/venv/include
-        ynh_secure_remove --file=$install_dir/venv/share
-        ynh_secure_remove --file=$install_dir/venv/pyvenv.cfg
+    if [ ! -e "$install_dir/venv/lib/python$python_version" ] || ! grep -qF "$install_dir/venv/bin/python" "$install_dir"/venv/bin/pip; then
+        ynh_secure_remove --file="$install_dir"/venv/bin
+        ynh_secure_remove --file="$install_dir"/venv/lib
+        ynh_secure_remove --file="$install_dir"/venv/lib64
+        ynh_secure_remove --file="$install_dir"/venv/include
+        ynh_secure_remove --file="$install_dir"/venv/share
+        ynh_secure_remove --file="$install_dir"/venv/pyvenv.cfg
     fi
 
     if uname -m | grep -q arm
     then
         # Clean old file, sometime it could make some big issues if we don't do this !!
-        ynh_secure_remove --file=$install_dir/venv/bin
-        ynh_secure_remove --file=$install_dir/venv/lib
-        ynh_secure_remove --file=$install_dir/venv/include
-        ynh_secure_remove --file=$install_dir/venv/share
-        ynh_setup_source --dest_dir $install_dir/venv/ --source_id "pgadmin_prebuilt_armv7_$(lsb_release --codename --short)"
+        ynh_secure_remove --file="$install_dir"/venv/bin
+        ynh_secure_remove --file="$install_dir"/venv/lib
+        ynh_secure_remove --file="$install_dir"/venv/include
+        ynh_secure_remove --file="$install_dir"/venv/share
+        ynh_setup_source --dest_dir "$install_dir"/venv/ --source_id "pgadmin_prebuilt_armv7_$(lsb_release --codename --short)"
     else
         # Install virtualenv if it don't exist
-        test -e $install_dir/venv/bin/python3 || python3 -m venv $install_dir/venv
+        test -e "$install_dir"/venv/bin/python3 || python3 -m venv "$install_dir"/venv
 
         # Install pgadmin in virtualenv
-        pip=$install_dir/venv/bin/pip
+        pip="$install_dir"/venv/bin/pip
         $pip install --upgrade pip wheel
-        $pip install --upgrade -r "$YNH_APP_BASEDIR"/conf/requirement_$(lsb_release --codename --short).txt
+        $pip install --upgrade -r "$YNH_APP_BASEDIR/conf/requirement_$(lsb_release --codename --short).txt"
     fi
 
     # Apply patchs if needed
     # Note that we put patch into scripts dir because /source are not stored and can't be used on restore
-    if ! grep -F -q '# BEGIN Yunohost Patch' $install_dir/venv/lib/python$python_version/site-packages/pgadmin4/migrations/versions/fdc58d9bd449_.py; then
-        pushd $install_dir/venv/lib/python$python_version/site-packages/pgadmin4
+    if ! grep -F -q '# BEGIN Yunohost Patch' "$install_dir/venv/lib/python$python_version/site-packages/pgadmin4/migrations/versions/fdc58d9bd449_.py"; then
+        pushd "$install_dir/venv/lib/python$python_version/site-packages/pgadmin4"
         patch -p1 < "$YNH_APP_BASEDIR"/scripts/patch/avoid_create_user_on_setup_db.patch
         popd
     fi
-    if ! grep -F -q '# BEGIN Yunohost Patch' $install_dir/venv/lib/python$python_version/site-packages/pgadmin4/pgadmin/__init__.py; then
-        pushd $install_dir/venv/lib/python$python_version/site-packages/pgadmin4
+    if ! grep -F -q '# BEGIN Yunohost Patch' "$install_dir/venv/lib/python$python_version/site-packages/pgadmin4/pgadmin/__init__.py"; then
+        pushd "$install_dir/venv/lib/python$python_version/site-packages/pgadmin4"
         patch -p1 < "$YNH_APP_BASEDIR"/scripts/patch/fix_add_local_db.patch
         popd
     fi
-    if ! grep -F -q '# BEGIN Yunohost Patch' $install_dir/venv/lib/python$python_version/site-packages/pgadmin4/pgadmin/authenticate/webserver.py; then
-        pushd $install_dir/venv/lib/python$python_version/site-packages/pgadmin4
+    if ! grep -F -q '# BEGIN Yunohost Patch' "$install_dir/venv/lib/python$python_version/site-packages/pgadmin4/pgadmin/authenticate/webserver.py"; then
+        pushd "$install_dir/venv/lib/python$python_version/site-packages/pgadmin4"
         patch -p1 < "$YNH_APP_BASEDIR"/scripts/patch/change_default_webserver_new_user_role_to_admin.patch
         popd
     fi
@@ -61,16 +61,16 @@ install_source() {
 
 set_permission() {
     # Set permission
-    chown $app:$app -R $install_dir
-    chmod u+rw,o= -R $install_dir
-    chown $app:$app -R $data_dir
-    chmod u+rw,o= -R $data_dir
-    chown $app:$app -R /var/log/$app
-    chmod u=rwX,g=rX,o= -R /var/log/$app
+    chown "$app:$app" -R "$install_dir"
+    chmod u+rw,o= -R "$install_dir"
+    chown "$app:$app" -R "$data_dir"
+    chmod u+rw,o= -R "$data_dir"
+    chown "$app:$app" -R /var/log/"$app"
+    chmod u=rwX,g=rX,o= -R /var/log/"$app"
     # Criticals files
-    chown $app:root $data_dir/master_pwd
-    chmod u=r,g=,o= $data_dir/master_pwd
-    chown $app:root $install_dir/postgres-reg.ini
-    chmod u=r,g=,o= $install_dir/postgres-reg.ini
+    chown "$app":root "$data_dir"/master_pwd
+    chmod u=r,g=,o= "$data_dir"/master_pwd
+    chown "$app":root "$install_dir"/postgres-reg.ini
+    chmod u=r,g=,o= "$install_dir"/postgres-reg.ini
 }
 
diff --git a/scripts/install b/scripts/install
index 748f600..5ab0f21 100644
--- a/scripts/install
+++ b/scripts/install
@@ -20,13 +20,13 @@ ynh_psql_execute_as_root --sql="ALTER USER $db_user WITH SUPERUSER CREATEDB CREA
 
 ynh_script_progression --message='Creating base directory...'
 
-if [ -n "$(ls -A $data_dir)" ]; then
+if [ -n "$(ls -A "$data_dir")" ]; then
     old_data_dir_path="${data_dir}_$(date '+%Y%m%d.%H%M%S')"
     ynh_print_warn "Data directory was not empty. Data was moved to $old_data_dir_path"
-    mkdir -p $old_data_dir_path
+    mkdir -p "$old_data_dir_path"
     mv -t "$old_data_dir_path" "$data_dir"/*
 fi
-mkdir -p /var/log/$app
+mkdir -p /var/log/"$app"
 
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
diff --git a/scripts/remove b/scripts/remove
index 92c4162..63ead8c 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -17,8 +17,8 @@ ynh_script_progression --message="Removing system configurations related to $app
 
 # Stop service
 ynh_systemd_action --service_name="$app.service" --action=stop
-ynh_remove_systemd_config --service=$app
-yunohost service remove $app
+ynh_remove_systemd_config --service="$app"
+yunohost service remove "$app"
 
 # Remove the app-specific logrotate config
 ynh_remove_logrotate
diff --git a/scripts/restore b/scripts/restore
index 627ef08..fa7e905 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -38,8 +38,8 @@ install_source
 ynh_script_progression --message="Enable systemd services" --weight=2
 
 # systemctl daemon-reload
-systemctl enable $app.service --quiet
-yunohost service add $app --log "/var/log/$app/$app.log" --description 'PgAdmin application'
+systemctl enable "$app".service --quiet
+yunohost service add "$app" --log "/var/log/$app/$app.log" --description 'PgAdmin application'
 
 set_permission
 
diff --git a/scripts/upgrade b/scripts/upgrade
index 417dfd4..2bb0f87 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -49,8 +49,8 @@ if [ -d "$install_dir/data" ]; then
     fi
     ynh_secure_remove "$install_dir/data"
 fi
-if [ ! -e $data_dir/master_pwd ]; then
-    ynh_string_random --length=60 > $data_dir/master_pwd
+if [ ! -e "$data_dir"/master_pwd ]; then
+    ynh_string_random --length=60 > "$data_dir"/master_pwd
 fi
 
 #=================================================
@@ -85,12 +85,12 @@ ynh_script_progression --message="Upgrading system configurations related to $ap
 ynh_add_nginx_config
 
 # Add systemd config
-ynh_add_systemd_config --service=$app --template=pgadmin.service
+ynh_add_systemd_config --service="$app" --template=pgadmin.service
 
-yunohost service add $app --log "/var/log/$app/$app.log" --description 'PgAdmin application'
+yunohost service add "$app" --log "/var/log/$app/$app.log" --description 'PgAdmin application'
 
 # Use logrotate to manage app-specific logfile(s)
-ynh_use_logrotate --logfile=/var/log/$app --nonappend
+ynh_use_logrotate --logfile=/var/log/"$app" --nonappend
 
 set_permission