diff --git a/roles/docker_s3_volume_restore/defaults/main.yml b/roles/docker_s3_volume_restore/defaults/main.yml
index 308bece..04e78e1 100644
--- a/roles/docker_s3_volume_restore/defaults/main.yml
+++ b/roles/docker_s3_volume_restore/defaults/main.yml
@@ -3,6 +3,7 @@
 
 # forces a revert to the volume.
 docker_s3_volume_restore_force: false
+docker_s3_volume_restore_latest_s3_key: false
 docker_s3_volume_restores: []
 #docker_volume_s3_restores:
 #  - volume_name: "linkding_data"
diff --git a/roles/docker_s3_volume_restore/tasks/main.yml b/roles/docker_s3_volume_restore/tasks/main.yml
index 980de8f..999a6ad 100644
--- a/roles/docker_s3_volume_restore/tasks/main.yml
+++ b/roles/docker_s3_volume_restore/tasks/main.yml
@@ -17,7 +17,8 @@
   when: not should_perform_backup
 
 # try and find latest volume based on the name.
-- name: Find relevant volume(s) in S3
+- name: Find latest s3 version.
+  when: docker_s3_volume_restore_latest_s3_key
   amazon.aws.aws_s3:
     bucket: "{{ docker_s3_volume_restore_aws_s3_bucket }}"
     mode: list
@@ -38,6 +39,19 @@
 
 - debug: msg="{{ container_s3_keys }}"
 
+- set_fact: docker_volume_s3_restores="{{ docker_volume_s3_restores | default([]) + [ {'volume_name': item.0.volume_name, 's3_key': item.1} ] }}"
+  with_together:
+    - "{{ docker_volume_s3_restores }}"
+    - "{{ container_s3_keys }}"
+
+- debug: msg="{{ docker_volume_s3_restores }}"
+
+#- set_fact:
+#    volume_details: "{{ volume_details |default([]) + [ {'mount': item.0, 's3_key': item.1} ] }}"
+#  with_together:
+#    - "{{ volume_mounts }}"
+#    - "{{ container_s3_keys }}"
+
 #
 #- name: Create directories for /tmp file
 #  file: