diff --git a/defaults/main.yml b/defaults/main.yml
index 019b13f..35d1ec3 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -20,9 +20,9 @@ es_templates: false
 es_user: elasticsearch
 es_group: elasticsearch
 es_config: {}
-es_config_default: ""
+es_config_default: "elasticsearch.j2"
 es_config_log4j2: ""
-es_config_jvm: ""
+es_config_jvm: "jvm.options.j2"
 #Need to provide default directories
 es_conf_dir: "/etc/elasticsearch"
 es_pid_dir: "/var/run/elasticsearch"
diff --git a/tasks/elasticsearch-config.yml b/tasks/elasticsearch-config.yml
index ec81bfa..796730f 100644
--- a/tasks/elasticsearch-config.yml
+++ b/tasks/elasticsearch-config.yml
@@ -51,7 +51,7 @@
 - name: Copy Default File
   become: yes
   template:
-    src: "{% if es_config_default != '' %}{{ es_config_default }}{% else %}elasticsearch.j2{% endif %}"
+    src: "{{ es_config_default }}"
     dest: "{{ default_file }}"
     owner: root
     group: "{{ es_group }}"
@@ -83,7 +83,7 @@
 - name: Copy jvm.options File
   become: yes
   template:
-    src: "{% if es_config_jvm != '' %}{{ es_config_jvm }}{% else %}jvm.options.j2{% endif %}"
+    src: "{{ es_config_jvm }}"
     dest: "{{ es_conf_dir }}/jvm.options"
     owner: root
     group: "{{ es_group }}"