diff --git a/tomcat-multiple-instances/tasks/main.yml b/tomcat-multiple-instances/tasks/main.yml
index b469515a..59ba45cd 100644
--- a/tomcat-multiple-instances/tasks/main.yml
+++ b/tomcat-multiple-instances/tasks/main.yml
@@ -66,6 +66,17 @@
     - tomcat restart instances with changed configs 
   tags: [ 'tomcat', 'tomcat_instances' ]
 
+- name: Install catalina.properties
+  template: src={{ item[1] }}.j2 dest={{ item.0.instance_path }}/conf/{{ item[1] }} owner={{ item.0.user }} group={{ item.0.user }} mode=0640
+  with_nested:
+    - '{{ tomcat_m_instances }}'
+    - [ 'catalina.properties' ]
+  register: restart_needed
+  notify:
+    - tomcat restart instances with changed configs 
+  tags: [ 'tomcat', 'tomcat_instances', 'tomcat_catalina_properties' ]
+
+
 - name: Populate the instances conf/policy.d directory
   copy: src=policy.d/{{ item[1] }} dest={{ item.0.instance_path }}/conf/policy.d/{{ item[1] }} owner={{ item.0.user }} group={{ item.0.user }} mode=0640
   with_nested:
diff --git a/tomcat-multiple-instances/files/catalina.properties b/tomcat-multiple-instances/templates/catalina.properties.j2
similarity index 97%
rename from tomcat-multiple-instances/files/catalina.properties
rename to tomcat-multiple-instances/templates/catalina.properties.j2
index a3bb7bc4..bc1d2045 100644
--- a/tomcat-multiple-instances/files/catalina.properties
+++ b/tomcat-multiple-instances/templates/catalina.properties.j2
@@ -126,3 +126,10 @@ tomcat.util.buf.StringCache.byte.enabled=true
 #tomcat.util.buf.StringCache.char.enabled=true
 #tomcat.util.buf.StringCache.trainThreshold=500000
 #tomcat.util.buf.StringCache.cacheSize=5000
+
+{% if tomcat_m_catalina_opts is defined %}
+# Custom configurations
+{% for opt in tomcat_m_catalina_opts %}
+{{ opt }}
+{% endfor %}
+{% endif %}