diff --git a/defaults/main.yml b/defaults/main.yml
index ff7aeae..8b79df3 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,9 +1,6 @@
 ---
-tomcat_version: 7
+tomcat_version: 8
 #tomcat_catalina_home_dir: '/usr/share/tomcat{{ tomcat_version }}'
-# Disable the main tomcat instance
-tomcat_service_enabled: False
-
 tomcat_m_instances_install: True
 
 tomcat_m_host_manager_install: False
diff --git a/vars/main.yml b/vars/main.yml
index 3808477..8c467d8 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -1,2 +1,4 @@
 ---
-# vars file for ansible-role-template
\ No newline at end of file
+# Disable the main tomcat instance
+tomcat_service_enabled: False
+