diff --git a/Dockerfile b/Dockerfile
index 8e2008b..711459b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,15 @@
 FROM jeanblanchard/tomcat:8
 MAINTAINER Markus Birth <markus@birth-online.de>
 
-ENV SUBSONIC_VERSION 6.0
+ENV SUBSONIC_VERSION="6.0" LC_ALL="C.UTF-8" LANG="en_US.UTF-8" LANGUAGE="en_US.UTF-8" TZ="Europe/Berlin"
 
 LABEL version="$SUBSONIC_VERSION"
 LABEL description="Subsonic media streamer"
 
 RUN apk upgrade -U \
- && apk add ca-certificates ffmpeg lame \
+ && apk add ca-certificates ffmpeg lame tzdata \
+ && setup-timezone -z ${TZ} \
+ && apk del tzdata \
  && rm -rf /var/cache/* \
  && mkdir -p /data/transcode /music/ /playlists/ /podcasts/ \
  && ln -s /usr/bin/lame /data/transcode/lame \
@@ -21,9 +23,6 @@ RUN apk upgrade -U \
 ADD server.xml ${CATALINA_HOME}/conf/
 ENV JAVA_OPTS="-Dsubsonic.contextPath=/ -Dsubsonic.home=/data -Dsubsonic.defaultMusicFolder=/music/ -Dsubsonic.defaultPodcastFolder=/podcasts/ -Dsubsonic.defaultPlaylistFolder=/playlists/"
 
-VOLUME /data
-VOLUME /music/
-VOLUME /playlists/
-VOLUME /podcasts/
+VOLUME ["/data", "/music/", "/playlists/", "/podcasts/"]
 
 EXPOSE 8080
diff --git a/README.md b/README.md
index c5ba1de..a1214ad 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,9 @@ Docker (http://docker.io) image for the Subsonic media streamer.
 ## Noteworthy
 
 * Subsonic 6.0 (http://www.subsonic.org)
+* uses jeanblanchard/docker-tomcat with Alpine Linux
+* compiled to a 266 MB image instead of 484 MB
+
 
 ## Build your own image
 
@@ -17,11 +20,11 @@ $ docker build -t <your-name>/docker-subsonic .
 A current image is available as a trusted build from the Docker index:
 
 ```shell
-$ docker pull  cyrilix/subsonic
+$ docker pull mbirth/subsonic
 ```
 
 The repository page is at
-https://index.docker.io/u/cyrilix/subsonic/
+https://hub.docker.com/r/mbirth/subsonic/
 
 
 ## Run a container with this image
@@ -34,5 +37,3 @@ $ docker run \
   <your-name>/subsonic
 
 ```
-
-