diff --git a/debian/client/usr/bin/minecraft-pi b/debian/client/usr/bin/minecraft-pi
index 9f32a26..5172c8c 100755
--- a/debian/client/usr/bin/minecraft-pi
+++ b/debian/client/usr/bin/minecraft-pi
@@ -28,7 +28,10 @@ xhost local:root
 # Launch Minecraft
 DOCKER_COMPOSE="docker-compose -f /usr/share/minecraft-pi/client/docker-compose.yml"
 (${DOCKER_COMPOSE} pull || :) | zenity --class 'Minecraft - Pi edition' --progress --pulsate --no-cancel --auto-close --text 'Updating Minecraft...'
-${DOCKER_COMPOSE} run --rm -T minecraft-pi || :
+${DOCKER_COMPOSE} run --rm  minecraft-pi || :
+RET="$?"
 
 # Kill VirGL
 kill "${VIRGL_PID}"
+
+ecit "${RET}"
diff --git a/debian/server/usr/bin/minecraft-pi-server b/debian/server/usr/bin/minecraft-pi-server
index ac472f5..00e4bd7 100755
--- a/debian/server/usr/bin/minecraft-pi-server
+++ b/debian/server/usr/bin/minecraft-pi-server
@@ -7,4 +7,4 @@ export MCPI_ROOT="${PWD}"
 # Launch Minecraft
 DOCKER_COMPOSE="docker-compose -f /usr/share/minecraft-pi/server/docker-compose.yml"
 ${DOCKER_COMPOSE} pull || :
-${DOCKER_COMPOSE} run --rm -T minecraft-pi
+${DOCKER_COMPOSE} run --rm minecraft-pi-server
diff --git a/debian/server/usr/share/minecraft-pi/server/docker-compose.yml b/debian/server/usr/share/minecraft-pi/server/docker-compose.yml
index 9875c17..231d683 100644
--- a/debian/server/usr/share/minecraft-pi/server/docker-compose.yml
+++ b/debian/server/usr/share/minecraft-pi/server/docker-compose.yml
@@ -1,6 +1,6 @@
 version: '3.7'
 services:
-    minecraft-pi:
+    minecraft-pi-server:
         image: 'thebrokenrail/minecraft-pi:server'
         network_mode: 'host'
         volumes: