diff --git a/agent/Dockerfile b/agent/Dockerfile
index 1ff55a4..d8e507c 100644
--- a/agent/Dockerfile
+++ b/agent/Dockerfile
@@ -1,18 +1,4 @@
-FROM ubuntu:14.04
+FROM containersol/mesos:0.22.1-1.0.ubuntu1404
 MAINTAINER Container Solutions BV <info@container-solutions.com>
 
-ENV VERSION "0.22.1-1.0.ubuntu1404"
-
-RUN echo "deb http://ppa.launchpad.net/openjdk-r/ppa/ubuntu trusty main" > /etc/apt/sources.list.d/openjdk.list && \
-    apt-key adv --keyserver keyserver.ubuntu.com --recv 86F44E2A && \
-    apt-get update && \
-    apt-get -y install openjdk-8-jre-headless && \
-    rm -rf /var/lib/apt/lists/*
-
-RUN echo "deb http://repos.mesosphere.io/ubuntu trusty main" > /etc/apt/sources.list.d/mesosphere.list && \
-    apt-key adv --keyserver keyserver.ubuntu.com --recv E56151BF && \
-    apt-get update && \
-    apt-get -y install mesos=${VERSION} && \
-    rm -rf /var/lib/apt/lists/*
-    
 ENTRYPOINT ["mesos-slave"]
diff --git a/master/Dockerfile b/master/Dockerfile
index a784f3d..b056676 100644
--- a/master/Dockerfile
+++ b/master/Dockerfile
@@ -1,19 +1,5 @@
-FROM ubuntu:14.04
+FROM containersol/mesos:0.22.1-1.0.ubuntu1404
 MAINTAINER Container Solutions BV <info@container-solutions.com>
 
-ENV VERSION "0.22.1-1.0.ubuntu1404"
-
-RUN echo "deb http://ppa.launchpad.net/openjdk-r/ppa/ubuntu trusty main" > /etc/apt/sources.list.d/openjdk.list && \
-    apt-key adv --keyserver keyserver.ubuntu.com --recv 86F44E2A && \
-    apt-get update && \
-    apt-get -y install openjdk-8-jre-headless && \
-    rm -rf /var/lib/apt/lists/*
-
-RUN echo "deb http://repos.mesosphere.io/ubuntu trusty main" > /etc/apt/sources.list.d/mesosphere.list && \
-    apt-key adv --keyserver keyserver.ubuntu.com --recv E56151BF && \
-    apt-get update && \
-    apt-get -y install mesos=${VERSION} && \
-    rm -rf /var/lib/apt/lists/*
-    
 CMD ["--registry=in_memory"]
 ENTRYPOINT ["mesos-master"]