diff --git a/build/master-manifest.yaml b/build/master-manifest.yaml
new file mode 100644
index 0000000000..b183f34dd9
--- /dev/null
+++ b/build/master-manifest.yaml
@@ -0,0 +1,49 @@
+version: v1beta1
+
+# For now the apiserver, controller, etcd and registry are all in one pod
+# when we move to v1beta2 for the manifest API, we should move them to separate
+# pods
+id: master-pod
+containers:
+  - name: registry
+    image: google/docker-registry
+    ports:
+      - name: registry 
+        hostPort: 5000
+        containerPort: 5000
+    env:
+      - key: GCS_BUCKET
+        value: kubernetes-releases-f8e0c
+      - key: STORAGE_PATH
+        value: docker-reg/
+  - name: etcd
+    image: coreos/etcd
+    ports:
+      - name: etcd
+        hostPort: 4001
+        containerPort: 4001
+    volumeMounts:
+      - name: etcddata
+        path: /mnt/etcd
+    command: ["/opt/etcd/bin/etcd", "-data-dir", "/mnt/etcd"]
+  - name: master
+    image: localhost:5000/kubernetes-apiserver
+    ports:
+      - name: server
+        hostPort: 8080
+        containerPort: 8080
+    env:
+      - key: KUBE_MINIONS
+        value: cloudvm
+      - key: ETCD_SERVERS
+        value: http://127.0.0.1:4001
+  - name: controller-manager
+    image: localhost:5000/kubernetes-controller-manager
+    env:
+      - key: ETCD_SERVERS
+        value: http://127.0.0.1:4001
+      - key: API_SERVER
+        value: 127.0.0.1:8090
+    
+volumes:
+  - name: etcddata
diff --git a/build/run-images/apiserver/Dockerfile b/build/run-images/apiserver/Dockerfile
index 4259309f97..03db74f61f 100644
--- a/build/run-images/apiserver/Dockerfile
+++ b/build/run-images/apiserver/Dockerfile
@@ -22,4 +22,4 @@ ENV KUBE_MINIONS ""
 
 ADD . /kubernetes
 
-CMD ['./run.sh']
+CMD ["/kubernetes/run.sh"]
diff --git a/build/run-images/apiserver/run.sh b/build/run-images/apiserver/run.sh
index 75ce1747e5..3cc667acbc 100755
--- a/build/run-images/apiserver/run.sh
+++ b/build/run-images/apiserver/run.sh
@@ -18,4 +18,4 @@
 # configuration and that we have a local minion.
 KUBE_MINIONS=${KUBE_MINIONS:$(hostname -f)}
 
-./apiserver -master=127.0.0.1:8080 -etcd_servers="${ETCD_SERVERS}" --machines="${KUBE_MINIONS}"
+./apiserver -address=0.0.0.0 -etcd_servers="${ETCD_SERVERS}" --machines="${KUBE_MINIONS}"
diff --git a/build/run-images/base/Dockerfile b/build/run-images/base/Dockerfile
index 823840e14c..e386b2d65a 100644
--- a/build/run-images/base/Dockerfile
+++ b/build/run-images/base/Dockerfile
@@ -14,7 +14,7 @@
 
 # This file creates a minimal container for running Kubernetes binaries
 
-FROM  busybox
+FROM google/debian:wheezy 
 MAINTAINER  Joe Beda <jbeda@google.com>
 
 WORKDIR /kubernetes
diff --git a/build/run-images/controller-manager/Dockerfile b/build/run-images/controller-manager/Dockerfile
index c983de1298..9af445627f 100644
--- a/build/run-images/controller-manager/Dockerfile
+++ b/build/run-images/controller-manager/Dockerfile
@@ -22,4 +22,4 @@ ENV API_SERVER   127.0.0.1:8080
 
 ADD . /kubernetes
 
-CMD ['./run.sh']
+CMD ["/kubernetes/run.sh"]
diff --git a/build/run-images/proxy/Dockerfile b/build/run-images/proxy/Dockerfile
index f880f065b4..1c56038553 100644
--- a/build/run-images/proxy/Dockerfile
+++ b/build/run-images/proxy/Dockerfile
@@ -21,4 +21,4 @@ ENV ETCD_SERVERS http://127.0.0.1:4001
 
 ADD . /kubernetes
 
-CMD ['./run.sh']
+CMD ["/kubernetes/run.sh"]