diff --git a/Dockerfile b/Dockerfile
index 1ad75a46..9d72ca35 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,8 +3,8 @@ MAINTAINER Florian Pelgrim <florian.pelgrim@craneworks.de>
 RUN apk add --no-cache libffi && \
   addgroup -S cowrie && \
   adduser -S -s /bin/bash -G cowrie -D -H -h /cowrie cowrie && \
-  mkdir -p /cowrie/dl && \
-  mkdir -p /cowrie/log/tty && \
+  mkdir -p /cowrie/var/lib/cowrie/downloads && \
+  mkdir -p /cowrie/var/log/cowrie/tty && \
   chown -R cowrie:cowrie /cowrie && \
   chmod -R 775 /cowrie
 COPY requirements.txt .
diff --git a/dl/.gitignore b/dl/.gitignore
deleted file mode 100644
index d6b7ef32..00000000
--- a/dl/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/etc/cowrie.cfg.dist b/etc/cowrie.cfg.dist
index dd4d0877..9ce1b679 100644
--- a/etc/cowrie.cfg.dist
+++ b/etc/cowrie.cfg.dist
@@ -32,13 +32,13 @@ hostname = svr04
 # Directory where to save log files in.
 #
 # (default: log)
-log_path = log
+log_path = var/log/cowrie
 
 
 # Directory where to save downloaded artifacts in.
 #
-# (default: dl)
-download_path = dl
+# (default: downloads)
+download_path = ${honeypot:state_path}/downloads
 
 
 # Directory for miscellaneous data files, such as the password database.
diff --git a/log/tty/.gitignore b/log/tty/.gitignore
deleted file mode 100644
index d6b7ef32..00000000
--- a/log/tty/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/src/cowrie/core/config.py b/src/cowrie/core/config.py
index 29d99c95..793113c6 100644
--- a/src/cowrie/core/config.py
+++ b/src/cowrie/core/config.py
@@ -41,4 +41,4 @@ def readConfigFile(cfgfile):
     return parser
 
 
-CONFIG = readConfigFile(("etc/cowrie.cfg.dist", "etc/cowrie.cfg", "cowrie.cfg"))
+CONFIG = readConfigFile(("etc/cowrie.cfg.dist", "/etc/cowrie/cowrie.cfg", "etc/cowrie.cfg", "cowrie.cfg"))
diff --git a/var/lib/.gitignore b/var/lib/.gitignore
deleted file mode 100644
index e69de29b..00000000
diff --git a/var/lib/cowrie/.gitignore b/var/lib/cowrie/downloads/.gitignore
similarity index 100%
rename from var/lib/cowrie/.gitignore
rename to var/lib/cowrie/downloads/.gitignore
diff --git a/var/log/.gitignore b/var/log/.gitignore
deleted file mode 100644
index e69de29b..00000000
diff --git a/var/log/cowrie/.gitignore b/var/log/cowrie/.gitignore
deleted file mode 100644
index 475767b7..00000000
--- a/var/log/cowrie/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-cowrie*