diff --git a/CHANGELOG.md b/CHANGELOG.md
index 60938983..6d93638f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,7 @@ The **patch** part changes is incremented if multiple releases happen the same m
 * mongodb: Deny the install on Debian 11 « Bullseye » when the version is unsupported
 * mongodb: Support version 5.0 (for buster)
 * mongodb: Allow to specify a mongodb version for buster & bullseye
+* tomcat : tomcat.service without forking and secondary daemon manager (`catalina.sh start` which is launched by `startup.sh` try to manage the tomcat daemon)
 
 ### Fixed
 
diff --git a/tomcat/templates/tomcat.service.j2 b/tomcat/templates/tomcat.service.j2
index e82bfca9..7bd322ab 100644
--- a/tomcat/templates/tomcat.service.j2
+++ b/tomcat/templates/tomcat.service.j2
@@ -7,9 +7,10 @@ WorkingDirectory=%h
 Environment="CATALINA_BASE=%h"
 EnvironmentFile=%h/conf/env
 UMask=0002
-ExecStart=/usr/share/tomcat{{ tomcat_version }}/bin/startup.sh
-ExecStop=/usr/share/tomcat{{ tomcat_version }}/bin/shutdown.sh
-Type=forking
+ExecStart=/usr/share/tomcat{{ tomcat_version }}/bin/catalina.sh run
+Restart=on-failure
+
+SyslogIdentifier=tomcat-instance-%u
 
 [Install]
 WantedBy=default.target