diff --git a/entrypoint.sh b/entrypoint.sh
index 149e309..db8cac6 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -28,11 +28,14 @@ if [ "$1" = "ctdb" ]; then
 	# Locking seems broken on objectivefs
 	#mkdir -p "$CLUSTER_SYSDIR_SHARED/ctdb"
 	#echo cluster lock = $CLUSTER_SYSDIR_SHARED/ctdb/ctdb.lock >> /etc/ctdb/ctdb.conf
-	mkdir -p "$CLUSTER_SYSDIR_LOCAL/ctdb"
-	mkdir -p "/tmp/ctdb-volatile"
+	mkdir -p "$CLUSTER_SYSDIR_LOCAL/ctdb-persist"
+	mkdir -p "$CLUSTER_SYSDIR_LOCAL/ctdb-volatile"
+	mkdir -p "$CLUSTER_SYSDIR_LOCAL/ctdb-state"
 	echo [database] >> /etc/ctdb/ctdb.conf
-	echo persistent database directory = $CLUSTER_SYSDIR_LOCAL/ctdb >> /etc/ctdb/ctdb.conf
-	echo volatile database directory = /tmp/ctdb-volatile >> /etc/ctdb/ctdb.conf
+	echo persistent database directory = $CLUSTER_SYSDIR_LOCAL/ctdb-persist >> /etc/ctdb/ctdb.conf
+	echo volatile database directory = $CLUSTER_SYSDIR_LOCAL/ctdb-volatile >> /etc/ctdb/ctdb.conf
+	echo state database directory = $CLUSTER_SYSDIR_LOCAL/ctdb-state >> /etc/ctdb/ctdb.conf
+	echo tdb mutexes = true >> /etc/ctdb/ctdb.conf
 	# We do not have enough privileges in a container for setting scheduling
   echo [legacy] >> /etc/ctdb/ctdb.conf
 	echo realtime scheduling = false >> /etc/ctdb/ctdb.conf