diff --git a/cfg/jobs/navidrome.run b/cfg/jobs/navidrome.run
index f11ac2f..efc58cc 100755
--- a/cfg/jobs/navidrome.run
+++ b/cfg/jobs/navidrome.run
@@ -14,27 +14,27 @@ SERIAL="1benoitjpnet"
 CNAME="$UPSTREAM_NAME-$UPSTREAM_VER_DASH-$SERIAL-$DIST-$VER"
 ALIAS="$UPSTREAM_NAME-$UPSTREAM_VER-$SERIAL"
 
-cd $WORKSPACE
-incus launch images:$IMAGE $CNAME --quiet
+cd "$WORKSPACE"
+incus launch images:$IMAGE "$CNAME" --quiet
 
-wait_network $CNAME
+wait_network "$CNAME"
 
 # Navidrome
-incus exec $CNAME -- apt update
-incus exec $CNAME -- apt upgrade -y
-incus exec $CNAME -- apt install -y --no-install-recommends ffmpeg wget
-incus exec $CNAME -- useradd -m -s /sbin/nologin -d /var/lib/navidrome navidrome
-incus exec $CNAME -- install -d -o navidrome -g navidrome /opt/navidrome
-incus exec $CNAME -- wget -q \
-  "https://github.com/navidrome/navidrome/releases/download/v${UPSTREAM_VER}/navidrome_${UPSTREAM_VER}_linux_amd64.tar.gz" \
-  -O /tmp/Navidrome.tar.gz
-incus exec $CNAME -- tar -xvzf /tmp/Navidrome.tar.gz -C /opt/navidrome/
-incus exec $CNAME -- chown -R navidrome:navidrome /opt/navidrome
+incus exec "$CNAME" -- bash -c "apt update && \
+  apt upgrade -y && \
+  apt install -y --no-install-recommends ffmpeg wget && \
+  useradd -m -s /sbin/nologin -d /var/lib/navidrome navidrome && \
+  install -d -o navidrome -g navidrome /opt/navidrome && \
+  wget -q https://github.com/navidrome/navidrome/releases/download/v${UPSTREAM_VER}/navidrome_${UPSTREAM_VER}_linux_amd64.tar.gz \
+    -O /tmp/Navidrome.tar.gz && \
+  tar -xvzf /tmp/Navidrome.tar.gz -C /opt/navidrome/ && \
+  chown -R navidrome:navidrome /opt/navidrome
+"
 
 # Syncthing
-incus exec $CNAME -- apt install -y --no-install-recommends syncthing
-incus exec $CNAME -- cp /lib/systemd/system/syncthing\@.service /etc/systemd/system/
-incus exec $CNAME -- sed -i \
+incus exec "$CNAME" -- apt install -y --no-install-recommends syncthing
+incus exec "$CNAME" -- cp /lib/systemd/system/syncthing\@.service /etc/systemd/system/
+incus exec "$CNAME" -- sed -i \
   's/\(ExecStart=\/usr\/bin\/syncthing serve --no-browser --no-restart --logflags=0\)/\1 --gui-address=0.0.0.0:8384/' \
   /etc/systemd/system/syncthing\@.service