diff --git a/README.md b/README.md
index f09f90408..14630e061 100644
--- a/README.md
+++ b/README.md
@@ -54,21 +54,14 @@ including database connectivity information.
 
 ## Docker
 
-### Images
-
-For every release, the Joyent test infrastructure publishes a docker image to
-hub.docker.com . These images are available at
-https://hub.docker.com/r/joyentbuildops/conch-api/tags and it is wise to
-consult the Github release page ( https://github.com/joyent/conch/releases ) to
-determine if the release is a staging or production image.
-
-The 'latest' image is not supported and is rebuilt manually and infrequently.
-*Always* use a release tag.
-
 ### Compose
 
 The most simple way to get going with the Conch API is to use Docker Compose.
 
+#### Build
+
+First, build the image locally using `docker/builder.sh`
+
 #### First Run
 
 Copy `conch.conf.dist` to `conch.conf`, modifying for any local parameters.
diff --git a/docker/buildbot-release.bash b/docker/buildbot-release.bash
index 0c80ec517..ed85ed95b 100755
--- a/docker/buildbot-release.bash
+++ b/docker/buildbot-release.bash
@@ -12,7 +12,4 @@ docker run \
 	--rm \
 	--entrypoint=make \
 	${PREFIX}/conch-api:${LABEL} \
-	test \
-&& \
-docker push ${PREFIX}/conch-api:${LABEL}
-
+	test
diff --git a/docs/development.md b/docs/development.md
index 72093797d..671bf75a8 100644
--- a/docs/development.md
+++ b/docs/development.md
@@ -43,9 +43,7 @@ largely be determined in-house.
 
 * When the tag is pushed into Github, Buildbot executes a test run
   and, if successful, creates a new Github release. The text of that
-  release is the changelog that was posted in the relevant tag. Buildbot also
-  creates a docker image of the release and makes it available on
-  [hub.docker](https://hub.docker.com/r/joyentbuildops/conch-api).
+  release is the changelog that was posted in the relevant tag.
 
 * This new release is pushed into staging by a member of the Conch team using
   Ansible (see the private