diff --git a/Dockerfile b/Dockerfile
index 24ee84a..c8b0213 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,16 +12,16 @@ RUN     apt-get update &&\
         ln -s /usr/bin/lame /opt/data/transcode/lame &&\
         ln -s /usr/bin/avconv /opt/data/transcode/ffmpeg &&\
         cd  ${CATALINA_HOME}/webapps/ &&\
+        rm -rf ROOT &&\
         wget "http://downloads.sourceforge.net/project/subsonic/subsonic/$SUBSONIC_VERSION/subsonic-$SUBSONIC_VERSION-war.zip?r=http%3A%2F%2Fwww.subsonic.org%2Fpages%2Fdownload2.jsp%3Ftarget%3Dsubsonic-$SUBSONIC_VERSION-standalone.tar.gz&ts=1431096340&use_mirror=garr" \
         -O subsonic.war.zip --quiet  &&\
-        unzip subsonic.war.zip && rm subsonic.war.zip
+        unzip subsonic.war.zip && rm subsonic.war.zip && mv subsonic.war ROOT.war
 
-ENV JAVA_OPTS="-Dsubsonic.home=/opt/data -Dsubsonic.defaultMusicFolder=/opt/music/ -Dsubsonic.defaultPodcastFolder=/opt/podcast/ -Dsubsonic.defaultPlaylistFolder=/opt/playlist/"
+ENV JAVA_OPTS="-Dsubsonic.contextPath=/ -Dsubsonic.home=/opt/data -Dsubsonic.defaultMusicFolder=/opt/music/ -Dsubsonic.defaultPodcastFolder=/opt/podcast/ -Dsubsonic.defaultPlaylistFolder=/opt/playlist/"
 
 VOLUME /opt/data
 VOLUME /opt/music/
 VOLUME /opt/playlist/
 VOLUME /opt/podcast/
 
-EXPOSE 8080
-WORKDIR /opt/subsonic
+