diff --git a/Dockerfile.windows b/Dockerfile.windows
index d6ff2d5f38..0f247089a6 100644
--- a/Dockerfile.windows
+++ b/Dockerfile.windows
@@ -23,9 +23,9 @@ ENV DOCKER_MACHINE_VERSION 0.5.6
 ENV DOCKER_COMPOSE_VERSION 1.5.2
 ENV BOOT2DOCKER_ISO_VERSION $DOCKER_VERSION
 ENV KITEMATIC_VERSION 0.9.5.1
-ENV VIRTUALBOX_VERSION 5.0.12
-ENV VIRTUALBOX_REVISION 104815
-ENV GIT_VERSION 2.5.0
+ENV VIRTUALBOX_VERSION 5.0.14
+ENV VIRTUALBOX_REVISION 105127
+ENV GIT_VERSION 2.7.0
 ENV MIXPANEL_TOKEN c306ae65c33d7d09fe3e546f36493a6e
 
 RUN mkdir /bundle
diff --git a/script/build-windows b/script/build-windows
index 93c9e75ee7..a7a102505f 100755
--- a/script/build-windows
+++ b/script/build-windows
@@ -1,4 +1,6 @@
-#!/bin/bash
+#!/bin/sh
+
+set -e
 
 docker build -t windows-installer -f Dockerfile.windows .
 CONTAINER="$(docker run -d windows-installer)"