diff --git a/.github/scripts/run-client.sh b/.github/scripts/run-client.sh
index 518de54..a4fd778 100755
--- a/.github/scripts/run-client.sh
+++ b/.github/scripts/run-client.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-./gradlew $1:runClient > gradle_client_output.txt 2>&1 &
+./gradlew $1:runClient --no-daemon 2>&1 | tee gradle_client_output.txt &
 
 SUCCESS_PATTERN='minecraft:textures/atlas/mob_effects\.png-atlas'
 ERROR_PATTERNS=(
diff --git a/.github/scripts/run-server.sh b/.github/scripts/run-server.sh
index ae7b8a4..a8dfe97 100755
--- a/.github/scripts/run-server.sh
+++ b/.github/scripts/run-server.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 
-./gradlew $1:runServer --args="nogui" > gradle_server_output.txt 2>&1 &
+mkdir -p $1/run && echo "eula=true" > $1/run/eula.txt
+
+./gradlew $1:runServer --no-daemon --args="nogui" 2>&1 | tee gradle_server_output.txt &
 
 SUCCESS_PATTERN='For help, type "help"'
 ERROR_PATTERNS=(
diff --git a/Makefile b/Makefile
index e5b6937..b8bbce4 100644
--- a/Makefile
+++ b/Makefile
@@ -13,6 +13,9 @@ clean-cache: ## Cleans cache
 	rm -rf $GRADLE_HOME/caches/build-cache-*
 	./gradlew clean
 
+stop: ## Stops all deamons
+	./gradlew --stop
+
 gen-sources: ## Generate sources
 	./gradlew genSources