diff --git a/defaults/main.yml b/defaults/main.yml
index 145aedf..e93db90 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -15,7 +15,7 @@ tomcat8_additional_pkgs:
   - jsvc
   - libcommons-daemon-java
 
-tomcat_user: 'tomcat{{ tomcat_version }}'
+tomcat_user: "{% if tomcat_version is version_compare('10', '<') %}tomcat{{ tomcat_version }}{% else %}tomcat{% endif %}"
 tomcat_max_threads: 200
 
 tomcat_min_heap_size: 2048m