diff --git a/docker/.dockerignore b/docker/.dockerignore
new file mode 100644
index 000000000..dd449725e
--- /dev/null
+++ b/docker/.dockerignore
@@ -0,0 +1 @@
+*.md
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 56085b40e..762b20a7d 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:jessie-slim
+FROM debian:stretch-slim
 
 LABEL MAINTAINER="theonlydoo <theonlydoo@gmail.com>"
 
@@ -23,4 +23,4 @@ RUN tar xvf infection_monkey_deb.${RELEASE}.tgz  \
 
 COPY stack.conf /etc/supervisor/conf.d/stack.conf
 
-ENTRYPOINT [ "supervisord", "-n", "-c", "/etc/supervisor/supervisord.conf" ]
\ No newline at end of file
+ENTRYPOINT [ "supervisord", "-n", "-c", "/etc/supervisor/supervisord.conf" ]
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
new file mode 100644
index 000000000..0fa49bf62
--- /dev/null
+++ b/docker/docker-compose.yml
@@ -0,0 +1,23 @@
+version: '3.3'
+
+services:
+  db:
+    image: mongo:4
+    restart: always
+    volumes:
+      - db_data:/data/db
+    environment:
+      MONGO_INITDB_ROOT_USERNAME: root
+      MONGO_INITDB_ROOT_PASSWORD: test
+  monkey:
+    depends_on:
+      - db
+    build: .
+    image: monkey:latest
+    ports:
+      - "5000:5000"
+    environment:
+      MONGO_URL: mongodb://root:test@db:27017/
+
+volumes:
+  db_data:
diff --git a/docker/stack.conf b/docker/stack.conf
index b742c0392..e84d508aa 100644
--- a/docker/stack.conf
+++ b/docker/stack.conf
@@ -1,4 +1,2 @@
-[program:mongod]
-command=/var/monkey_island/bin/mongodb/bin/mongod --quiet --dbpath /var/monkey_island/db
 [program:monkey]
-command=/var/monkey_island/ubuntu/systemd/start_server.sh
+command=/var/monkey/monkey_island/ubuntu/systemd/start_server.sh