diff --git a/pptpd/Dockerfile b/pptpd/Dockerfile
index a768d5c..7cd5e0e 100644
--- a/pptpd/Dockerfile
+++ b/pptpd/Dockerfile
@@ -5,19 +5,17 @@
 FROM alpine
 MAINTAINER kev<noreply@datageek.info>
 
-RUN apk add -U iptables \
-               ppp \
-               pptpd \
+RUN apk add -U iptables ppp pptpd \
     && rm -rf /var/cache/apk/*
 
-RUN echo "username * password *"      >> /etc/ppp/chap-secrets \
-    && echo "localip 10.10.10.1"      >> /etc/pptpd.conf \
-    && echo "remoteip 10.10.10.2-254" >> /etc/pptpd.conf \
-    && echo "ms-dns 8.8.8.8"          >> /etc/ppp/pptpd-options \
-    && echo "ms-dns 8.8.4.4"          >> /etc/ppp/pptpd-options
+COPY pptpd.conf   /etc/
+COPY chap-secrets /etc/ppp/
+COPY options.pptp /etc/ppp/
 
 EXPOSE 1723
 
 CMD iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE \
-    && pptpd --fg --logwtmp
+    && syslogd \
+    && pptpd \
+    && tail -f /var/log/messages
 
diff --git a/pptpd/README.md b/pptpd/README.md
index 6fa111d..a285adf 100644
--- a/pptpd/README.md
+++ b/pptpd/README.md
@@ -3,6 +3,19 @@ pptpd
 
 This is still a work in progress, a successful connection has not been made.
 
+## docker-compose.yml
+
+```
+pptpd:
+  image: vimagick/pptpd
+  ports:
+    - "1723:1723"
+  volumes:
+    - ./chap-secrets:/etc/ppp/chap-secrets
+  privileged: true
+  restart: always
+```
+
 You must open the following ports:
 
 - To allow PPTP tunnel maintenance traffic, open `1723/tcp`.
diff --git a/pptpd/docker-compose.yml b/pptpd/docker-compose.yml
index 9a1c93f..a69b9a6 100644
--- a/pptpd/docker-compose.yml
+++ b/pptpd/docker-compose.yml
@@ -1,5 +1,5 @@
-pptp:
-  image: vimagick/pptp:latest
+pptpd:
+  image: vimagick/pptpd
   ports:
     - "1723:1723"
   volumes:
diff --git a/pptpd/options.pptp b/pptpd/options.pptp
new file mode 100644
index 0000000..3b1b967
--- /dev/null
+++ b/pptpd/options.pptp
@@ -0,0 +1,7 @@
+lock
+auth
++chap
+name datageek
+proxyarp
+ms-dns 8.8.8.8
+ms-dns 8.8.4.4
diff --git a/pptpd/pptpd.conf b/pptpd/pptpd.conf
new file mode 100644
index 0000000..33b357b
--- /dev/null
+++ b/pptpd/pptpd.conf
@@ -0,0 +1,5 @@
+speed 115200
+option /etc/ppp/options.pptp
+localip 192.168.0.1
+remoteip 192.168.1.100-199
+pidfile /var/run/pptpd.pid