diff --git a/entrypoint.sh b/entrypoint.sh
index 222068e..07c8b34 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -96,8 +96,12 @@ else
 	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
+	#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
 fi
 
 if [ ! -f "$ETC_DIR/krb5.keytab" ]; then