diff --git a/entrypoint.sh b/entrypoint.sh
index 07c8b34..149e309 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,9 +1,5 @@
 #!/bin/bash -e
 
-#
-# TODO
-#		* maybe remove ctdb-volatile
-
 # Loosely based on https://github.com/fjudith/docker-samba-join-ad/tree/master/sssd
 
 if [ "$1" = "ctdb" ]; then
@@ -33,10 +29,10 @@ if [ "$1" = "ctdb" ]; then
 	#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 "$CLUSTER_SYSDIR_LOCAL/ctdb-volatile"
+	mkdir -p "/tmp/ctdb-volatile"
 	echo [database] >> /etc/ctdb/ctdb.conf
 	echo persistent database directory = $CLUSTER_SYSDIR_LOCAL/ctdb >> /etc/ctdb/ctdb.conf
-	echo volatile database directory = $CLUSTER_SYSDIR_LOCAL/ctdb-volatile >> /etc/ctdb/ctdb.conf
+	echo volatile database directory = /tmp/ctdb-volatile >> /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
@@ -95,10 +91,6 @@ else
 	PRINTERDRIVERS_DIR=$CLUSTER_SYSDIR_SHARED/printerdrivers
 	NETBIOS_NAME=$CLUSTER_NAME
 
-	# HACK: Make volatile accessible from the CTDB container
-	#rm -rf /var/lib/ctdb/volatile
-	#ln -s "$CLUSTER_SYSDIR_LOCAL/ctdb-volatile" /var/lib/ctdb/volatile
-
 	# Allow easy use of ctdb command
 	mkdir /run/ctdb
 	ln -s $CLUSTER_SYSDIR_LOCAL/ctdb-run/ctdbd.socket /run/ctdb/ctdbd.socket
@@ -151,6 +143,8 @@ for file in /etc/samba/smb.conf; do
 done
 if [ "$CTDB_ENABLED" = "true" ]; then
 	echo "clustering = yes" >> /etc/samba/smb.conf
+	# It is recommended to use `net conf import some.conf` to add configuration
+	echo "include = registry" >> /etc/samba/smb.conf
 	echo "ctdbd socket = $CLUSTER_SYSDIR_LOCAL/ctdb-run/ctdbd.socket" >> /etc/samba/smb.conf
 fi
 for file in "$ETC_DIR"/conf.d/*.conf; do