diff --git a/.github/workflows/dietpi-software.bash b/.github/workflows/dietpi-software.bash
index 474ae28104..1b5b1ebcc2 100644
--- a/.github/workflows/dietpi-software.bash
+++ b/.github/workflows/dietpi-software.bash
@@ -118,7 +118,7 @@ Process_Software()
 			49) aSERVICES[i]='gogs' aTCP[i]='3000';;
 			50) aSERVICES[i]='syncthing' aTCP[i]='8384';;
 			51) aCOMMANDS[i]='/usr/games/opentyrian/opentyrian -h';;
-			52) aSERVICES[i]='cuberite' aTCP[i]='1339'; (( $arch < 10 )) && aDELAY[i]=120;;
+			52) aSERVICES[i]='cuberite' aTCP[i]='1339'; (( $arch < 10 )) && aDELAY[i]=120; (( $arch == 10 )) && aDELAY[i]=30;;
 			53) aSERVICES[i]='mineos' aTCP[i]='8443';;
 			58) aCOMMANDS[i]='tailscale version';; # aSERVICES[i]='tailscaled' aUDP[i]='41641' GitHub Action runners to not support the TUN module
 			59) aSERVICES[i]='raspimjpeg';;
diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index 429479492b..efbf507215 100755
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -8385,17 +8385,17 @@ location = /.well-known/caldav  { return 301 /baikal/html/dav.php; }' > /etc/ngi
 		then
 			# https://github.com/cuberite/cuberite/blob/master/easyinstall.sh
 			case $G_HW_ARCH in
-				3) local path='aarch64/Cuberite.tar.gz';;
-				10) local path='x86_64/Cuberite.tar.gz';;
-				*) local path='armhf-raspbian/Cuberite.tar.gz';;
+				3) local arch='aarch64';;
+				10) local arch='x86_64';;
+				*) local arch='armhf-raspbian';;
 			esac
 
-			Download_Install "https://download.cuberite.org/linux-$path" /mnt/dietpi_userdata/cuberite
+			Download_Install "https://download.cuberite.org/linux-$arch/Cuberite.tar.gz" /mnt/dietpi_userdata/cuberite
 
 			# User
 			Create_User -d /mnt/dietpi_userdata/cuberite cuberite
 
-			# Service: Needs to be Type=forking, else it shuts down automatically after startup has finished :/ ...
+			# Service
 			cat << '_EOF_' > /etc/systemd/system/cuberite.service
 [Unit]
 Description=Cuberite (DietPi)
@@ -8403,10 +8403,9 @@ Wants=network-online.target
 After=network-online.target
 
 [Service]
-Type=forking
 User=cuberite
 WorkingDirectory=/mnt/dietpi_userdata/cuberite
-ExecStart=/mnt/dietpi_userdata/cuberite/Cuberite -d
+ExecStart=/mnt/dietpi_userdata/cuberite/Cuberite --detached
 
 [Install]
 WantedBy=multi-user.target