diff --git a/CHANGELOG.md b/CHANGELOG.md
index 79c4fad..8fadbc5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
 Change Log
 ==========
 
+2.1.1
+-----
+* Support installed Tomcat version
+
 2.1.0
 -----
 * Support Tomcat 10
diff --git a/yodeploy/__init__.py b/yodeploy/__init__.py
index a33997d..55fa725 100644
--- a/yodeploy/__init__.py
+++ b/yodeploy/__init__.py
@@ -1 +1 @@
-__version__ = '2.1.0'
+__version__ = '2.1.1'
diff --git a/yodeploy/hooks/tomcat.py b/yodeploy/hooks/tomcat.py
index 2280fec..dd988b5 100644
--- a/yodeploy/hooks/tomcat.py
+++ b/yodeploy/hooks/tomcat.py
@@ -93,7 +93,7 @@ def tomcat_deploy(self):
         dest = os.path.join(contexts, 'ROOT##%s' % version)
 
         ubuntu_version = distro.version()
-        tomcat = 'tomcat10' if ubuntu_version >= '24.04' else 'tomcat9'
+        tomcat = 'tomcat9' if ubuntu_version >= '20.04' else 'tomcat8'
         uid = pwd.getpwnam(tomcat).pw_uid
 
         os.chown(contexts, uid, -1)