diff --git a/templates/tomcat-default.j2 b/templates/tomcat-default.j2
index 863782d..7a8f5db 100644
--- a/templates/tomcat-default.j2
+++ b/templates/tomcat-default.j2
@@ -1,12 +1,16 @@
-{% if tomcat_use_systemd %}
+{% if not tomcat_use_systemd %}
 {% if limits_nofile_value is defined %}
 ulimit -Hn {{ limits_nofile_value }}
 ulimit -Sn {{ limits_nofile_value }}
 {% endif %}
-{% endif %}
 TOMCAT_USER={{ item.user }}
 TOMCAT_GROUP={{ item.user }}
+{% else %}
+#!/bin/bash
+set -e
+{% endif %}
 JAVA_HOME={{ item.java_home }}
+JRE_HOME={{ item.java_home }}
 JAVA_OPTS="-server -Djava.awt.headless=true -Dfile.encoding={{ tomcat_m_file_encoding }}"
 {% if jdk_default >= 8 %}
 JAVA_OPTS="{{ tomcat_m_additional_java_8_opts }} $JAVA_OPTS"
diff --git a/templates/tomcat-service.j2 b/templates/tomcat-service.j2
index bfabb10..acaae7a 100644
--- a/templates/tomcat-service.j2
+++ b/templates/tomcat-service.j2
@@ -16,6 +16,8 @@ LimitNOFILE={{ limits_nofile_value }}
 Environment="CATALINA_HOME=/usr/share/tomcat{{ tomcat_version }}"
 Environment="CATALINA_BASE={{ item.instance_path }}"
 Environment="CATALINA_TMPDIR={{ item.catalina_tmp_directory }}"
+Environment="JAVA_HOME={{ item.java_home }}"
+Environment="JRE_HOME={{ item.java_home }}"
 Type=simple
 ExecStartPre=+/usr/libexec/tomcat{{ tomcat_version}}/tomcat-update-policy.sh
 ExecStart=/bin/sh /usr/libexec/tomcat{{ tomcat_version }}/tomcat-instance-{{ item.http_port }}-start.sh
diff --git a/templates/tomcat-start.sh.j2 b/templates/tomcat-start.sh.j2
index 59e3b11..99bbf0f 100644
--- a/templates/tomcat-start.sh.j2
+++ b/templates/tomcat-start.sh.j2
@@ -8,8 +8,8 @@ set -e
 # Load the service settings
 . /etc/default/tomcat-instance-{{ item.http_port }}
 
-# We set JAVA_HOME in /etc/default/tomcat-instance-{{ item.http_port }}
-# . /usr/libexec/tomcat{{ tomcat_version }}/tomcat-locate-java.sh
+# Find the Java installation
+. /usr/libexec/tomcat{{ tomcat_version }}/tomcat-locate-java.sh
 
 # Set the JSP compiler if configured in the /etc/default/tomcat10 file
 [ -n "$JSP_COMPILER" ] && JAVA_OPTS="$JAVA_OPTS -Dbuild.compiler=\"$JSP_COMPILER\""
@@ -22,8 +22,4 @@ SECURITY=""
 
 
 # Start Tomcat
-{% if ansible_distribution_version is version_compare('22.04', '<') %}
-cd $CATALINA_BASE && exec $CATALINA_HOME/bin/catalina.sh run
-{% else %}
 cd $CATALINA_BASE && exec $CATALINA_HOME/bin/catalina.sh run $SECURITY
-{% endif %}