diff --git a/tools/Dockerfile b/tools/Dockerfile
index 2fabdd5e..d490a9b5 100644
--- a/tools/Dockerfile
+++ b/tools/Dockerfile
@@ -1,93 +1,94 @@
 FROM debian:jessie-slim
 
-########### Install .NET, Java, Node and Gateway dependencies ###########
-    RUN echo "===> Install Gateway Dependencies..." \
-    ########### Install Java ########### \
-        && echo "deb http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main" | tee /etc/apt/sources.list.d/webupd8team-java.list \
-        && echo "deb-src http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main" | tee -a /etc/apt/sources.list.d/webupd8team-java.list \
-        && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys EEA14886 \
-        && apt-get update \
-        && mkdir -p /usr/share/man/man1/ \
-        && echo debconf shared/accepted-oracle-license-v1-1 select true | debconf-set-selections \
-        && echo debconf shared/accepted-oracle-license-v1-1 seen true | debconf-set-selections \
-        && DEBIAN_FRONTEND=noninteractive apt-get install -y --force-yes oracle-java8-installer oracle-java8-set-default \
-        \
-    ########### DOTNet Deps ########### \
-        && apt-get update && apt-get install -y --no-install-recommends \
-            software-properties-common \
-            libc6 \
-            libcurl3 \
-            libgcc1 \
-            libgssapi-krb5-2 \
-            libicu52 \
-            liblttng-ust0 \
-            libssl1.0.0 \
-            libstdc++6 \
-            libunwind8 \
-            libuuid1 \
-            zlib1g \
-            \
-    ########### Gateway Deps ########### \
-            libglib2.0-dev \
-            ca-certificates \
-            maven \
-            python2.7 \
-            build-essential \
-            curl \
-            libcurl4-openssl-dev \
-            git \
-            cmake \
-            libssl-dev \
-            uuid-dev \
-            valgrind \
-            wget \
-            \
-    ########### Cleanup ########### \
-        && echo "===> clean up..." \
-        && rm -rf /var/cache/oracle-jdk8-installer \
-        && apt-get clean \
-        && rm -rf /var/lib/apt/lists/*
+#### Update package sources
+    ## For Java
+RUN echo "deb http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main" | tee /etc/apt/sources.list.d/webupd8team-java.list \
+    && echo "deb-src http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main" | tee -a /etc/apt/sources.list.d/webupd8team-java.list \
+    && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys EEA14886
+    ## For CMake
+RUN echo "deb http://ftp.debian.org/debian jessie-backports main" | tee /etc/apt/sources.list.d/cmake.list
+RUN apt-get update
 
-    ENV JAVA_HOME /usr/lib/jvm/java-8-oracle
+#### Install Java
+RUN mkdir -p /usr/share/man/man1/ \
+    && echo debconf shared/accepted-oracle-license-v1-1 select true | debconf-set-selections \
+    && echo debconf shared/accepted-oracle-license-v1-1 seen true | debconf-set-selections \
+    && DEBIAN_FRONTEND=noninteractive apt-get install -y oracle-java8-installer oracle-java8-set-default
+ENV JAVA_HOME /usr/lib/jvm/java-8-oracle
 
-########### Install .NET Core SDK ###########
-    ENV DOTNET_SDK_VERSION 1.0.1
-    ENV DOTNET_SDK_DOWNLOAD_URL https://dotnetcli.blob.core.windows.net/dotnet/Sdk/$DOTNET_SDK_VERSION/dotnet-dev-debian-x64.$DOTNET_SDK_VERSION.tar.gz
+#### Install .NET Core dependencies
+RUN apt-get install -y --no-install-recommends \
+        software-properties-common \
+        libc6 \
+        libcurl3 \
+        libgcc1 \
+        libgssapi-krb5-2 \
+        libicu52 \
+        liblttng-ust0 \
+        libssl1.0.0 \
+        libstdc++6 \
+        libunwind8 \
+        libuuid1 \
+        zlib1g
 
-    RUN curl -SL $DOTNET_SDK_DOWNLOAD_URL --output dotnet.tar.gz \
-        && mkdir -p /usr/share/dotnet \
-        && tar -zxf dotnet.tar.gz -C /usr/share/dotnet \
-        && rm dotnet.tar.gz \
-        && ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
+#### Install Libuv dependencies
+RUN apt-get install -y automake libtool \
+    && DEBIAN_FRONTEND=noninteractive apt-get -t jessie-backports install -y cmake
 
-    # Trigger the population of the local package cache
-    ENV NUGET_XMLDOC_MODE skip
-    RUN mkdir warmup \
-        && cd warmup \
-        && dotnet new \
-        && cd .. \
-        && rm -rf warmup \
-        && rm -rf /tmp/NuGetScratch
+#### Install IoT Edge dependencies
+RUN apt-get install -y \
+        libglib2.0-dev \
+        ca-certificates \
+        maven \
+        python2.7 \
+        build-essential \
+        curl \
+        libcurl4-openssl-dev \
+        git \
+        cmake \
+        libssl-dev \
+        uuid-dev \
+        valgrind \
+        wget
 
-########### Install Node ###########
-    RUN wget https://raw.githubusercontent.com/Azure/azure-iot-gateway-sdk/master/tools/build_nodejs.sh -P /tools/ \
-        && chmod +x /tools/build_nodejs.sh \
-        && rm -fr /usr/bin/python && ln -s /usr/bin/python2.7 /usr/bin/python \
-        && /tools/build_nodejs.sh
+#### Cleanup
+RUN rm -rf /var/cache/oracle-jdk8-installer \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
 
-    ENV NODE_INCLUDE /build_nodejs/dist/inc
-    ENV NODE_LIB /build_nodejs/dist/lib
+#### Install .NET Core SDK
+ENV DOTNET_SDK_VERSION 1.0.1
+ENV DOTNET_SDK_DOWNLOAD_URL https://dotnetcli.blob.core.windows.net/dotnet/Sdk/$DOTNET_SDK_VERSION/dotnet-dev-debian-x64.$DOTNET_SDK_VERSION.tar.gz
 
-########### Install Gateway ###########
-    ENV GATEWAY_REPO https://github.com/Azure/azure-iot-gateway-sdk
+RUN curl -SL $DOTNET_SDK_DOWNLOAD_URL --output dotnet.tar.gz \
+    && mkdir -p /usr/share/dotnet \
+    && tar -zxf dotnet.tar.gz -C /usr/share/dotnet \
+    && rm dotnet.tar.gz \
+    && ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
 
-    # start command
-    ENTRYPOINT  rm -rf /gateway \
-                && git clone ${GATEWAY_REPO} /gateway \
-                && git -C /gateway checkout master \
-                && /gateway/tools/build.sh \
-                    --run-unittests \
-                    --enable-java-binding \
-                    --enable-dotnet-core-binding \
-                    --enable-nodejs-binding \
-                && bash
+# Trigger the population of the local package cache
+ENV NUGET_XMLDOC_MODE skip
+RUN mkdir warmup \
+    && cd warmup \
+    && dotnet new \
+    && cd .. \
+    && rm -rf warmup \
+    && rm -rf /tmp/NuGetScratch
+
+#### Install Node.js
+RUN wget https://raw.githubusercontent.com/Azure/iot-edge/master/tools/build_nodejs.sh -P /tools/ \
+    && chmod +x /tools/build_nodejs.sh \
+    && rm -fr /usr/bin/python && ln -s /usr/bin/python2.7 /usr/bin/python \
+    && /tools/build_nodejs.sh
+
+ENV NODE_INCLUDE /build_nodejs/dist/inc
+ENV NODE_LIB /build_nodejs/dist/lib
+
+#### Clone/build latest IoT Edge bits
+ENTRYPOINT  git clone https://github.com/Azure/iot-edge /iotedge \
+            && /iotedge/tools/build.sh \
+                --run-unittests \
+                --enable-java-binding \
+                --enable-dotnet-core-binding \
+                --enable-nodejs-binding \
+            && bash