diff --git a/8/mysql-tomcat/xwiki/docker-entrypoint.sh b/8/mysql-tomcat/xwiki/docker-entrypoint.sh
index 753c1043373d2d5ceff1b8574e921a8227cb1b1e..b56ca7d53e6625658ea98f2a046c6373764d03b2 100755
--- a/8/mysql-tomcat/xwiki/docker-entrypoint.sh
+++ b/8/mysql-tomcat/xwiki/docker-entrypoint.sh
@@ -23,7 +23,7 @@ set -e
 
 function first_start() {
   configure
-  touch /usr/local/xwiki/.first_start_completed
+  touch /usr/local/tomcat/webapps/ROOT/.first_start_completed
 }
 
 # $1 - the path to xwiki.[cfg|properties]
@@ -74,7 +74,7 @@ fi
 
 # Check for the expected command
 if [ "$1" = 'xwiki' ]; then
-  if [[ ! -f /usr/local/xwiki/.first_start_completed ]]; then
+  if [[ ! -f /usr/local/tomcat/webapps/ROOT/.first_start_completed ]]; then
     first_start
   fi
   shift
diff --git a/8/postgres-tomcat/xwiki/docker-entrypoint.sh b/8/postgres-tomcat/xwiki/docker-entrypoint.sh
index 753c1043373d2d5ceff1b8574e921a8227cb1b1e..b56ca7d53e6625658ea98f2a046c6373764d03b2 100755
--- a/8/postgres-tomcat/xwiki/docker-entrypoint.sh
+++ b/8/postgres-tomcat/xwiki/docker-entrypoint.sh
@@ -23,7 +23,7 @@ set -e
 
 function first_start() {
   configure
-  touch /usr/local/xwiki/.first_start_completed
+  touch /usr/local/tomcat/webapps/ROOT/.first_start_completed
 }
 
 # $1 - the path to xwiki.[cfg|properties]
@@ -74,7 +74,7 @@ fi
 
 # Check for the expected command
 if [ "$1" = 'xwiki' ]; then
-  if [[ ! -f /usr/local/xwiki/.first_start_completed ]]; then
+  if [[ ! -f /usr/local/tomcat/webapps/ROOT/.first_start_completed ]]; then
     first_start
   fi
   shift
diff --git a/9/mysql-tomcat/xwiki/docker-entrypoint.sh b/9/mysql-tomcat/xwiki/docker-entrypoint.sh
index 753c1043373d2d5ceff1b8574e921a8227cb1b1e..b56ca7d53e6625658ea98f2a046c6373764d03b2 100755
--- a/9/mysql-tomcat/xwiki/docker-entrypoint.sh
+++ b/9/mysql-tomcat/xwiki/docker-entrypoint.sh
@@ -23,7 +23,7 @@ set -e
 
 function first_start() {
   configure
-  touch /usr/local/xwiki/.first_start_completed
+  touch /usr/local/tomcat/webapps/ROOT/.first_start_completed
 }
 
 # $1 - the path to xwiki.[cfg|properties]
@@ -74,7 +74,7 @@ fi
 
 # Check for the expected command
 if [ "$1" = 'xwiki' ]; then
-  if [[ ! -f /usr/local/xwiki/.first_start_completed ]]; then
+  if [[ ! -f /usr/local/tomcat/webapps/ROOT/.first_start_completed ]]; then
     first_start
   fi
   shift
diff --git a/9/postgres-tomcat/xwiki/docker-entrypoint.sh b/9/postgres-tomcat/xwiki/docker-entrypoint.sh
index 753c1043373d2d5ceff1b8574e921a8227cb1b1e..b56ca7d53e6625658ea98f2a046c6373764d03b2 100755
--- a/9/postgres-tomcat/xwiki/docker-entrypoint.sh
+++ b/9/postgres-tomcat/xwiki/docker-entrypoint.sh
@@ -23,7 +23,7 @@ set -e
 
 function first_start() {
   configure
-  touch /usr/local/xwiki/.first_start_completed
+  touch /usr/local/tomcat/webapps/ROOT/.first_start_completed
 }
 
 # $1 - the path to xwiki.[cfg|properties]
@@ -74,7 +74,7 @@ fi
 
 # Check for the expected command
 if [ "$1" = 'xwiki' ]; then
-  if [[ ! -f /usr/local/xwiki/.first_start_completed ]]; then
+  if [[ ! -f /usr/local/tomcat/webapps/ROOT/.first_start_completed ]]; then
     first_start
   fi
   shift
diff --git a/template/xwiki/docker-entrypoint.sh b/template/xwiki/docker-entrypoint.sh
index 2eb18ce2f68611de712755803b5c16878da7b5e7..b8371352ed7412adf13f12e326daabe716c51934 100755
--- a/template/xwiki/docker-entrypoint.sh
+++ b/template/xwiki/docker-entrypoint.sh
@@ -23,7 +23,7 @@ set -e
 
 function first_start() {
   configure
-  touch /usr/local/xwiki/.first_start_completed
+  touch /usr/local/tomcat/webapps/ROOT/.first_start_completed
 }
 
 # \$1 - the path to xwiki.[cfg|properties]
@@ -74,7 +74,7 @@ fi
 
 # Check for the expected command
 if [ "\$1" = 'xwiki' ]; then
-  if [[ ! -f /usr/local/xwiki/.first_start_completed ]]; then
+  if [[ ! -f /usr/local/tomcat/webapps/ROOT/.first_start_completed ]]; then
     first_start
   fi
   shift