diff --git a/etherpad-lite/Dockerfile b/etherpad-lite/Dockerfile
index 6d070cf..97837cc 100644
--- a/etherpad-lite/Dockerfile
+++ b/etherpad-lite/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:9
+FROM node:latest
 MAINTAINER Tony Motakis <tvelocity@gmail.com>
 
 ENV ETHERPAD_VERSION 1.6.5
@@ -6,9 +6,11 @@ ENV NODE_ENV production
 
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y \
-    curl unzip mysql-client node-pg postgresql-client && \
+    curl unzip mysql-client postgresql-client && \
     rm -r /var/lib/apt/lists/*
 
+RUN npm install pg
+
 WORKDIR /opt/
 
 RUN curl -SL \
diff --git a/etherpad-lite/docker-compose.yml b/etherpad-lite/docker-compose.yml
new file mode 100755
index 0000000..fc63f02
--- /dev/null
+++ b/etherpad-lite/docker-compose.yml
@@ -0,0 +1,28 @@
+version: "2"
+
+services:
+  db:
+     image: mariadb
+     restart: always
+     environment:
+         MYSQL_ROOT_PASSWORD: rootpass
+         MYSQL_DATABASE: etherpad
+         MYSQL_USER: wordpress
+         MYSQL_PASSWORD: wordpress123
+     volumes:
+          - ~/.data:/var/lib/mysql
+  etherpad:
+      build: .
+      depends_on:
+          - db
+      #image: tvelocity/etherpad-lite
+      links:
+          - db
+      restart: always
+      environment:
+         ETHERPAD_DB_HOST: db
+         ETHERPAD_DB_USER: root
+         ETHERPAD_DB_PASSWORD: rootpass
+         ETHERPAD_ADMIN_PASSWORD: admin
+      ports:
+          - 9001:9001