diff --git a/Dockerfile b/Dockerfile
index 973478682602cac1009758f42b5100e0281278cf..a5858a252912ff3a3c665da7b7179b0d2f54397c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 # Jenkins Slave
 #
 # REPOSITORY registry.codemate.se/jenkins-slave
-# VERSION 1.0.0
+# VERSION 1.1.0
 
 FROM dockerfile/java
 MAINTAINER Erik Hedenström <erik@codemate.se>
@@ -12,15 +12,26 @@ ENV DEBIAN_PRIORITY critical
 ENV DEBCONF_NOWARNINGS yes
 
 # Set Timezone
-RUN echo "Europe/Stockholm" > /etc/timezone && dpkg-reconfigure -f noninteractive tzdata
+RUN \
+  echo "Europe/Stockholm" > /etc/timezone && \
+  dpkg-reconfigure -f noninteractive tzdata
 
 # Fix locale
-RUN locale-gen en_US.UTF-8
-RUN echo "LANG=\"en_US.UTF-8\"" > /etc/default/locale && echo "LANGUAGE=\"en_US:en\"" >> /etc/default/locale
+RUN \
+  locale-gen en_US.UTF-8 && \
+  echo "LANG=\"en_US.UTF-8\"" > /etc/default/locale && \
+  echo "LANGUAGE=\"en_US.UTF8\"" >> /etc/default/locale && \
+  echo "LC_ALL=\"en_US.UTF8\"" >> /etc/default/locale
+
+# Import self-signed cert as trusted CA
+RUN \
+  openssl s_client -servername cert.codemate.se -connect codemate.se:443 </dev/null | sed -ne '/--BEGIN CERTIFICATE--/,/--END CERTIFICATE--/p' > /tmp/codemate.cert && \
+  keytool -import -noprompt -trustcacerts -keystore /usr/lib/jvm/java-7-oracle/jre/lib/security/cacerts -storepass changeit -noprompt -alias codemate-self-signed -file /tmp/codemate.cert
 
 # Install OpenSSH Server
-RUN apt-get install -y openssh-server
-RUN mkdir -p /var/run/sshd
+RUN \
+  apt-get install -y openssh-server && \
+  mkdir -p /var/run/sshd
 
 # Run install scripts
 ENV JENKINS_HOME /var/lib/jenkins
@@ -30,4 +41,4 @@ RUN for INSTALLER in `ls /tmp/install/*.sh | sort -n`; do /bin/bash $INSTALLER;
 # Start SSH Daemon
 EXPOSE 22
 VOLUME ["/var/lib/jenkins"]
-CMD ["/usr/sbin/sshd", "-e", "-D"]
\ No newline at end of file
+CMD ["/usr/sbin/sshd", "-e", "-D"]