diff --git a/update-demo/0-build-images.sh b/update-demo/0-build-images.sh
index c07a3aca..d6e7e946 100755
--- a/update-demo/0-build-images.sh
+++ b/update-demo/0-build-images.sh
@@ -27,6 +27,7 @@ fi
 
 set -x
 
+docker build -t update-demo-base images/base
 docker build -t "${DOCKER_HUB_USER}/update-demo:kitten" images/kitten
 docker build -t "${DOCKER_HUB_USER}/update-demo:nautilus" images/nautilus
 
diff --git a/update-demo/images/base/Dockerfile b/update-demo/images/base/Dockerfile
new file mode 100644
index 00000000..428a708a
--- /dev/null
+++ b/update-demo/images/base/Dockerfile
@@ -0,0 +1,22 @@
+# Copyright 2014 Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+FROM dockerfile/nginx
+
+ADD default /etc/nginx/sites-available/default
+
+ONBUILD ADD html /usr/share/nginx/html
+ONBUILD RUN chmod -R a+r /usr/share/nginx/html
+
+CMD ["nginx"]
diff --git a/update-demo/images/base/default b/update-demo/images/base/default
new file mode 100644
index 00000000..03b952fa
--- /dev/null
+++ b/update-demo/images/base/default
@@ -0,0 +1,37 @@
+# Copyright 2014 Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+server {
+  listen 80 default_server;
+  listen [::]:80 default_server ipv6only=on;
+
+  root /usr/share/nginx/html;
+  index index.html index.htm;
+
+  # Make site accessible from http://localhost/
+  server_name localhost;
+
+  location / {
+    try_files $uri $uri/ =404;
+    expires           0;
+    add_header        Cache-Control private;
+
+    if ($request_method = 'GET') {
+      add_header 'Access-Control-Allow-Origin' '*';
+      add_header 'Access-Control-Allow-Credentials' 'true';
+      add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
+      add_header 'Access-Control-Allow-Headers' 'DNT,X-Mx-ReqToken,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type';
+    }
+  }
+}
diff --git a/update-demo/images/kitten/Dockerfile b/update-demo/images/kitten/Dockerfile
index ea142cbc..f6de6de1 100644
--- a/update-demo/images/kitten/Dockerfile
+++ b/update-demo/images/kitten/Dockerfile
@@ -12,5 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM kubernetes/test-webserver
-ADD html/data.json html/kitten.jpg /
+FROM update-demo-base
diff --git a/update-demo/images/nautilus/Dockerfile b/update-demo/images/nautilus/Dockerfile
index eb7115d0..f6de6de1 100644
--- a/update-demo/images/nautilus/Dockerfile
+++ b/update-demo/images/nautilus/Dockerfile
@@ -12,5 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM kubernetes/test-webserver
-ADD html/data.json html/nautilus.jpg /
+FROM update-demo-base