diff --git a/.gitignore b/.gitignore
index ca5964f..93e2967 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,7 @@ resources/.bootstrap-version
 resources/.bootstrap-registry
 _common/
 
+# State files
+_control/debug
+_control/release
+_control/ready
diff --git a/_control/.keep b/_control/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/build.sh b/build.sh
index af8b4e6..922c79a 100755
--- a/build.sh
+++ b/build.sh
@@ -37,5 +37,5 @@ builder_parse "$@"
 builder_run_action configure bootstrap_configure
 builder_run_action clean     clean_docker_container $PROXY_IMAGE_NAME $PROXY_CONTAINER_NAME
 builder_run_action stop      stop_docker_container  $PROXY_IMAGE_NAME $PROXY_CONTAINER_NAME
-builder_run_action build     build_docker_container $PROXY_IMAGE_NAME $PROXY_CONTAINER_NAME
-builder_run_action start     start_docker_container $PROXY_IMAGE_NAME $PROXY_CONTAINER_NAME $PROXY_CONTAINER_DESC $HOST_PROXY 80
+builder_run_action build     build_docker_container $PROXY_IMAGE_NAME $PROXY_CONTAINER_NAME $BUILDER_CONFIGURATION
+builder_run_action start     start_docker_container $PROXY_IMAGE_NAME $PROXY_CONTAINER_NAME $PROXY_CONTAINER_DESC $HOST_PROXY 80 $BUILDER_CONFIGURATION