diff --git a/10/mysql-tomcat/Dockerfile b/10/mysql-tomcat/Dockerfile
index dced527ed60ef34ea34dbb16ccd872f4e53e4a87..15bb402bdeb3552a77768258eb8a46c3226801ed 100644
--- a/10/mysql-tomcat/Dockerfile
+++ b/10/mysql-tomcat/Dockerfile
@@ -17,7 +17,7 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 # ---------------------------------------------------------------------------
-FROM tomcat:8-jre8
+FROM tomcat:8-jre8-slim
 
 #    ____  ____  ____      ____  _   __        _
 #   |_  _||_  _||_  _|    |_  _|(_) [  |  _   (_)
diff --git a/10/mysql-tomcat/xwiki/hibernate.cfg.xml b/10/mysql-tomcat/xwiki/hibernate.cfg.xml
index e2cc2bedac529469a97512c28d007917015acf48..880670af73590d71364a51c404b98277aeac79b9 100644
--- a/10/mysql-tomcat/xwiki/hibernate.cfg.xml
+++ b/10/mysql-tomcat/xwiki/hibernate.cfg.xml
@@ -27,7 +27,7 @@
   <session-factory>
 
     <!-- Please refer to the installation guide on
-         https://platform.xwiki.org/xwiki/bin/view/AdminGuide/Installation for configuring your
+         https://www.xwiki.org/xwiki/bin/view/Documentation/AdminGuide/Installation/ for configuring your
          database. You'll need to do 2 things:
          1) Copy your database driver JAR in WEB-INF/lib or in some shared lib directory
          2) Uncomment the properties below for your specific DB (and comment the default
diff --git a/10/postgres-tomcat/Dockerfile b/10/postgres-tomcat/Dockerfile
index 9eb81f52dd98efb8331024c3b1208355f97b4772..4fedcafe0e78331a2dc4667739c5a36fdc876c54 100644
--- a/10/postgres-tomcat/Dockerfile
+++ b/10/postgres-tomcat/Dockerfile
@@ -17,7 +17,7 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 # ---------------------------------------------------------------------------
-FROM tomcat:8-jre8
+FROM tomcat:8-jre8-slim
 
 #    ____  ____  ____      ____  _   __        _
 #   |_  _||_  _||_  _|    |_  _|(_) [  |  _   (_)
diff --git a/10/postgres-tomcat/xwiki/hibernate.cfg.xml b/10/postgres-tomcat/xwiki/hibernate.cfg.xml
index d050dfdfb832a9535fc2666c501074e51c994d2b..348d39850be10a0c1e0f3c7cbce829ff4b7c4525 100644
--- a/10/postgres-tomcat/xwiki/hibernate.cfg.xml
+++ b/10/postgres-tomcat/xwiki/hibernate.cfg.xml
@@ -27,7 +27,7 @@
   <session-factory>
 
     <!-- Please refer to the installation guide on
-         https://platform.xwiki.org/xwiki/bin/view/AdminGuide/Installation for configuring your
+         https://www.xwiki.org/xwiki/bin/view/Documentation/AdminGuide/Installation/ for configuring your
          database. You'll need to do 2 things:
          1) Copy your database driver JAR in WEB-INF/lib or in some shared lib directory
          2) Uncomment the properties below for your specific DB (and comment the default
diff --git a/11/mysql-tomcat/Dockerfile b/11/mysql-tomcat/Dockerfile
index e8d69b97b2a152b68ab1bf9b81beafcf70a24f56..a688e7d5ca57e102d54e625e21c90ff039a25105 100644
--- a/11/mysql-tomcat/Dockerfile
+++ b/11/mysql-tomcat/Dockerfile
@@ -17,7 +17,7 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 # ---------------------------------------------------------------------------
-FROM tomcat:8-jre8
+FROM tomcat:8-jre8-slim
 
 #    ____  ____  ____      ____  _   __        _
 #   |_  _||_  _||_  _|    |_  _|(_) [  |  _   (_)
diff --git a/11/mysql-tomcat/xwiki/hibernate.cfg.xml b/11/mysql-tomcat/xwiki/hibernate.cfg.xml
index 3dd16ad9845681a6aa71a030fc9fe0f0382603ac..2671c42d6ed9e0d2743acad75e9c21d2c92d03bf 100644
--- a/11/mysql-tomcat/xwiki/hibernate.cfg.xml
+++ b/11/mysql-tomcat/xwiki/hibernate.cfg.xml
@@ -27,7 +27,7 @@
   <session-factory>
 
     <!-- Please refer to the installation guide on
-         https://platform.xwiki.org/xwiki/bin/view/AdminGuide/Installation for configuring your
+         https://www.xwiki.org/xwiki/bin/view/Documentation/AdminGuide/Installation/ for configuring your
          database. You'll need to do 2 things:
          1) Copy your database driver JAR in WEB-INF/lib or in some shared lib directory
          2) Uncomment the properties below for your specific DB (and comment the default
diff --git a/11/postgres-tomcat/Dockerfile b/11/postgres-tomcat/Dockerfile
index c13e4f2ebbd9014588049b6bf6681f001ab3da41..e1ac27c696fed9ae3d12b0055de9610133a87493 100644
--- a/11/postgres-tomcat/Dockerfile
+++ b/11/postgres-tomcat/Dockerfile
@@ -17,7 +17,7 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 # ---------------------------------------------------------------------------
-FROM tomcat:8-jre8
+FROM tomcat:8-jre8-slim
 
 #    ____  ____  ____      ____  _   __        _
 #   |_  _||_  _||_  _|    |_  _|(_) [  |  _   (_)
diff --git a/11/postgres-tomcat/xwiki/hibernate.cfg.xml b/11/postgres-tomcat/xwiki/hibernate.cfg.xml
index c77c8ba2ff67928500e013659b517992681a7557..e8915631cfe0ac293be4dcd22251fc69b4a9e256 100644
--- a/11/postgres-tomcat/xwiki/hibernate.cfg.xml
+++ b/11/postgres-tomcat/xwiki/hibernate.cfg.xml
@@ -27,7 +27,7 @@
   <session-factory>
 
     <!-- Please refer to the installation guide on
-         https://platform.xwiki.org/xwiki/bin/view/AdminGuide/Installation for configuring your
+         https://www.xwiki.org/xwiki/bin/view/Documentation/AdminGuide/Installation/ for configuring your
          database. You'll need to do 2 things:
          1) Copy your database driver JAR in WEB-INF/lib or in some shared lib directory
          2) Uncomment the properties below for your specific DB (and comment the default
diff --git a/template/Dockerfile b/template/Dockerfile
index 74b1177b455f5e5e028b25201f24eda153e0629a..e1f38ab6bbcc894a312536c729e857adc670e14f 100644
--- a/template/Dockerfile
+++ b/template/Dockerfile
@@ -17,7 +17,7 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 # ---------------------------------------------------------------------------
-FROM tomcat:8-jre8
+FROM tomcat:8-jre8-slim
 
 #    ____  ____  ____      ____  _   __        _
 #   |_  _||_  _||_  _|    |_  _|(_) [  |  _   (_)