diff --git a/ansible/roles/es-gcs-snapshot/defaults/main.yml b/ansible/roles/es-gcs-snapshot/defaults/main.yml
index 3c2efa9a7f..9588cf98bf 100644
--- a/ansible/roles/es-gcs-snapshot/defaults/main.yml
+++ b/ansible/roles/es-gcs-snapshot/defaults/main.yml
@@ -7,6 +7,6 @@ snapshot_create_request_body: {
 }
 
 # Override these values
-es_snapshot_host: "localhost"
+es_snapshot_host: "{{ ansible_host }}"
 snapshot_base_path: "default"
-es_gcs_backup_folder_name: "elasticsearch-snapshots"
\ No newline at end of file
+es_gcs_backup_folder_name: "elasticsearch-snapshots-{{ es_snapshot_host }}"
\ No newline at end of file
diff --git a/ansible/roles/es-gcs-snapshot/tasks/main.yml b/ansible/roles/es-gcs-snapshot/tasks/main.yml
index 55f50b17ad..c30aad31f8 100644
--- a/ansible/roles/es-gcs-snapshot/tasks/main.yml
+++ b/ansible/roles/es-gcs-snapshot/tasks/main.yml
@@ -39,4 +39,4 @@
   register: result
   until: result.json.snapshots[0].state == 'SUCCESS'
   retries: 120
-  delay: 10
+  delay: 60