diff --git a/tools/docker-compose.yml b/tools/docker-compose.yml
index 4b506c4f36..69a9393ed3 100644
--- a/tools/docker-compose.yml
+++ b/tools/docker-compose.yml
@@ -1,26 +1,37 @@
-tower:
-  build: ./docker-compose
-  ports:
-    - "8080:8080"
-    - "8013:8013"
-  links:
-    - postgres
-    - redis
-    - graphite
-  volumes:
-    - ../:/tower_devel
-postgres:
-  image: postgres:9.4.1
-  # ports:
-  #   - 5432:5432
-redis:
-  image: redis:3.0.1
-  # ports:
-  #   - 6379:6379
-graphite:
-  image: hopsoft/graphite-statsd
-  ports:
-    - "8001:80"
-    - "2003:2003"
-    - "8125:8125/udp"
-    - "8126:8126"
+version: '2'
+services:
+  # Primary Tower Development Container
+  tower:
+    build: ./docker-compose
+    ports:
+      - "8080:8080"
+      - "8013:8013"
+    links:
+      - postgres
+      - redis
+    #   - sync
+    # volumes_from:
+    #   - sync
+    volumes:
+      - "../:/tower_devel"
+
+  # Postgres Database Container
+  postgres:
+    image: postgres:9.4.1
+
+  # Redis Container
+  redis:
+    image: redis:3.0.1
+
+  # Source Code Synchronization Container
+  # sync:
+  #     build:
+  #         context: ./docker-compose
+  #         dockerfile: Dockerfile-sync
+  #     command: "lsyncd -delay 1 -nodaemon -rsync /src /tower_devel"
+  #     volumes:
+  #         - /tower_devel
+  #         - "../:/src"
+  #     working_dir: /src
+  #     stdin_open: true
+  #     tty: true
diff --git a/tools/docker-compose/Dockerfile b/tools/docker-compose/Dockerfile
index cb1cda82b3..0cd8908874 100644
--- a/tools/docker-compose/Dockerfile
+++ b/tools/docker-compose/Dockerfile
@@ -7,11 +7,11 @@ ENV LC_ALL en_US.UTF-8
 RUN apt-get update && apt-get install -y software-properties-common python-software-properties curl
 RUN add-apt-repository -y ppa:chris-lea/redis-server; add-apt-repository -y ppa:chris-lea/zeromq; add-apt-repository -y ppa:chris-lea/node.js; add-apt-repository -y ppa:ansible/ansible; add-apt-repository -y ppa:jal233/proot;
 RUN curl -sL https://deb.nodesource.com/setup_0.12 | bash -
+# TODO: I don't think we need this next line, it's the mongo package key
 RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10
 RUN curl -sL https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
 RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ trusty-pgdg main" | tee /etc/apt/sources.list.d/postgres-9.4.list
-RUN apt-get update
-RUN apt-get install -y openssh-server ansible mg vim tmux git mercurial subversion python-dev python-psycopg2 make postgresql-client libpq-dev nodejs python-psutil libxml2-dev libxslt-dev lib32z1-dev libsasl2-dev libldap2-dev libffi-dev libzmq-dev proot python-pip libxmlsec1-dev swig redis-server && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y openssh-server ansible mg vim tmux git mercurial subversion python-dev python-psycopg2 make postgresql-client libpq-dev nodejs python-psutil libxml2-dev libxslt-dev lib32z1-dev libsasl2-dev libldap2-dev libffi-dev libzmq-dev proot python-pip libxmlsec1-dev swig redis-server libgss-dev libkrb5-dev && apt-get autoremove --purge -y && rm -rf /var/lib/apt/lists/*
 RUN pip install flake8 pytest pytest-pythonpath pytest-django pytest-cov pytest-mock dateutils django-debug-toolbar==1.4 pyflakes==1.0.0 virtualenv
 RUN /usr/bin/ssh-keygen -q -t rsa -N "" -f /root/.ssh/id_rsa
 RUN mkdir -p /etc/tower
diff --git a/tools/docker-compose/Dockerfile-sync b/tools/docker-compose/Dockerfile-sync
new file mode 100644
index 0000000000..2dc99ce8ec
--- /dev/null
+++ b/tools/docker-compose/Dockerfile-sync
@@ -0,0 +1,10 @@
+FROM ubuntu:16.04
+
+RUN PACKAGES="\
+        rsync \
+        lsyncd \
+    " && \
+    apt-get update && \
+    apt-get install -y $PACKAGES && \
+    apt-get autoremove --purge -y && \
+    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*