diff --git a/ansible/es.yml b/ansible/es.yml
index b1c45b6a1fee5b056d9e5eb9115adabe4d86aaa0..17aef43a63fa8dd0813c6aa4a7b12bd9bb5c4e4f 100644
--- a/ansible/es.yml
+++ b/ansible/es.yml
@@ -8,8 +8,8 @@
   roles:
     - role: es-azure-snapshot
       when: cloud_provider == "azure"
-#    - role: es-aws-snapshot
-#      when: cloud_provider == "aws"
+    - role: es-aws-snapshot
+      when: cloud_provider == "aws"
 #    - role: es-gcloud-snapshot
 #      when: cloud_provider == "gcloud"
     - role: es5-snapshot-purge
diff --git a/ansible/roles/es-aws-snapshot/defaults/main.yml b/ansible/roles/es-aws-snapshot/defaults/main.yml
index ca782a7c5deb8e35e13a3619f3300415bba410bb..4d9ff91c84f3d9503ff826f57072a1c9ad32bfeb 100644
--- a/ansible/roles/es-aws-snapshot/defaults/main.yml
+++ b/ansible/roles/es-aws-snapshot/defaults/main.yml
@@ -1,8 +1,8 @@
 snapshot_create_request_body: {
     type: s3,
     settings: {
-      bucket: "{{ es_s3_backup_folder_name }}",
-      base_path: "{{ snapshot_base_path }}_{{ base_path_date }}"
+      bucket: "{{ aws_management_bucket_name }}",
+      base_path: "{{ es_s3_backup_folder_name }}/{{ snapshot_base_path }}_{{ base_path_date }}"
     }
 }
 
diff --git a/ansible/roles/es-aws-snapshot/tasks/main.yml b/ansible/roles/es-aws-snapshot/tasks/main.yml
index 3f274b7a4f787d8cfeb4ac3303e393ff6474981a..d428f337a9aa7f3589b136b04e4ce16432bac699 100644
--- a/ansible/roles/es-aws-snapshot/tasks/main.yml
+++ b/ansible/roles/es-aws-snapshot/tasks/main.yml
@@ -17,7 +17,7 @@
 #         AZURE_SECRET: "{{ azure_management_client_secret }}"
 #   delegate_to: localhost
 
-- name: Create azure snapshot
+- name: Create aws snapshot
   uri:
     url: "http://{{ es_snapshot_host }}:9200/_snapshot/{{ snapshot_base_path }}"
     method: PUT
diff --git a/ansible/roles/es6/defaults/main.yml b/ansible/roles/es6/defaults/main.yml
index 295f486ac81c7e5f4a0d502c8988c08f22968475..5f6c7a530ded0575bf91262fbb52b39419180bc7 100644
--- a/ansible/roles/es6/defaults/main.yml
+++ b/ansible/roles/es6/defaults/main.yml
@@ -1,6 +1,6 @@
 ---
 es_major_version: "6.x"
-es_version: "6.2.3"
+es_version: "6.8.22"
 es_version_lock: false
 es_use_repository: true
 es_templates_fileglob: "files/templates/*.json"
diff --git a/ansible/roles/es6/tasks/main.yml b/ansible/roles/es6/tasks/main.yml
index a0d877d716bdb02e7cf529a04f9e6dee22dc7713..0c1ed0e3a76d8eb462b0ea0f60da07d588e82801 100644
--- a/ansible/roles/es6/tasks/main.yml
+++ b/ansible/roles/es6/tasks/main.yml
@@ -44,8 +44,8 @@
   include: plugins/repository-azure.yml
   when: cloud_provider == "azure"
 
-- name: include plugins/repository-aws.yml
-  include: plugins/repository-aws.yml
+- name: include plugins/repository-s3.yml
+  include: plugins/repository-s3.yml
   when: cloud_provider == "aws"
 
 - name: include plugins/repository-gcs.yml
diff --git a/ansible/roles/es6/tasks/plugins/repository-gcs.yml b/ansible/roles/es6/tasks/plugins/repository-gcs.yml
index a39e8c16a2f8a513dad1708ed94c933b3f57cb7d..59da8461a35e58d865f848370e852391c5ce688a 100644
--- a/ansible/roles/es6/tasks/plugins/repository-gcs.yml
+++ b/ansible/roles/es6/tasks/plugins/repository-gcs.yml
@@ -1,5 +1,5 @@
 ---
 - name: Add gcs credentials file to keystore
   become: yes
-  shell: echo "{{ s3_management_bucket_access_key }}" | {{ es_home }}/bin/elasticsearch-keystore add-file -f gcs.client.default.credentials_file google_cloud_store_management_service_account.json
+  shell: echo "{{ gcs_management_bucket_service_account }}" | {{ es_home }}/bin/elasticsearch-keystore add-file -f gcs.client.default.credentials_file google_cloud_store_management_service_account.json
   no_log: True
\ No newline at end of file
diff --git a/ansible/roles/es6/tasks/plugins/repository-s3.yml b/ansible/roles/es6/tasks/plugins/repository-s3.yml
index 9a25e490e3bded30a738d688e83f2ac1f6dd839c..b5897792abc272dd1cdeddfdcfac95479ec59cfb 100644
--- a/ansible/roles/es6/tasks/plugins/repository-s3.yml
+++ b/ansible/roles/es6/tasks/plugins/repository-s3.yml
@@ -3,8 +3,12 @@
   become: yes
   shell: echo "{{ aws_management_bucket_user_access_key }}" | {{ es_home }}/bin/elasticsearch-keystore add -f s3.client.default.access_key
   no_log: True
+  environment:
+    ES_PATH_CONF: "{{ conf_dir }}"
 
 - name: Add default aws account key for backups
   become: yes
   shell: echo "{{ aws_management_bucket_user_secret_key }}" | {{ es_home }}/bin/elasticsearch-keystore add -f s3.client.default.secret_key
-  no_log: True
\ No newline at end of file
+  no_log: True
+  environment:
+    ES_PATH_CONF: "{{ conf_dir }}"
diff --git a/private_repo/ansible/inventory/dev/Core/common.yml b/private_repo/ansible/inventory/dev/Core/common.yml
index 7696b56f12561ab0e0970fb66bfdaab91be67734..3150b983d16a92b96546d20ee08c8ca48aa69212 100644
--- a/private_repo/ansible/inventory/dev/Core/common.yml
+++ b/private_repo/ansible/inventory/dev/Core/common.yml
@@ -33,6 +33,11 @@ azure_management_resource_group_name: ""
 azure_management_client_id: ""
 azure_management_storage_account_name: ""
 
+# Define the below if you are using AWS Cloud
+# Ansible AWS Module Variables
+# Management Storage Bucket
+aws_management_bucket_name: ""
+
 # ------------------------------------------------------------------------------------------------------------ #
 # Cloud / Infra Specific values - Check these and update accordingly