diff --git a/minecraft/Dockerfile b/minecraft/Dockerfile
index 254a580..54d40ba 100644
--- a/minecraft/Dockerfile
+++ b/minecraft/Dockerfile
@@ -6,8 +6,9 @@ RUN apt-get install -y wget openjdk-21-jre
 USER ubuntu
 WORKDIR /home/ubuntu
 
-RUN wget https://github.com/Tiiffi/mcrcon/releases/download/v0.7.2/mcrcon-0.7.2-linux-x86-64.tar.gz
-RUN tar xvf mcrcon-0.7.2-linux-x86-64.tar.gz
+# from https://github.com/itzg/rcon-cli
+RUN wget -O rcon-cli.tar.gz https://github.com/itzg/rcon-cli/releases/download/1.6.9/rcon-cli_1.6.9_linux_amd64.tar.gz
+RUN tar xvf rcon-cli.tar.gz && rm rcon-cli.tar.gz
 
 # from https://www.minecraft.net/en-us/download/server (currently 1.21)
 RUN wget https://piston-data.mojang.com/v1/objects/59353fb40c36d304f2035d51e7d6e6baa98dc05c/server.jar
diff --git a/minecraft/entry.sh b/minecraft/entry.sh
index 7ca46b5..14eeb2d 100644
--- a/minecraft/entry.sh
+++ b/minecraft/entry.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 cleanup() {
-    ./mcrcon -p password stop
+    ./rcon-cli --password password stop
 }
 
 trap 'cleanup' TERM
diff --git a/minecraft_bedrock/Dockerfile b/minecraft_bedrock/Dockerfile
index aae5d60..e3ae554 100644
--- a/minecraft_bedrock/Dockerfile
+++ b/minecraft_bedrock/Dockerfile
@@ -1,7 +1,7 @@
 FROM ubuntu:24.04
 
 RUN apt-get update && apt-get -y upgrade
-RUN apt-get install -y wget unzip curl
+RUN apt-get install -y wget unzip curl tmux
 
 USER ubuntu
 WORKDIR /home/ubuntu
diff --git a/minecraft_bedrock/entry.sh b/minecraft_bedrock/entry.sh
index 109d2fe..9a86145 100644
--- a/minecraft_bedrock/entry.sh
+++ b/minecraft_bedrock/entry.sh
@@ -1,16 +1,14 @@
 #!/bin/sh
 
 cleanup() {
-    echo "stop" > cmd
+    tmux send-keys stop Enter
 }
 
 trap 'cleanup' TERM
 
-rm cmd
-mkfifo cmd
-LD_LIBRARY_PATH=. ./bedrock_server < cmd &
-echo "help" > cmd # shell waits for FIFO to be opened for writing before starting program!
+rm log
+mkfifo log
+tmux new -d 'LD_LIBRARY_PATH=. ./bedrock_server > log'
+cat log &
 wait $! # wait for SIGTERM
 wait $! # wait for server to stop
-
-# TODO stop not working