diff --git a/roles/linstor/defaults/main.yml b/roles/linstor/defaults/main.yml
index ecdc1ae2..21bf8f09 100644
--- a/roles/linstor/defaults/main.yml
+++ b/roles/linstor/defaults/main.yml
@@ -3,4 +3,3 @@
 linstor_roles: []
 linstor_pool_name: "incus"
 linstor_pool_driver: "lvmthin"
-linstor_mapped_disks: []
diff --git a/roles/linstor/tasks/storage.yml b/roles/linstor/tasks/storage.yml
index f4060830..8cf8e81e 100644
--- a/roles/linstor/tasks/storage.yml
+++ b/roles/linstor/tasks/storage.yml
@@ -30,7 +30,13 @@
   ansible.builtin.command: >-
     linstor physical-storage create-device-pool --storage-pool {{ linstor_pool_name }}
     --pool-name linstor-{{ linstor_pool_name }} {{ linstor_pool_driver }} {{ item }}
-    {{ linstor_mapped_disks | join(' ') }}
+    {{
+      (
+        hostvars[item]["linstor_disks"] | default([])
+        | map('regex_replace', '^((?!/dev/disk/by-id/).*)$', '/dev/disk/by-id/\1')
+        | list
+      ) | join(' ')
+    }}
   register: linstor_create_storage_pool_output
   loop: "{{ ansible_play_hosts }}"
   when: >
diff --git a/roles/linstor/vars/main.yml b/roles/linstor/vars/main.yml
deleted file mode 100644
index 09ffadf9..00000000
--- a/roles/linstor/vars/main.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
----
-linstor_mapped_disks: "{{ linstor_disks | default([]) | map('regex_replace', '^((?!/dev/disk/by-id/).*)$', '/dev/disk/by-id/\\1') | list }}"