diff --git a/Dockerfile b/Dockerfile
index e037f42..21a5c5f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -38,15 +38,6 @@ RUN \
   chmod +x /usr/local/bin/docker-entrypoint && \
   sed -i 's,\r,,g' /usr/local/bin/docker-entrypoint
 
-RUN \
-  for path in \
-    files \
-    logs \
-    query_ip_blacklist.txt \
-    query_ip_whitelist.txt \
-    ts3server.sqlitedb; \
-  do \
-    ln -vsf "/data/${path}" "/opt/teamspeak3/${path}"; \
-  done
-
+WORKDIR /data
+VOLUME /data
 ENTRYPOINT ["docker-entrypoint"]
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 48b3e60..30bf505 100644
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -2,17 +2,25 @@
 
 # files and directories that should exist beforehand
 mkdir -p \
-  /data/files \
-  /data/logs
+  files \
+  logs
 touch \
-  /data/query_ip_blacklist.txt \
-  /data/query_ip_whitelist.txt \
-  /data/ts3server.sqlitedb
+  query_ip_blacklist.txt \
+  query_ip_whitelist.txt \
+  ts3server.sqlitedb
 
-LD_LIBRARY_PATH="/opt/teamspeak3:${LD_LIBRARY_PATH}"
-export LD_LIBRARY_PATH
+for path in \
+  files \
+  logs \
+  query_ip_blacklist.txt \
+  query_ip_whitelist.txt \
+  ts3server.sqlitedb; \
+do \
+  ln -sf "$(pwd)/${path}" "/opt/teamspeak3/${path}"; \
+done
 
-/opt/teamspeak3/ts3server "$@" &
+cd /opt/teamspeak3
+LD_LIBRARY_PATH=".:${LD_LIBRARY_PATH}" /opt/teamspeak3/ts3server "$@" &
 TS3SERVER_PID=$!
 
 trap 'kill -2 ${TS3SERVER_PID}' INT