diff --git a/Dockerfile b/Dockerfile
index e110912..6187fa0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,14 @@
-FROM bigfleet/shibboleth_idp
+FROM bigfleet/shibboleth_idp:master
 
 ARG maintainer=tier
 ARG imagename=shibboleth_idp
 ARG version=3.2.1
 ENV VERSION=$version
 
-RUN chown -R root:root /opt/shibboleth/shibboleth-identity-provider-$version
+RUN chown -R root:root /opt/shibboleth/shibboleth-identity-provider-$version && \
+    ANT_OPTS="-Didp.target.dir=/opt/shibboleth/current" /opt/shibboleth/current/bin/build.sh && \
+    ln -s /opt/shibboleth/current /opt/shibboleth-idp && \
+    ln -s /opt/shibboleth-idp/war/idp.war $CATALINA_HOME/webapps/idp.war
 
 EXPOSE 8080
 CMD ["catalina.sh", "run"]
\ No newline at end of file