diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index c9afb97..1fb0841 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -55,9 +55,9 @@
     state: started
     enabled: true
 
-- name: Add jenkins user to docker group
+- name: Add jerick user to docker group
   ansible.builtin.user:
-    name: jenkins
+    name: jerick
     groups: docker
     append: true
   ignore_errors: true
diff --git a/roles/proxmox_lxc/tasks/main.yml b/roles/proxmox_lxc/tasks/main.yml
index 9a61bd0..3ea2d7c 100644
--- a/roles/proxmox_lxc/tasks/main.yml
+++ b/roles/proxmox_lxc/tasks/main.yml
@@ -1,4 +1,21 @@
 ---
+- name: Get available storage on template node
+  ansible.builtin.uri:
+    url: "https://{{ proxmox_api_host }}:8006/api2/json/nodes/{{ lxc_template_node }}/storage"
+    method: GET
+    headers:
+      Authorization: "PVEAPIToken={{ proxmox_api_user }}!{{ proxmox_api_token_id }}={{ proxmox_api_token_secret }}"
+    validate_certs: false
+  register: storage_info
+
+- name: Set storage backend (prefer local-zfs if available)
+  ansible.builtin.set_fact:
+    clone_storage: "{{ 'local-zfs' if storage_info.json.data | selectattr('storage', 'equalto', 'local-zfs') | list | length > 0 else 'local-lvm' }}"
+
+- name: Display selected storage
+  ansible.builtin.debug:
+    msg: "Using storage backend: {{ clone_storage }}"
+
 - name: Clone LXC from template (on template's node)
   community.proxmox.proxmox:
     api_host: "{{ proxmox_api_host }}"
@@ -9,7 +26,7 @@
     clone: "{{ lxc_template_id }}"
     hostname: "{{ vm_hostname }}"
     full: true
-    storage: "local-lvm"
+    storage: "{{ clone_storage }}"
     timeout: 600
   register: cloned_lxc
 
diff --git a/roles/proxmox_vm/tasks/main.yml b/roles/proxmox_vm/tasks/main.yml
index e71b364..73395a9 100644
--- a/roles/proxmox_vm/tasks/main.yml
+++ b/roles/proxmox_vm/tasks/main.yml
@@ -1,4 +1,21 @@
 ---
+- name: Get available storage on template node
+  ansible.builtin.uri:
+    url: "https://{{ proxmox_api_host }}:8006/api2/json/nodes/{{ vm_template_node }}/storage"
+    method: GET
+    headers:
+      Authorization: "PVEAPIToken={{ proxmox_api_user }}!{{ proxmox_api_token_id }}={{ proxmox_api_token_secret }}"
+    validate_certs: false
+  register: storage_info
+
+- name: Set storage backend (prefer local-zfs if available)
+  ansible.builtin.set_fact:
+    clone_storage: "{{ 'local-zfs' if storage_info.json.data | selectattr('storage', 'equalto', 'local-zfs') | list | length > 0 else 'local-lvm' }}"
+
+- name: Display selected storage
+  ansible.builtin.debug:
+    msg: "Using storage backend: {{ clone_storage }}"
+
 - name: Clone VM from template (on template's node)
   community.proxmox.proxmox_kvm:
     api_host: "{{ proxmox_api_host }}"
@@ -10,7 +27,7 @@
     clone: "template"
     name: "{{ vm_hostname }}"
     full: true
-    storage: "local-lvm"
+    storage: "{{ clone_storage }}"
     timeout: 600
   register: cloned_vm