diff --git a/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/assets.yml b/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/assets.yml
index 31e0779..a3522aa 100644
--- a/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/assets.yml
+++ b/ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/assets.yml
@@ -1,7 +1,8 @@
 - name: Import container images
   ansible.builtin.command:
-    cmd: k3s ctr image import {{ item }}
+    cmd: k3s ctr image import {{ item }} --digests
     chdir: /opt/metacluster/container-images
   loop: "{{ query('ansible.builtin.fileglob', '/opt/metacluster/container-images/*.tar') | sort }}"
   loop_control:
     label: "{{ item | basename }}"
+    pause: 30
diff --git a/ansible/roles/firstboot/files/ansible_payload/roles/workloadcluster/tasks/nodetemplates.yml b/ansible/roles/firstboot/files/ansible_payload/roles/workloadcluster/tasks/nodetemplates.yml
index f4f46f9..1c3b188 100644
--- a/ansible/roles/firstboot/files/ansible_payload/roles/workloadcluster/tasks/nodetemplates.yml
+++ b/ansible/roles/firstboot/files/ansible_payload/roles/workloadcluster/tasks/nodetemplates.yml
@@ -40,7 +40,7 @@
     - name: Create snapshot on deployed VM's
       community.vmware.vmware_guest_snapshot:
         folder: "{{ vcenter_info.folder }}"
-        name: "{{ (item | basename | split('.'))[:-1] | join('.') }}"
+        name: "{{ item.instance.hw_name }}"
         state: present
         snapshot_name: "{{ ansible_date_time..iso8601_basic_short }}-base"
       loop: "{{ ova_deploy.results }}"