diff --git a/base/Dockerfile b/base/Dockerfile
index 9e464eb3..ebc4f76e 100644
--- a/base/Dockerfile
+++ b/base/Dockerfile
@@ -1,5 +1,8 @@
-FROM google/debian:wheezy
+FROM phusion/baseimage:latest
+CMD ["/sbin/my_init"]
 
 RUN apt-get update -y && apt-get install --no-install-recommends -y -q build-essential python2.7 python2.7-dev python-pip git
 RUN pip install -U pip
 RUN pip install virtualenv
+
+RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
diff --git a/hello/Dockerfile b/hello/Dockerfile
index acbdb568..fd8be1b3 100644
--- a/hello/Dockerfile
+++ b/hello/Dockerfile
@@ -1 +1 @@
-FROM google/python-runtime
+FROM picorb/python-runtime
diff --git a/runtime/Dockerfile b/runtime/Dockerfile
index 90523697..dc2deeb1 100644
--- a/runtime/Dockerfile
+++ b/runtime/Dockerfile
@@ -1,4 +1,4 @@
-FROM google/python
+FROM picorb/python
 
 WORKDIR /app
 ONBUILD RUN virtualenv /env