diff --git a/defaults/main.yml b/defaults/main.yml
index c120127..96095aa 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -12,6 +12,7 @@ es_templates: false
 es_user: elasticsearch
 es_group: elasticsearch
 es_config: {}
+es_install_shield: false
 #Need to provide default directories
 es_pid_dir: "/var/run/elasticsearch"
 es_data_dirs: "/var/lib/elasticsearch"
diff --git a/tasks/elasticsearch-shield.yml b/tasks/elasticsearch-shield.yml
new file mode 100644
index 0000000..849169c
--- /dev/null
+++ b/tasks/elasticsearch-shield.yml
@@ -0,0 +1,3 @@
+---
+
+
diff --git a/tasks/elasticsearch-templates.yml b/tasks/elasticsearch-templates.yml
index ccc8b8d..c9de8bb 100644
--- a/tasks/elasticsearch-templates.yml
+++ b/tasks/elasticsearch-templates.yml
@@ -8,7 +8,9 @@
 
 - name: Copy templates to elasticsearch
   copy: src={{ item }} dest=/etc/elasticsearch/templates owner={{ es_user }} group={{ es_group }}
-  with_fileglob: "{{ es_templates_fileglob }}"
+  when: es_templates_fileglob is defined
+  with_fileglob:
+    - "{{ es_templates_fileglob }}"
 
 - set_fact: http_port=9200
   tags:
diff --git a/tasks/main.yml b/tasks/main.yml
index 6b97512..ca1dfce 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -24,6 +24,10 @@
   when: es_plugins is defined or es_plugins_reinstall
   tags:
       - plugins
+- include: elasticsearch-shield.yml
+  when: es_install_shield
+  tags:
+      - shield
 - include: elasticsearch-service.yml
   tags:
       - service