diff --git a/tessia/server/db/templates/ubuntu20-subiquity.jinja b/tessia/server/db/templates/ubuntu20-subiquity.jinja
index 26d0df63..9483aa9a 100644
--- a/tessia/server/db/templates/ubuntu20-subiquity.jinja
+++ b/tessia/server/db/templates/ubuntu20-subiquity.jinja
@@ -136,10 +136,15 @@ installation we create these auxiliary variables #}
      {%- endfor %}
   {%- endif %}
 {%- endfor -%}
-{%- set have_fcp = (config['svols'] | selectattr('type', 'eq', 'FCP'))[0] -%}
-{%- if have_fcp %}
-    - chzdev zfcp-lun -e --online
-{%- endif %}
+{%- for svol in config['svols'] %}
+  {%- if svol['type'] == 'FCP' %}
+     {% for adapter in svol['specs']['adapters'] %}
+       {% for wwpn in adapter['wwpns'] %}
+    - chzdev zfcp-lun -e {{adapter['devno']}}:0x{{wwpn}}:0x{{svol['volume_id']}}
+       {%- endfor %}
+     {%- endfor %}
+  {%- endif %}
+{%- endfor -%}
 {%- for iface in config['ifaces'] %}
   {%- if iface['type'] == 'OSA' %}
     - chzdev -e qeth {{iface['attributes']['ccwgroup'].split(',')[0]}}
@@ -226,11 +231,13 @@ installation we create these auxiliary variables #}
         volume: {{ volid }}-part{{ loop.index }}
         id: {{ volid }}-part{{ loop.index }}-fs
         fstype: {{ part['fs'] }}
+{%-     if part['mp'] %}
       - type: mount
         device: {{ volid }}-part{{ loop.index }}-fs
         id: {{ volid }}-part{{ loop.index }}-fs-mount
         path: {{ part['mp'] }}
         options: {{ part['mo'] }}
+{%-     endif %}
 {%-   endfor %}{# part #}
 {% endfor %}{# svol in svols #}
 {%- endif %}{# not KVM %}