diff --git a/slurm-docker-cluster/Dockerfile b/slurm-docker-cluster/Dockerfile
index 028054c..c4f6982 100644
--- a/slurm-docker-cluster/Dockerfile
+++ b/slurm-docker-cluster/Dockerfile
@@ -4,7 +4,7 @@ FROM ghcr.io/astral-sh/uv:$UV_VERSION AS uv
 
 FROM debian:bookworm
 
-ARG SLURM_VERSION="24.05.4"
+ARG SLURM_VERSION="25.05.1"
 ARG SLURM_USER_UID=990
 ARG SLURM_USER_GID=990
 ARG SLURMRESTD_USER_UID=65533
diff --git a/slurm-docker-cluster/docker-entrypoint.sh b/slurm-docker-cluster/docker-entrypoint.sh
index 3ec039a..ce9c34e 100755
--- a/slurm-docker-cluster/docker-entrypoint.sh
+++ b/slurm-docker-cluster/docker-entrypoint.sh
@@ -18,12 +18,16 @@ then
     { echo "---> Starting the MUNGE Authentication service (munged) ..."; } 2>/dev/null
     setpriv --reuid=munge --regid=munge --init-groups /usr/sbin/munged
 
+    mkdir -p /var/spool/slurmctld
+    chown -R slurm:slurm /var/spool/slurmctld
+
     { echo "---> Starting the Slurm Controller Daemon (slurmctld) ..."; } 2>/dev/null
     exec setpriv --reuid=slurm --regid=slurm --init-groups /usr/sbin/slurmctld -D
 fi
 
 if [ "$1" = "slurmd" ]
 then
+    shift 1
     set -x
 
     { echo "---> Setup Cgroup v2 ..."; } 2>/dev/null
@@ -42,7 +46,7 @@ then
     setpriv --reuid=munge --regid=munge --init-groups /usr/sbin/munged
 
     { echo "---> Starting the Slurm Node Daemon (slurmd) ..."; } 2>/dev/null
-    exec /usr/sbin/slurmd -D
+    exec /usr/sbin/slurmd -D "$@"
 fi
 
 if [ "$1" = "slurmrestd" ]
diff --git a/slurm-exporter/Dockerfile b/slurm-exporter/Dockerfile
index c630bb0..f0c4137 100644
--- a/slurm-exporter/Dockerfile
+++ b/slurm-exporter/Dockerfile
@@ -1,5 +1,5 @@
 ARG GO_VERSION=1.22
-ARG SLURM_VERSION=24.05.3
+ARG SLURM_VERSION=25.05.1
 
 FROM cimg/go:$GO_VERSION AS builder
 
diff --git a/slurm-python/Dockerfile b/slurm-python/Dockerfile
index f6d6b8e..9596464 100644
--- a/slurm-python/Dockerfile
+++ b/slurm-python/Dockerfile
@@ -4,7 +4,7 @@ ARG UV_VERSION="0.7.17"
 FROM ghcr.io/astral-sh/uv:$UV_VERSION AS uv
 FROM docker.io/python:$PYTHON_VERSION
 
-ARG SLURM_VERSION="24.05.3"
+ARG SLURM_VERSION="25.05.1"
 ARG SLUMR_USER_UID=990
 ARG SLURM_USER_GID=990
 ARG VOXELYTICS_USER_UID=999