diff --git a/Dockerfile b/Dockerfile
index 449d654..f947e28 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ RUN mkdir -p /etc/xenu-nntp
 RUN mkdir -p /var/run/xenu-nntp
 RUN mkdir -p /var/lib/xenu-nntp
 RUN mkdir -p /var/opt/xenu-nntp/bin
-RUN mkdir -p /var/opt/xenu-nntp/lib
+RUN mkdir -p /var/opt/xenu-nntp/lib/xenu_nntp
 
 COPY <<EOF /etc/xenu-nntp/server.conf
 [daemon]
@@ -18,7 +18,7 @@ port = 1190
 tls  = yes
 
 [tls]
-cert = /etc/xenu-nntp/tls/tls.cert
+cert = /etc/xenu-nntp/tls/tls.crt
 key  = /etc/xenu-nntp/tls/tls.key
 
 [database]
@@ -26,8 +26,8 @@ path = /var/lib/xenu-nntp/db.sqlite3
 EOF
 
 COPY bin/xenu-nntp-*    /var/opt/xenu-nntp/bin
-COPY lib/xenu_nntp/*.py /var/opt/xenu-nntp/lib
+COPY lib/xenu_nntp/*.py /var/opt/xenu-nntp/lib/xenu_nntp
 
 ENV PYTHONPATH=/var/opt/xenu-nntp/lib
 
-CMD set -xe; /var/opt/xenu-nntp/bin/xenu-nntp-server
+CMD /var/opt/xenu-nntp/bin/xenu-nntp-server