diff --git a/Dockerfile b/Dockerfile
index d2b57345860f5dbb4b566e163bbc7b7ad0ad7fde..36cff8eecd1425c32db293f9f35ab9326904cc96 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,9 +11,6 @@ ENV DEBIAN_FRONTEND noninteractive
 ENV DEBIAN_PRIORITY critical
 ENV DEBCONF_NOWARNINGS yes
 
-# Fix locale
-RUN locale-gen en_US.UTF-8
-
 # Install OpenSSH Server
 RUN apt-get install -y openssh-server
 RUN mkdir -p /var/run/sshd
diff --git a/install/01_jenkins_user.sh b/install/01_jenkins_user.sh
index 0353e1cc3c834e904c5a36b4a32045457889ceba..a15237c323fdd20c7599e7acc9f1afeb91c950c5 100755
--- a/install/01_jenkins_user.sh
+++ b/install/01_jenkins_user.sh
@@ -21,3 +21,6 @@ echo "AllowAgentForwarding yes" >> /etc/ssh/sshd_config
 
 # Create tool dir
 mkdir -p $JENKINS_HOME/tools
+
+echo "export JENKINS_HOME=$JENKINS_HOME" > /etc/profile.d/jenkins.sh
+chmod 755 /etc/profile.d/jenkins.sh
diff --git a/install/10_build_essential.sh b/install/10_build_essential.sh
index 498b67d0dc9a71be8d5bf257423349a6e1033bb6..2f3df39b5451e0cd2a7e458b6abd5849d4c1786e 100755
--- a/install/10_build_essential.sh
+++ b/install/10_build_essential.sh
@@ -2,8 +2,5 @@
 
 set -e # Exit on errors
 
-echo "deb http://security.ubuntu.com/ubuntu quantal-security main " >> /etc/apt/sources.list
-
-apt-get update
 apt-get -y install build-essential checkinstall
 apt-get -y install cvs subversion git-core mercurial
diff --git a/install/11_docker.sh b/install/11_docker.sh
index 92e3ef7bd68c8b1234f8196a82629b9d605d36aa..d7ac6ca3dc3050a3fe1c2941789bdc02e374d52e 100755
--- a/install/11_docker.sh
+++ b/install/11_docker.sh
@@ -6,6 +6,5 @@ mkdir -p $JENKINS_HOME/tools/docker/bin
 curl -s https://get.docker.io/builds/Linux/x86_64/docker-latest -o $JENKINS_HOME/tools/docker/bin/docker
 chmod 755 $JENKINS_HOME/tools/docker/bin/docker
 
-DOCKER_HOME=$JENKINS_HOME/tools/docker
-echo "export PATH=$DOCKER_HOME/bin:\$PATH" > /etc/profile.d/docker.sh
+echo "export PATH=$JENKINS_HOME/tools/docker/bin:\$PATH" > /etc/profile.d/docker.sh
 chmod 755 /etc/profile.d/docker.sh
diff --git a/install/12_chrome_xvfb.sh b/install/12_chrome_xvfb.sh
index 3475864671d0ffe97c87ac6001e0e9d422ae4e5e..4aba82f220f7e658642307d15d41aecb59b84334 100644
--- a/install/12_chrome_xvfb.sh
+++ b/install/12_chrome_xvfb.sh
@@ -7,3 +7,14 @@ echo "deb http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources
 
 apt-get update
 apt-get -y install x11vnc xvfb fluxbox google-chrome-stable
+
+LATEST_RELEASE=`curl -s http://chromedriver.storage.googleapis.com/LATEST_RELEASE`
+
+mkdir -p $JENKINS_HOME/tools/chromedriver/bin
+curl -s http://chromedriver.storage.googleapis.com/${LATEST_RELEASE}/chromedriver_linux64.zip -o /tmp/chromedriver_linux64.zip
+unzip -o /tmp/chromedriver_linux64.zip -d $JENKINS_HOME/tools/chromedriver/bin
+rm /tmp/chromedriver_linux64.zip
+chmod 755 $JENKINS_HOME/tools/chromedriver/bin/chromedriver
+
+echo "export PATH=$JENKINS_HOME/tools/docker/bin:\$PATH" > /etc/profile.d/chromedriver.sh
+chmod 755 /etc/profile.d/chromedriver.sh