diff --git a/Dockerfile b/Dockerfile
index aee7ebdb3b888c7b7cf5395fcd2a6f6b3d64c946..bab7acabe352c0b0ada9de8a1da7808d4ad4e5c2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,40 +1,11 @@
 # Stash
 #
 # REPOSITORY registry.codemate.se/stash
-# VERSION 1.0.0
+# VERSION 1.1.0
 
-FROM dockerfile/java
+FROM registry.codemate.se/java:1.0.0
 MAINTAINER Erik Hedenström <erik@codemate.se>
 
-# Set the env variables to non-interactive
-ENV DEBIAN_FRONTEND noninteractive
-ENV DEBIAN_PRIORITY critical
-ENV DEBCONF_NOWARNINGS yes
-
-# Upgrade packages
-RUN \
-  apt-get -y update && \
-  apt-get -y upgrade
-
-# Set Timezone
-RUN \
-  echo "Europe/Stockholm" > /etc/timezone && \
-  dpkg-reconfigure -f noninteractive tzdata
-
-# Fix 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 \
-  mkdir -p /usr/share/ca-certificates/extra && \
-  openssl s_client -servername cert.codemate.se -connect codemate.se:443 </dev/null | sed -ne '/--BEGIN CERTIFICATE--/,/--END CERTIFICATE--/p' > /usr/share/ca-certificates/extra/codemate.crt && \
-  update-ca-certificates && \
-  keytool -import -noprompt -trustcacerts -keystore /usr/lib/jvm/java-7-oracle/jre/lib/security/cacerts -storepass changeit -noprompt -alias codemate-self-signed -file /usr/share/ca-certificates/extra/codemate.crt
-
 # Install and configure Exim
 RUN \
   apt-get -y install exim4-daemon-light && \
@@ -48,14 +19,14 @@ RUN \
   sed -i -e "s/^bind-address\s*=\s*127.0.0.1/bind-address = 0.0.0.0/" /etc/mysql/my.cnf
 
 # Default Environment
-ENV STASH_VERSION 3.2.0
+ENV STASH_VERSION 3.2.4
 ENV STASH_HOME /home/stash
 
 # Add startup script
 ADD init.sh /init.sh
 
 # Expose ports
-EXPOSE 25 3306 7990 7991 7999
+EXPOSE 7990 7991 7999
 
 # Start JIRA
 CMD ["sh", "/init.sh"]
diff --git a/README.md b/README.md
index bbf21a03f2c3dfdb172512cce0faf9c2c884318b..5bf466dff4e012c46d66b444850c464ac37f5f49 100644
--- a/README.md
+++ b/README.md
@@ -39,10 +39,10 @@ docker run -v /data/stash:/home/stash -d registry.codemate.se/stash
 
 ### Running a different Stash version
 
-By default, the container downloads and installs Stash v3.2.0 on the first boot. To specify which version to install, set the environment variable `STASH_VERSION`:
+By default, the container downloads and installs Stash v3.2.4 on the first boot. To specify which version to install, set the environment variable `STASH_VERSION`:
 
 ```
-docker run -e STASH_VERSION=3.2.0 -d registry.codemate.se/stash
+docker run -e STASH_VERSION=3.2.4 -d registry.codemate.se/stash
 ```
 
 ### Overriding Stash files
@@ -84,7 +84,7 @@ The following example shows the options we use for our CI environment:
 docker run \
   --name stash \
   -e JAVA_OPTS=-Xmx1024m \
-  -e STASH_VERSION=3.2.0 \
+  -e STASH_VERSION=3.2.4 \
   -e STASH_OVERLAY=http://10.0.0.1/stash-config.tgz \
   -v /opt/application-data/stash:/home/stash \
   -p 7990:7990 \
@@ -99,7 +99,7 @@ docker run \
 ## Variables
 
 * `STASH_HOME` - Stash home directory (default `/home/stash`)
-* `STASH_VERSION` - The version to install an run (default `3.2.0`)
+* `STASH_VERSION` - The version to install an run (default `3.2.4`)
 * `STASH_OVERLAY` - A URL pointing to an tarball overlay
 * `MYSQL_INIT` - A URL pointing to an SQL script