diff --git a/12/mysql-tomcat/Dockerfile b/12/mysql-tomcat/Dockerfile
index fbbf0b983ce3a72f3bc3dd0e8d6bf34fadfa2a8f..930896cc36bdf4d4982308065348e10d20d13c0b 100644
--- a/12/mysql-tomcat/Dockerfile
+++ b/12/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-jdk11-adoptopenjdk-hotspot
+FROM tomcat:8-jdk11-temurin
 
 #    ____  ____  ____      ____  _   __        _
 #   |_  _||_  _||_  _|    |_  _|(_) [  |  _   (_)
diff --git a/12/postgres-tomcat/Dockerfile b/12/postgres-tomcat/Dockerfile
index c9f6f00af34541ff7f40ebb264347d6d8cc58a68..e6de267682b8e40e2daa2fd42fac8a623c74170e 100644
--- a/12/postgres-tomcat/Dockerfile
+++ b/12/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-jdk11-adoptopenjdk-hotspot
+FROM tomcat:8-jdk11-temurin
 
 #    ____  ____  ____      ____  _   __        _
 #   |_  _||_  _||_  _|    |_  _|(_) [  |  _   (_)
diff --git a/13/mysql-tomcat/Dockerfile b/13/mysql-tomcat/Dockerfile
index 9e676e76181467e487b11d50d797a23a8cd5177e..32dfcfefa8d9ec6b1fac3f378c24f72a5fc01106 100644
--- a/13/mysql-tomcat/Dockerfile
+++ b/13/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-jdk11-adoptopenjdk-hotspot
+FROM tomcat:8-jdk11-temurin
 
 #    ____  ____  ____      ____  _   __        _
 #   |_  _||_  _||_  _|    |_  _|(_) [  |  _   (_)
diff --git a/13/postgres-tomcat/Dockerfile b/13/postgres-tomcat/Dockerfile
index 2c19d4d3c72f4e9976cce24c01659f5e507147c2..0b79fc5aa7100fdeb33126739ccede1e4b9ed5be 100644
--- a/13/postgres-tomcat/Dockerfile
+++ b/13/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-jdk11-adoptopenjdk-hotspot
+FROM tomcat:8-jdk11-temurin
 
 #    ____  ____  ____      ____  _   __        _
 #   |_  _||_  _||_  _|    |_  _|(_) [  |  _   (_)
diff --git a/template/Dockerfile b/template/Dockerfile
index d80241ed644696a9a1b586198198e9073e3b2cdb..23feb5832c3ffad487871a795f820710570541f3 100644
--- a/template/Dockerfile
+++ b/template/Dockerfile
@@ -18,9 +18,9 @@
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 # ---------------------------------------------------------------------------
 <% if (xwikiVersion.startsWith('10.'))
-     print 'FROM tomcat:8-jdk8-adoptopenjdk-hotspot'
+     print 'FROM tomcat:8-jdk8-temurin'
    else
-     print 'FROM tomcat:8-jdk11-adoptopenjdk-hotspot'
+     print 'FROM tomcat:8-jdk11-temurin'
 %>
 
 #    ____  ____  ____      ____  _   __        _