diff --git a/roles/opendistro/opendistro-elasticsearch/defaults/main.yml b/roles/opendistro/opendistro-elasticsearch/defaults/main.yml
index 9103b4ad..0c8f8f1f 100644
--- a/roles/opendistro/opendistro-elasticsearch/defaults/main.yml
+++ b/roles/opendistro/opendistro-elasticsearch/defaults/main.yml
@@ -39,8 +39,9 @@ opendistro_jvm_xms: null
 
 opendistro_http_port: 9200
 
+certs_gen_tool_version: 1.7
 # Url of Search Guard certificates generator tool
-certs_gen_tool_url: https://releases.floragunn.com/search-guard-tlstool/1.7/search-guard-tlstool-1.7.zip
+certs_gen_tool_url: "https://releases.floragunn.com/search-guard-tlstool/{{ certs_gen_tool_version }}/search-guard-tlstool-{{ certs_gen_tool_version }}.zip"
 
 elasticrepo:
   apt: 'https://artifacts.elastic.co/packages/7.x/apt'
diff --git a/roles/opendistro/opendistro-elasticsearch/handlers/main.yml b/roles/opendistro/opendistro-elasticsearch/handlers/main.yml
index c2836edc..95f5868b 100644
--- a/roles/opendistro/opendistro-elasticsearch/handlers/main.yml
+++ b/roles/opendistro/opendistro-elasticsearch/handlers/main.yml
@@ -1,4 +1,5 @@
 ---
 - name: restart elasticsearch
-  service: name=elasticsearch
-  state: restarted
+  service: 
+    name: elasticsearch
+    state: restarted
diff --git a/roles/opendistro/opendistro-elasticsearch/tasks/LocalActions.yml b/roles/opendistro/opendistro-elasticsearch/tasks/LocalActions.yml
index 50d4016c..60379616 100644
--- a/roles/opendistro/opendistro-elasticsearch/tasks/LocalActions.yml
+++ b/roles/opendistro/opendistro-elasticsearch/tasks/LocalActions.yml
@@ -4,7 +4,7 @@
   - name: Local action | Create local temporary directory for certificates generation
     local_action:
       module: file
-      path: {{ local_certs_path }}
+      path: "{{ local_certs_path }}"
       state: directory
     run_once: true
     
@@ -12,8 +12,8 @@
     local_action:
       module: get_url
       url: "{{ certs_gen_tool_url }}"
-      dest: "{{ local_certs_path }}/search-guard-tlstool-1.7.zip"
-    run_once: "{{ local_certs_path }}/search-guard-tlstool.zip"
+      dest: "{{ local_certs_path }}/search-guard-tlstool-{{ certs_gen_tool_version }}.zip"
+    run_once: true
 
   - name: Local action | Extract the certificates generation tool
     local_action:
diff --git a/roles/opendistro/opendistro-elasticsearch/tasks/RedHat.yml b/roles/opendistro/opendistro-elasticsearch/tasks/RedHat.yml
index 3511c7c4..1a2eed56 100644
--- a/roles/opendistro/opendistro-elasticsearch/tasks/RedHat.yml
+++ b/roles/opendistro/opendistro-elasticsearch/tasks/RedHat.yml
@@ -22,8 +22,9 @@
     changed_when: false
 
   - name: RedHat/CentOS/Fedora | Install OpenJDK 11
-    yum: name=java-11-openjdk-devel 
-    state: present
+    yum:
+      name: java-11-openjdk-devel 
+      state: present
 
   - name: RedHat/CentOS/Fedora | Install OpenDistro dependencies
     yum:
diff --git a/roles/opendistro/opendistro-elasticsearch/tasks/main.yml b/roles/opendistro/opendistro-elasticsearch/tasks/main.yml
index fbc9dea6..d8f51f81 100644
--- a/roles/opendistro/opendistro-elasticsearch/tasks/main.yml
+++ b/roles/opendistro/opendistro-elasticsearch/tasks/main.yml
@@ -6,8 +6,9 @@
   when: ansible_os_family == 'RedHat'
 
 - name: Install OpenDistro
-  package: name=opendistroforelasticsearch-{{ opendistro_version }} 
-  state: present
+  package:
+    name: opendistroforelasticsearch-{{ opendistro_version }} 
+    state: present
   register: install
   tags: install