diff --git a/bullseye/etc/entry.sh b/bullseye/etc/entry.sh
index 534a5c3..3cf8d0d 100644
--- a/bullseye/etc/entry.sh
+++ b/bullseye/etc/entry.sh
@@ -10,10 +10,10 @@ bash "${STEAMCMDDIR}/steamcmd.sh" +force_install_dir "${STEAMAPPDIR}" \
 
 # Install server.cfg
 cp /etc/server.cfg "${STEAMAPPDIR}"/game/csgo/cfg/server.cfg
-sed -i "s/{{SERVER_HOSTNAME}}/${CS2_SERVERNAME}/g" "${STEAMAPPDIR}"/game/csgo/cfg/server.cfg
-sed -i "s/{{SERVER_PW}}/${CS2_PW}/g" "${STEAMAPPDIR}"/game/csgo/cfg/server.cfg
-sed -i "s/{{SERVER_RCON_PW}}/${CS2_RCONPW}/g" "${STEAMAPPDIR}"/game/csgo/cfg/server.cfg
-sed -i "s/{{SERVER_LAN}}/${CS2_LAN}/g" "${STEAMAPPDIR}"/game/csgo/cfg/server.cfg
+sed -i -e "s/{{SERVER_HOSTNAME}}/${CS2_SERVERNAME}/g" "${STEAMAPPDIR}"/game/csgo/cfg/server.cfg \
+       -e "s/{{SERVER_PW}}/${CS2_PW}/g" "${STEAMAPPDIR}"/game/csgo/cfg/server.cfg \
+       -e "s/{{SERVER_RCON_PW}}/${CS2_RCONPW}/g" "${STEAMAPPDIR}"/game/csgo/cfg/server.cfg \
+       -e "s/{{SERVER_LAN}}/${CS2_LAN}/g" "${STEAMAPPDIR}"/game/csgo/cfg/server.cfg
 
 # Rewrite Config Files
 
@@ -27,17 +27,20 @@ if [[ ! -z $CS2_BOT_QUOTA_MODE ]] ; then
     sed -i "s/bot_quota_mode.*/bot_quota_mode ${CS2_BOT_QUOTA_MODE}/" "${STEAMAPPDIR}"/game/csgo/cfg/*
 fi
 
+# Switch to server directory
+cd "${STEAMAPPDIR}/game/bin/linuxsteamrt64"
+
 # Start Server
 
-"${STEAMAPPDIR}/game/bin/linuxsteamrt64/cs2" -dedicated \
-                                -port "${CS2_PORT}" \
-                                -console \
-                                -usercon \
-                                -maxplayers_override "${CS2_MAXPLAYERS}" \
-                                +game_type "${CS2_GAMETYPE}" \
-                                +game_mode "${CS2_GAMEMODE}" \
-                                +mapgroup "${CS2_MAPGROUP}" \
-                                +map "${CS2_STARTMAP}" \
-                                +rcon_password "${CS2_RCONPW}" \
-                                +sv_password "${CS2_PW}" \
-                                "${CS2_ADDITIONAL_ARGS}"
+"./cs2" -dedicated \
+        -port "${CS2_PORT}" \
+        -console \
+        -usercon \
+        -maxplayers_override "${CS2_MAXPLAYERS}" \
+        +game_type "${CS2_GAMETYPE}" \
+        +game_mode "${CS2_GAMEMODE}" \
+        +mapgroup "${CS2_MAPGROUP}" \
+        +map "${CS2_STARTMAP}" \
+        +rcon_password "${CS2_RCONPW}" \
+        +sv_password "${CS2_PW}" \
+        "${CS2_ADDITIONAL_ARGS}"