diff --git a/iceweasel/Dockerfile b/iceweasel/Dockerfile
index 4284128..9c02677 100644
--- a/iceweasel/Dockerfile
+++ b/iceweasel/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:sid
+FROM debian:stretch
 MAINTAINER Jessica Frazelle <jess@docker.com>
 
 RUN apt-get update && apt-get install -y \
diff --git a/visualstudio/Dockerfile b/visualstudio/Dockerfile
index fbf9ca5..d55ecee 100644
--- a/visualstudio/Dockerfile
+++ b/visualstudio/Dockerfile
@@ -8,41 +8,60 @@
 # 	--name visualstudio \
 # 	jess/visualstudio
 
-FROM jess/chromium
+FROM debian:jessie
 MAINTAINER Jessica Frazelle <jess@docker.com>
 
 RUN apt-get update && apt-get install -y \
-	build-essential \
-	ca-certificates \
-	curl \
-	git \
 	libasound2 \
+	libatk1.0-0 \
+	libcairo2 \
+	libcups2 \
+	libdatrie1 \
+	libdbus-1-3 \
+	libfontconfig1 \
+	libfreetype6 \
 	libgconf-2-4 \
-	libgnome-keyring-dev \
+	libgcrypt20 \
+	libgl1-mesa-dri \
+	libgl1-mesa-glx \
+	libgdk-pixbuf2.0-0 \
+	libglib2.0-0 \
 	libgtk2.0-0 \
+	libgpg-error0 \
+	libgraphite2-3 \
 	libnss3 \
-	libpci3 \
+	libnspr4 \
+	libpango-1.0-0 \
+	libpangocairo-1.0-0 \
+	libxcomposite1 \
+	libxcursor1 \
+	libxdmcp6 \
+	libxi6 \
+	libxrandr2 \
+	libxrender1 \
 	libxtst6 \
-	unzip \
+	liblzma5 \
 	--no-install-recommends
 
 ENV HOME /home/user
 RUN useradd --create-home --home-dir $HOME user \
 	&& chown -R user:user $HOME
 
-# install node
-RUN curl -sL https://deb.nodesource.com/setup | bash -
-RUN apt-get update && apt-get install -y \
-	nodejs \
-	npm \
-	&& rm -rf /var/lib/apt/lists/* \
-	&& npm update -g
-
 # download the source
-RUN curl -sSL https://jesss.s3.amazonaws.com/binaries/VSCode-linux-x64.zip -o /tmp/vs.zip \
+RUN buildDeps=' \
+		ca-certificates \
+		curl \
+		unzip \
+	' \
+	&& set -x \
+	&& apt-get update && apt-get install -y $buildDeps --no-install-recommends \
+	&& curl -sL https://deb.nodesource.com/setup | bash - \
+	&& apt-get update && apt-get install -y nodejs --no-install-recommends \
+	&& rm -rf /var/lib/apt/lists/* \
+	&& curl -sSL https://az764295.vo.msecnd.net/public/0.10.6-release/VSCode-linux64.zip -o /tmp/vs.zip \
 	&& unzip /tmp/vs.zip -d /usr/src/ \
 	&& rm -rf /tmp/vs.zip \
-	&& ln -snf /usr/src/VSCode-linux-x64/Code /usr/local/bin/code
+	&& apt-get purge -y --auto-remove $buildDeps
 
 COPY start.sh /usr/local/bin/start.sh
 WORKDIR $HOME
diff --git a/visualstudio/start.sh b/visualstudio/start.sh
index b65ce2b..e05d704 100755
--- a/visualstudio/start.sh
+++ b/visualstudio/start.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-su user -c code
+su user -c /usr/src/VSCode-linux-x64/Code