diff --git a/bundles/left4dead2/files/setup b/bundles/left4dead2/files/setup
index 59f92b0..3314007 100644
--- a/bundles/left4dead2/files/setup
+++ b/bundles/left4dead2/files/setup
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
 
-set -xeu pipefail
+set -xeuo pipefail
 
 getent passwd steam >/dev/null || useradd -M -d /opt/l4d2 -s /bin/bash steam
 mkdir -p /opt/l4d2 /tmp/dumps
diff --git a/bundles/left4dead2/files/start b/bundles/left4dead2/files/start
index 97d9735..cf937f0 100644
--- a/bundles/left4dead2/files/start
+++ b/bundles/left4dead2/files/start
@@ -1,20 +1,24 @@
-#!/bin/sh
+#!/bin/bash
 
-set -xeu pipefail
+set -xeuo pipefail
 
 name=$1
 overlay=$2
 port=$3
 
+function steam() { sudo -Hiu steam "$@"; }
+
+mountpoint -q "/opt/l4d2/servers/$name/merged" && umount "/opt/l4d2/servers/$name/merged"
+steam rm -rf "/opt/l4d2/servers/$name"
+
 steam mkdir -p \
   "/opt/l4d2/servers/$name" \
   "/opt/l4d2/servers/$name/work" \
   "/opt/l4d2/servers/$name/upper" \
   "/opt/l4d2/servers/$name/merged"
 
-mountpoint -q "/opt/l4d2/servers/$name/merged" && umount "/opt/l4d2/servers/$name/merged"
 mount -t overlay overlay \
   -o "lowerdir=/opt/l4d2/overlays/$overlay:/opt/l4d2/installation,upperdir=/opt/l4d2/servers/$name/upper,workdir=/opt/l4d2/servers/$name/work" \
   "/opt/l4d2/servers/$name/merged"
 
-steam "/opt/l4d2/servers/$name/merged/srcds_run" -game left4dead2 -ip 0.0.0.0 -port $port +hostname "Crone $name" +map c1m1_hotel
+steam "/opt/l4d2/servers/$name/merged/srcds_run" -game left4dead2 -ip 0.0.0.0 -port "$port" +hostname "Crone $name" +map c1m1_hotel
\ No newline at end of file