diff --git a/defaults/main.yml b/defaults/main.yml
index 9ea852d..887922e 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -3,7 +3,7 @@
 
 # The explicit version to use when referring to the short name.
 tomcat_version7: 7.0.93
-tomcat_version8: 8.5.38
+tomcat_version8: 8.5.39
 tomcat_version9: 9.0.17
 
 # The location where to download Apache Tomcat from.
diff --git a/tasks/instance.yml b/tasks/instance.yml
index 2f967cc..fd87d20 100644
--- a/tasks/instance.yml
+++ b/tasks/instance.yml
@@ -21,7 +21,7 @@
 
 - name: install tomcat instance
   unarchive:
-    src: "{{ tomcat_mirror }}/{{ tomcat_archives[instance.version | default(tomcat_version)]['url_path'] }}/{{ tomcat_archives[instance.version | default(tomcat_version)]['targz'] }}"
+    src: "{{ tomcat_unarchive_url }}"
     dest: "{{ tomcat_directory }}/{{ instance.name }}"
     owner: "{{ instance.user | default(tomcat_user) }}"
     group: "{{ instance.group | default(tomcat_group) }}"
@@ -53,8 +53,10 @@
   notify:
     - restart tomcat instance
 
-- name: set variable for service role
-  set_fact:
+- name: create service instance
+  import_role:
+    name: robertdebock.service
+  vars:
     service_list:
       - name: "{{ instance.name | default(tomcat_name) }}"
         description: "{{ instance.name | default(tomcat_name) }}"
@@ -62,10 +64,6 @@
         user_name: "{{ instance.user | default(tomcat_user) }}"
         group_name: "{{ instance.group | default(tomcat_group) }}"
 
-- name: create service instance
-  import_role:
-    name: robertdebock.service
-
 - name: start and enable tomcat instance
   service:
     name: "{{ instance.name }}"
diff --git a/vars/main.yml b/vars/main.yml
index 5eefad1..63c09ad 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -16,3 +16,5 @@ _tomcat_validate_certs:
   CentOS-6: no
 
 tomcat_validate_certs: "{{ _tomcat_validate_certs[ansible_distribution ~ '-' ~ ansible_distribution_major_version] | default(_tomcat_validate_certs['default']) }}"
+
+tomcat_unarchive_url: "{{ tomcat_mirror }}/{{ tomcat_archives[instance.version | default(tomcat_version)]['url_path'] }}/{{ tomcat_archives[instance.version | default(tomcat_version)]['targz'] }}"