diff --git a/tomcat/README.md b/tomcat/README.md
index 3f0a1de0..b969f526 100644
--- a/tomcat/README.md
+++ b/tomcat/README.md
@@ -1,7 +1,7 @@
 # tomcat
 
-Install a Tomcat depndancies for multiple tomcat instance.
+Install Tomcat and its dependencies for multiple instances.
 
 ## Available variables
 
-**tomcat_instance_root:** Root dir for Tomcat instance (default: /srv/tomcat)
+**tomcat_instance_root**: Root dir for Tomcat instance (default: /srv/tomcat)
diff --git a/tomcat/files/tomcat.service b/tomcat/files/tomcat_jessie.service
similarity index 100%
rename from tomcat/files/tomcat.service
rename to tomcat/files/tomcat_jessie.service
diff --git a/tomcat/files/tomcat_stretch.service b/tomcat/files/tomcat_stretch.service
new file mode 100644
index 00000000..88d5b059
--- /dev/null
+++ b/tomcat/files/tomcat_stretch.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=Tomcat %u.
+After=network.target
+
+[Service]
+WorkingDirectory=%h
+Environment="CATALINA_BASE=%h"
+EnvironmentFile=%h/conf/env
+UMask=0002
+ExecStart=/usr/share/tomcat8/bin/startup.sh
+ExecStop=/usr/share/tomcat8/bin/shutdown.sh
+Type=forking
+
+[Install]
+WantedBy=default.target
diff --git a/tomcat/tasks/main.yml b/tomcat/tasks/main.yml
index d6e0947b..661c9651 100644
--- a/tomcat/tasks/main.yml
+++ b/tomcat/tasks/main.yml
@@ -1,3 +1,8 @@
 ---
-- include: packages.yml
+- include: packages_jessie.yml
+  when: ansible_distribution_release == "jessie"
+
+- include: packages_stretch.yml
+  when: ansible_distribution_major_version | version_compare('9', '>=')
+
 - include: nagios.yml
diff --git a/tomcat/tasks/packages.yml b/tomcat/tasks/packages_jessie.yml
similarity index 89%
rename from tomcat/tasks/packages.yml
rename to tomcat/tasks/packages_jessie.yml
index 033d4f0e..6e618e24 100644
--- a/tomcat/tasks/packages.yml
+++ b/tomcat/tasks/packages_jessie.yml
@@ -1,5 +1,5 @@
 ---
-- name: Install dependancy
+- name: Install packages
   apt:
     name: "{{ item }}"
     state: present
@@ -18,7 +18,7 @@
 
 - name: Copy systemd unit
   copy:
-    src: 'tomcat.service'
+    src: 'tomcat_jessie.service'
     dest: "/etc/systemd/user/tomcat.service"
     mode: "0755"
 
diff --git a/tomcat/tasks/packages_stretch.yml b/tomcat/tasks/packages_stretch.yml
new file mode 100644
index 00000000..abce4aae
--- /dev/null
+++ b/tomcat/tasks/packages_stretch.yml
@@ -0,0 +1,29 @@
+---
+- name: Install packages
+  apt:
+    name: "{{ item }}"
+    state: present
+  with_items:
+    - 'tomcat8'
+    - 'tomcat8-user'
+    - 'libpam-systemd'
+
+- name: Create tomcat root dir
+  file:
+    path: "{{ tomcat_instance_root }}"
+    state: directory
+    owner: 'root'
+    group: 'root'
+    mode: "0755"
+
+- name: Copy systemd unit
+  copy:
+    src: 'tomcat_stretch.service'
+    dest: "/etc/systemd/user/tomcat.service"
+    mode: "0755"
+
+- name: Disable default tomcat8 service
+  service:
+    name: tomcat8
+    state: stopped
+    enabled: false