diff --git a/templates/answerfile.j2 b/templates/answerfile.j2
index 415f2e7f9291d37a00f8a290fb824d7b2bcf8533..d78ccc296aeb75c553616a091289e10c7f1c2d08 100644
--- a/templates/answerfile.j2
+++ b/templates/answerfile.j2
@@ -14,7 +14,7 @@ export TIMEZONE="{{ hostobj.timezone | default("GMT") }}"
 {%   if 'partitions' in disk %}
 {{     'declare -a DISK_%s_PARTITIONS=()' | format(disk.device | upper) }}
 {%     for part in disk.partitions %}
-{{       'DISK_%s_PARTITIONS+=("%s:%s:%s:%s:%s:%s:%s")' | format(disk.device | upper, part.size, part.fs, part.mountpoint | default(""), part.mountoptions | default("defaults"), part.dump | default("0"), part.pass | default("0"), part.format | default("true")) }}
+{{       'DISK_%s_PARTITIONS+=("%s;%s;%s;%s;%s;%s;%s;%s")' | format(disk.device | upper, part.size, part.fs, part.mountpoint | default(""), part.mountoptions | default("defaults"), part.dump | default("0"), part.pass | default("0"), part.format | default("true")), (part.flags | default([])) | join(",") }}
 {%     endfor %}
 {{   'export DISK_%s_PARTITIONS' | format(disk.device | upper) }}
 {%   endif %}
@@ -62,7 +62,7 @@ export DISK_DEVICES
 {%       set ifresdata.ipv6_prefix = hostobj.network.classes[ifdata.class].ipv6.prefix %}
 {%     endif %}
 {%   endif %}
-{{   'export NETIF_%s="%s:%s:%s:%s:%s"' | format(ifname | upper, ifresdata.ipv4_address, ifresdata.ipv4_netmask, ifresdata.ipv6_address, ifresdata.ipv6_prefix, ifdata.static | default("true")) }}
+{{   'export NETIF_%s="%s;%s;%s;%s;%s"' | format(ifname | upper, ifresdata.ipv4_address, ifresdata.ipv4_netmask, ifresdata.ipv6_address, ifresdata.ipv6_prefix, ifdata.static | default("true")) }}
 {%   do netifs.append('"%s"' | format(ifname)) %}
 {% endfor %}
 declare -a NETIF_DEVICES=({{ netifs | join(" ") }})