diff --git a/ansible/roles/log-es6/tasks/azure-plugin.yml b/ansible/roles/log-es6/tasks/azure-plugin.yml
index 46d3079babcde748ebecc55f0d1d7fa7a4488454..53a55df30d1e4c2ae2409c33eccc7c8ce9021142 100644
--- a/ansible/roles/log-es6/tasks/azure-plugin.yml
+++ b/ansible/roles/log-es6/tasks/azure-plugin.yml
@@ -7,5 +7,5 @@
     var: plugin_output
 
 - name: Install plugin
-  shell: ES_PATH_CONF=/etc/elasticsearch/"{{ es_instance_name }}" /usr/share/elasticsearch/bin/elasticsearch-plugin install repository-azure
+  shell: ES_PATH_CONF=/etc/elasticsearch/"{{ es_instance_name }}" /usr/share/elasticsearch/bin/elasticsearch-plugin install -b repository-azure
   when: plugin_output.stdout != "repository-azure"
diff --git a/ansible/roles/log-es6/templates/environment.j2 b/ansible/roles/log-es6/templates/environment.j2
index b15e7eba3ac429009945e02fb82299bca7021506..7731297e1a9c209849c56b6a355630707e7cbc7c 100644
--- a/ansible/roles/log-es6/templates/environment.j2
+++ b/ansible/roles/log-es6/templates/environment.j2
@@ -1,2 +1,2 @@
 JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/
-ES_PATH_CONF=/etc/elasticsearch/{{ansible_hostname}}/
+ES_PATH_CONF=/etc/elasticsearch/{{node_name}}/