diff --git a/weave b/weave
index 1926d86a..d4fad485 100755
--- a/weave
+++ b/weave
@@ -14,15 +14,9 @@ IMAGE_VERSION=${VERSION:-$IMAGE_VERSION}
 
 # These are potentially used for remote execs, and have defaults, so
 # we introduce them here
-DOCKER_BRIDGE=${DOCKER_BRIDGE:-docker0}
-PROCFS=${PROCFS:-/proc}
-
-BASE_IMAGE=$DOCKERHUB_USER/weave
-BASE_DNS_IMAGE=$DOCKERHUB_USER/weavedns
 BASE_EXEC_IMAGE=$DOCKERHUB_USER/weaveexec
-IMAGE=$BASE_IMAGE:$IMAGE_VERSION
-DNS_IMAGE=$BASE_DNS_IMAGE:$IMAGE_VERSION
 EXEC_IMAGE=$BASE_EXEC_IMAGE:$IMAGE_VERSION
+PROCFS=${PROCFS:-/proc}
 
 usage() {
     echo "Usage:"
@@ -76,6 +70,12 @@ elif [ "$1" != "run" ]; then
     exit $?
 fi
 
+BASE_IMAGE=$DOCKERHUB_USER/weave
+BASE_DNS_IMAGE=$DOCKERHUB_USER/weavedns
+IMAGE=$BASE_IMAGE:$IMAGE_VERSION
+DNS_IMAGE=$BASE_DNS_IMAGE:$IMAGE_VERSION
+
+DOCKER_BRIDGE=${DOCKER_BRIDGE:-docker0}
 CONTAINER_NAME=${WEAVE_CONTAINER_NAME:-weave}
 DNS_CONTAINER_NAME=weavedns
 BRIDGE=weave