diff --git a/.gitignore b/.gitignore
index 0bb96d718ae52..dca2467969fa2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,9 @@
 .kitchen/
 *.lock
+*.pyc
 .vendor
 .bundle
 Converging
 TODO
 .idea/
-elasticsearch.iml
\ No newline at end of file
+elasticsearch.iml
diff --git a/tasks/elasticsearch-plugins.yml b/tasks/elasticsearch-plugins.yml
index 8347c2333b408..a3e4e1bf2e1e4 100644
--- a/tasks/elasticsearch-plugins.yml
+++ b/tasks/elasticsearch-plugins.yml
@@ -20,7 +20,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 }}"
   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
   environment:
@@ -34,7 +34,7 @@
   register: plugin_installed
   failed_when: "'ERROR' in plugin_installed.stdout"
   changed_when: plugin_installed.rc == 0
-  with_items: es_plugins
+  with_items: "{{ es_plugins }}"
   when: es_plugins is defined and not es_plugins is none
   notify: restart elasticsearch
   environment:
@@ -43,4 +43,4 @@
 
 #Set permissions on plugins directory
 - name: Set Plugin Directory Permissions
-  file: state=directory path={{ plugin_dir }} owner={{ es_user }} group={{ es_group }} recurse=yes
\ No newline at end of file
+  file: state=directory path={{ plugin_dir }} owner={{ es_user }} group={{ es_group }} recurse=yes
diff --git a/tasks/elasticsearch-templates.yml b/tasks/elasticsearch-templates.yml
index 0fe3a0f507f08..a4179a6710225 100644
--- a/tasks/elasticsearch-templates.yml
+++ b/tasks/elasticsearch-templates.yml
@@ -7,8 +7,8 @@
   when: es_templates_fileglob is not defined
 
 - name: Copy templates to elasticsearch
-  copy: src={{ item }} dest=/etc/elasticsearch/ owner={{ es_user }} group={{ es_group }}
-  with_fileglob: es_templates_fileglob
+  copy: src={{ item }} dest=/etc/elasticsearch/templates owner={{ es_user }} group={{ es_group }}
+  with_fileglob: "{{ es_templates_fileglob }}"
 
 - set_fact: http_port=9200
 
@@ -24,4 +24,4 @@
 
 - name: Install template(s)
   command: "curl -sL -XPUT http://localhost:{{http_port}}/_template/{{item}} -d @/etc/elasticsearch/templates/{{item}}.json"
-  with_items: resultstemplate.stdout_lines
+  with_items: "{{ resultstemplate.stdout_lines }}"