diff --git a/README.md b/README.md
index 74dbe98081..e1a9f8e1df 100644
--- a/README.md
+++ b/README.md
@@ -2,21 +2,48 @@ superhappyfunshow
 =================
 
 A proof of concept demonstrating deployment of OpenStack Services within Docker
-containers using Kubernetes on Project Atomic.
+containers using Kubernetes.
 
 
 Getting Started
-=================
+===============
 
 Kubernetes deployment on bare metal is a complex topic which is beyond the
 scope of this project at this time.  The developers still require a test
 environment.  As a result, one of the developers has created a Heat based
-deployment tool that can be found here:
+deployment tool that can be
+found [here](https://github.com/larsks/heat-kubernetes).
 
-https://github.com/larsks/heat-kubernetes
+
+Build Docker Images 
+-------------------
+
+Within the docker directory is a tool called build.  This tool will build
+all of the docker images that have been implemented.  Each OpenStack service is
+implemented as a separate container that can later be registered with
+Kubernetes.
+
+** [sdake@bigiron docker]$ sudo ./build **
+
+A 20-30 minute build process will begin where containers will be built for
+each OpenStack service.  Once finished the docker images can be examined with
+the docker CLI.
+
+** [sdake@bigiron docker]$ sudo docker images **
+
+A list of the built docker images will be shown.
+
+Note at this time the images do not yet work correctly or operate on their
+defined environment variables.  They are essentially placeholders.
+
+
+Use Kubernetes to Deploy OpenStack
+----------------------------------
+
+This has not been implemented.
 
 
 Directories
-=================
+===========
 
-* docker     - contains artifacts for use with docker build to build appropriate images
+* docker - contains artifacts for use with docker build to build appropriate images
diff --git a/docker/build b/docker/build
new file mode 100755
index 0000000000..56831ba040
--- /dev/null
+++ b/docker/build
@@ -0,0 +1,12 @@
+#!/bin/bash
+# If the directories were numbered, a simple find could be used to build ;-)
+
+CONTAINERS=(fedora-rdo-base cinder glance/glance-base glance/glance-api glance/glance-registry heat/heat-base heat/heat-api heat/heat-engine keystone mariadb rabbitmq swift/swift-base swift/swift-account swift/swift-container swift/swift-object swift/swift-proxy-server)
+
+for IMAGE in ${CONTAINERS[@]}; do
+        echo "Building $IMAGE"
+        pushd .
+        cd ${IMAGE}
+        ./build
+        popd
+done
diff --git a/docker/cinder/build b/docker/cinder/build
new file mode 100755
index 0000000000..6a1b9d7134
--- /dev/null
+++ b/docker/cinder/build
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker build --tag fedora-rdo-cinder .
diff --git a/docker/fedora-rdo-base/build b/docker/fedora-rdo-base/build
new file mode 100755
index 0000000000..918aff44d2
--- /dev/null
+++ b/docker/fedora-rdo-base/build
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker build --tag fedora-rdo-base .
diff --git a/docker/glance/glance-api/Dockerfile b/docker/glance/glance-api/Dockerfile
index 382445c00f..3d9992a5e0 100644
--- a/docker/glance/glance-api/Dockerfile
+++ b/docker/glance/glance-api/Dockerfile
@@ -1,4 +1,4 @@
-FROM glance-base
+FROM fedora-rdo-glance-base
 MAINTAINER Lars Kellogg-Stedman <lars@redhat.com>
 
 ADD ./start.sh /start.sh
diff --git a/docker/glance/glance-api/build b/docker/glance/glance-api/build
new file mode 100755
index 0000000000..8e403a9a76
--- /dev/null
+++ b/docker/glance/glance-api/build
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker build --tag fedora-rdo-glance-api .
diff --git a/docker/glance/glance-base/build b/docker/glance/glance-base/build
new file mode 100755
index 0000000000..9a3a500c9d
--- /dev/null
+++ b/docker/glance/glance-base/build
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker build --tag fedora-rdo-glance-base .
diff --git a/docker/glance/glance-registry/Dockerfile b/docker/glance/glance-registry/Dockerfile
index e51be06eca..3d9992a5e0 100644
--- a/docker/glance/glance-registry/Dockerfile
+++ b/docker/glance/glance-registry/Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora-rdo-base
+FROM fedora-rdo-glance-base
 MAINTAINER Lars Kellogg-Stedman <lars@redhat.com>
 
 ADD ./start.sh /start.sh
diff --git a/docker/glance/glance-registry/build b/docker/glance/glance-registry/build
new file mode 100755
index 0000000000..8c3c0d4764
--- /dev/null
+++ b/docker/glance/glance-registry/build
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker build --tag fedora-rdo-glance-registry .
diff --git a/docker/heat/heat-api/build b/docker/heat/heat-api/build
new file mode 100755
index 0000000000..5c63fdb172
--- /dev/null
+++ b/docker/heat/heat-api/build
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker build --tag fedora-rdo-heat-api .
diff --git a/docker/heat/heat-base/build b/docker/heat/heat-base/build
new file mode 100755
index 0000000000..937f259704
--- /dev/null
+++ b/docker/heat/heat-base/build
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker build --tag fedora-rdo-heat-base .
diff --git a/docker/heat/heat-engine/build b/docker/heat/heat-engine/build
new file mode 100755
index 0000000000..b83ee28193
--- /dev/null
+++ b/docker/heat/heat-engine/build
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker build --tag fedora-rdo-heat-engine .
diff --git a/docker/keystone/build b/docker/keystone/build
new file mode 100755
index 0000000000..a92662c05e
--- /dev/null
+++ b/docker/keystone/build
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker build --tag fedora-rdo-keystone .
diff --git a/docker/mariadb/build b/docker/mariadb/build
new file mode 100755
index 0000000000..7493d76544
--- /dev/null
+++ b/docker/mariadb/build
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker build --tag fedora-rdo-mariadb .
diff --git a/docker/rabbitmq/build b/docker/rabbitmq/build
new file mode 100755
index 0000000000..3636a36311
--- /dev/null
+++ b/docker/rabbitmq/build
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker build --tag fedora-rdo-rabbitmq .
diff --git a/docker/rhel-osp-base/build b/docker/rhel-osp-base/build
new file mode 100755
index 0000000000..cec1d2af1a
--- /dev/null
+++ b/docker/rhel-osp-base/build
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker build --tag rhel-osp-base .
diff --git a/docker/swift/swift-account/build b/docker/swift/swift-account/build
index d1733a86b1..e6f8668646 100755
--- a/docker/swift/swift-account/build
+++ b/docker/swift/swift-account/build
@@ -1,2 +1,2 @@
 #!/bin/bash
-sudo docker build --tag fedora-rdo-swift-account-server .
+docker build --tag fedora-rdo-swift-account-server .
diff --git a/docker/swift/swift-base/build b/docker/swift/swift-base/build
index 9ad15afd64..374471486d 100755
--- a/docker/swift/swift-base/build
+++ b/docker/swift/swift-base/build
@@ -1,2 +1,2 @@
 #!/bin/bash
-sudo docker build --tag swift-proxy-base .
+docker build --tag fedora-rdo-swift-base .
diff --git a/docker/swift/swift-container/build b/docker/swift/swift-container/build
index 866c638ec4..da13449cff 100755
--- a/docker/swift/swift-container/build
+++ b/docker/swift/swift-container/build
@@ -1,2 +1,2 @@
 #!/bin/bash
-sudo docker build --tag fedora-rdo-swift-container-server .
+docker build --tag fedora-rdo-swift-container-server .
diff --git a/docker/swift/swift-object/build b/docker/swift/swift-object/build
index c25af585c7..44a80f3a00 100755
--- a/docker/swift/swift-object/build
+++ b/docker/swift/swift-object/build
@@ -1,2 +1,2 @@
 #!/bin/bash
-sudo docker build --tag fedora-rdo-swift-object-server .
+docker build --tag fedora-rdo-swift-object-server .
diff --git a/docker/swift/swift-proxy-server/build b/docker/swift/swift-proxy-server/build
index 376c1fb5b3..804cd4e5d6 100755
--- a/docker/swift/swift-proxy-server/build
+++ b/docker/swift/swift-proxy-server/build
@@ -1,2 +1,2 @@
 #!/bin/bash
-sudo docker build --tag fedora-rdo-swift-proxy-server .
+docker build --tag fedora-rdo-swift-proxy-server .