diff --git a/Dockerfile.osx b/Dockerfile.osx
index 5c475b3c..cc93910f 100644
--- a/Dockerfile.osx
+++ b/Dockerfile.osx
@@ -18,20 +18,20 @@ RUN curl -fsSL https://github.com/mackyle/xar/archive/xar-1.6.1.tar.gz | tar xvz
 	./autogen.sh && ./configure && \
 	make && make install
 
-ENV VBOX_VERSION 5.1.14
-ENV VBOX_REV 112924
+ENV VBOX_VERSION 5.1.18
+ENV VBOX_REV 114002
 
 RUN curl -fsSL -o /vbox.dmg http://download.virtualbox.org/virtualbox/$VBOX_VERSION/VirtualBox-$VBOX_VERSION-$VBOX_REV-OSX.dmg \
 	&& echo "$(curl -fsSL 'https://virtualbox.org/download/hashes/'"$VBOX_VERSION"'/SHA256SUMS' | awk '$2 ~ /-OSX.dmg$/ { print $1 }') */vbox.dmg" | sha256sum -c -
 
 # Download the Docker parts
 
-ENV INSTALLER_VERSION 17.03.0-ce
-ENV DOCKER_VERSION 17.03.0-ce
+ENV INSTALLER_VERSION 17.03.1-ce-rc1
+ENV DOCKER_VERSION 17.03.1-ce-rc1
 
 # Change this to 'test.docker.com' for RCs and 'get.docker.com' for official
 # releases.
-ENV DOCKER_ENDPOINT get.docker.com
+ENV DOCKER_ENDPOINT test.docker.com
 
 # Why '--strip-components 3'?  The client binary is in usr/local/bin/docker in
 # the tar archive.  If we extract directly, it will create a usr/local/bin
diff --git a/Dockerfile.windows b/Dockerfile.windows
index 22d92d47..bc4d917c 100644
--- a/Dockerfile.windows
+++ b/Dockerfile.windows
@@ -17,14 +17,14 @@ RUN cd innosetup && \
     wine "./innounp.exe" -e "is-unicode.exe"
 
 # installer components
-ENV INSTALLER_VERSION 17.03.0-ce
-ENV DOCKER_VERSION 17.03.0-ce
+ENV INSTALLER_VERSION 17.03.1-ce-rc1
+ENV DOCKER_VERSION 17.03.1-ce-rc1
 ENV DOCKER_MACHINE_VERSION 0.10.0
 ENV DOCKER_COMPOSE_VERSION 1.11.2
 ENV BOOT2DOCKER_ISO_VERSION $DOCKER_VERSION
 ENV KITEMATIC_VERSION 0.13.1
-ENV VIRTUALBOX_VERSION 5.1.14
-ENV VIRTUALBOX_REVISION 112924
+ENV VIRTUALBOX_VERSION 5.1.18
+ENV VIRTUALBOX_REVISION 114002
 ENV GIT_VERSION 2.9.0
 ENV MIXPANEL_TOKEN c306ae65c33d7d09fe3e546f36493a6e
 
@@ -34,7 +34,7 @@ WORKDIR /bundle
 
 # Change this to 'test.docker.com' for RCs and 'get.docker.com' for official
 # releases.
-ENV DOCKER_ENDPOINT get.docker.com
+ENV DOCKER_ENDPOINT test.docker.com
 
 RUN curl -fsSL -o dockerbins.zip "https://${DOCKER_ENDPOINT}/builds/Windows/x86_64/docker-${DOCKER_VERSION}.zip" && \
     unzip dockerbins.zip && \