diff --git a/.gitignore b/.gitignore
index 6d7373f..f50ca1d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,4 @@ nosetests.xml
 .mr.developer.cfg
 .project
 .pydevproject
+*.swp
diff --git a/mesos/Makefile b/mesos/Makefile
index 2936255..f0abe5e 100644
--- a/mesos/Makefile
+++ b/mesos/Makefile
@@ -2,10 +2,10 @@ all: help
 
 help:
 	@echo 'Options available:'
-	@echo '  make images VERSION=0.20.1-1.0.ubuntu1404'
-	@echo '  make push   VERSION=0.20.1-1.0.ubuntu1404'
+	@echo '  make images VERSION=0.21.0-1.0.debian77'
+	@echo '  make push   VERSION=0.21.0-1.0.debian77'
 	@echo ''
-	@echo 'VERSION should be set to the full Ubuntu 14.04 Mesos package version'
+	@echo 'VERSION should be set to the full Debian 7 Mesos package version'
 
 check-version:
 ifndef VERSION
diff --git a/mesos/README.md b/mesos/README.md
index 3fa88f0..522e13f 100644
--- a/mesos/README.md
+++ b/mesos/README.md
@@ -1 +1,28 @@
-Note: Mesos should be run with Docker host networking (`--net=host`).
+Mesos containers
+================
+
+Build
+-----
+
+```
+make images VERSION=<Debian 7 Mesos pkg version>
+```
+
+Run mesos-master
+----------------
+
+```
+# docker run -d \
+    --net=host \
+    mesosphere/mesos-master:<Debian 7 Mesos pkg version>
+```
+
+Run mesos-slave
+---------------
+
+```
+# docker run -d \
+    -e MESOS_MASTER=<master/zk URL> \
+    --net=host \
+    mesosphere/mesos-slave:<Debian 7 Mesos pkg version>
+```
diff --git a/mesos/dockerfile-templates/.mesos.swp b/mesos/dockerfile-templates/.mesos.swp
deleted file mode 100644
index ad010d5..0000000
Binary files a/mesos/dockerfile-templates/.mesos.swp and /dev/null differ
diff --git a/mesos/dockerfile-templates/mesos b/mesos/dockerfile-templates/mesos
index db5b3c5..91117a7 100644
--- a/mesos/dockerfile-templates/mesos
+++ b/mesos/dockerfile-templates/mesos
@@ -1,7 +1,11 @@
-FROM ubuntu:14.04
+FROM java:7-jre
 MAINTAINER Mesosphere <support@mesosphere.io>
 
-RUN echo "deb http://repos.mesosphere.io/ubuntu/ trusty main" > /etc/apt/sources.list.d/mesosphere.list
-RUN apt-key adv --keyserver keyserver.ubuntu.com --recv E56151BF
-RUN apt-get -y update
-RUN apt-get -y install mesos=VERSION
+ENV MESOS_LOG_DIR /var/log
+
+RUN \
+  echo "deb http://repos.mesosphere.io/debian/ wheezy main" > /etc/apt/sources.list.d/mesosphere.list && \
+  apt-key adv --keyserver keyserver.ubuntu.com --recv E56151BF && \
+  apt-get -y update && \
+  apt-get -y --no-install-recommends install mesos=VERSION && \
+  apt-get clean