diff --git a/defaults/main.yml b/defaults/main.yml
index 10adc43..7883b9e 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -3,6 +3,8 @@ es_major_version: "2.x"
 es_version: "2.3.4"
 es_version_lock: false
 es_use_repository: true
+es_apt_key: "http://packages.elasticsearch.org/GPG-KEY-elasticsearch"
+es_apt_url: "deb http://packages.elastic.co/elasticsearch/{{ es_major_version }}/debian stable main"
 es_start_service: true
 es_java_install: true
 update_java: false
diff --git a/tasks/elasticsearch-Debian.yml b/tasks/elasticsearch-Debian.yml
index 07e3088..1a8ed44 100644
--- a/tasks/elasticsearch-Debian.yml
+++ b/tasks/elasticsearch-Debian.yml
@@ -6,11 +6,11 @@
   when: es_allow_downgrades
 
 - name: Debian - Add Elasticsearch repository key
-  apt_key: url="http://packages.elasticsearch.org/GPG-KEY-elasticsearch" state=present
-  when: es_use_repository
+  apt_key: url="{{ es_apt_key }}" state=present
+  when: es_use_repository and es_apt_key
 
 - name: Debian - add elasticsearch repository
-  apt_repository: repo="deb http://packages.elastic.co/elasticsearch/{{ es_major_version }}/debian stable main" state=present
+  apt_repository: repo="{{ es_apt_url }}" state=present
   when: es_use_repository
 
 - name: Debian - include versionlock
diff --git a/tasks/elasticsearch-plugins.yml b/tasks/elasticsearch-plugins.yml
index 0a0f36d..5422ad8 100644
--- a/tasks/elasticsearch-plugins.yml
+++ b/tasks/elasticsearch-plugins.yml
@@ -25,7 +25,7 @@
 - name: Remove elasticsearch plugins
   command: "{{es_home}}/bin/plugin remove {{item}} --silent"
   ignore_errors: yes
-  with_items: "{{ installed_plugins.stdout_lines }}"
+  with_items: "{{ installed_plugins.stdout_lines | default([]) }}"
   when: es_plugins_reinstall and installed_plugins.stdout_lines | length > 0 and not 'No plugin detected' in installed_plugins.stdout_lines[0]
   notify: restart elasticsearch
   register: plugin_installed
@@ -40,8 +40,8 @@
   register: plugin_installed
   failed_when: "'ERROR' in plugin_installed.stdout"
   changed_when: plugin_installed.rc == 0
-  with_items: "{{ es_plugins }}"
-  when: es_plugins is defined and not es_plugins is none and es_plugins_reinstall
+  with_items: "{{ es_plugins | default([]) }}"
+  when: not es_plugins is none and es_plugins_reinstall
   notify: restart elasticsearch
   environment:
     CONF_DIR: "{{ conf_dir }}"
@@ -50,4 +50,3 @@
 #Set permissions on plugins directory
 - name: Set Plugin Directory Permissions
   file: state=directory path={{ es_home }}/plugins owner={{ es_user }} group={{ es_group }} recurse=yes
-  when: es_enable_xpack
\ No newline at end of file
diff --git a/tasks/elasticsearch-templates.yml b/tasks/elasticsearch-templates.yml
index 76a471d..b855c55 100644
--- a/tasks/elasticsearch-templates.yml
+++ b/tasks/elasticsearch-templates.yml
@@ -9,7 +9,6 @@
 
 - name: Copy templates to elasticsearch
   copy: src={{ item }} dest=/etc/elasticsearch/templates owner={{ es_user }} group={{ es_group }}
-  when: es_templates_fileglob is defined
   notify: load-templates
   with_fileglob:
-    - "{{ es_templates_fileglob }}"
\ No newline at end of file
+    - "{{ es_templates_fileglob | default('') }}"a
\ No newline at end of file