diff --git a/scripts/Dockerfile b/scripts/Dockerfile
index 40d6f89..995e88f 100644
--- a/scripts/Dockerfile
+++ b/scripts/Dockerfile
@@ -17,7 +17,10 @@ FROM fedora:latest
 RUN dnf install -y git-core python3-markdown python3-setuptools python3-affine python3-shapely pstoedit && dnf clean all
 
 # Get Boxes.py sources to /boxes
-RUN git clone --depth 1 -b master https://github.com/florianfesti/boxes.git
+ARG BUILD_BRANCH=master
+ARG BUILD_REPO=https://github.com/florianfesti/boxes.git
+RUN git clone ${BUILD_REPO} && cd boxes && git checkout ${BUILD_BRANCH}
+RUN chmod +x /boxes/scripts/boxesserver
 
 # Internal port used
 EXPOSE 8000
diff --git a/scripts/boxesserver b/scripts/boxesserver
index fdc23c7..1ad7502 100755
--- a/scripts/boxesserver
+++ b/scripts/boxesserver
@@ -565,7 +565,7 @@ if __name__=="__main__":
 
     parser = argparse.ArgumentParser()
 
-    parser.add_argument("--host", default="localhost")
+    parser.add_argument("--host", default="")
     parser.add_argument("--port", type=int, default=8000)
     parser.add_argument("--url_prefix", default="",
                         help="URL path to Boxes.py instance")