diff --git a/chef/cookbooks/provisioner/recipes/update_nodes.rb b/chef/cookbooks/provisioner/recipes/update_nodes.rb
index 953e1349ce..ca59b79f37 100644
--- a/chef/cookbooks/provisioner/recipes/update_nodes.rb
+++ b/chef/cookbooks/provisioner/recipes/update_nodes.rb
@@ -350,7 +350,9 @@ def find_node_boot_mac_addresses(node, admin_data_net)
                       crowbar_join: "#{os_url}/crowbar_join.sh",
                       default_fs: mnode[:crowbar_wall][:default_fs] || "ext4",
                       needs_openvswitch:
-                        (mnode[:network] && mnode[:network][:needs_openvswitch]) || false
+                        (mnode[:network] && mnode[:network][:needs_openvswitch]) || false,
+                      use_uefi: !mnode[:uefi].nil?,
+                      domain_name: node.fetch(:dns, {})[:domain] || node[:domain]
             )
           end
 
diff --git a/chef/cookbooks/provisioner/templates/default/autoyast.xml.erb b/chef/cookbooks/provisioner/templates/default/autoyast.xml.erb
index de624e593d..038ff58470 100644
--- a/chef/cookbooks/provisioner/templates/default/autoyast.xml.erb
+++ b/chef/cookbooks/provisioner/templates/default/autoyast.xml.erb
@@ -98,7 +98,7 @@
     <keep_install_network config:type="boolean">true</keep_install_network>
     <dns>
       <dhcp_hostname config:type="boolean">true</dhcp_hostname>
-      <domain><%= node[:domain] %></domain>
+      <domain><%= @domain_name %></domain>
       <hostname><%= @node_hostname %></hostname>
       <resolv_conf_policy>auto</resolv_conf_policy>
       <write_hostname config:type="boolean">false</write_hostname>
@@ -118,6 +118,16 @@
         <type config:type="symbol">CT_DISK</type>
         <disklabel>gpt</disklabel>
         <partitions config:type="list">
+          <% if @use_uefi %>
+          <partition>
+            <create config:type="boolean">true</create>
+            <format config:type="boolean">true</format>
+            <filesystem config:type="symbol">vfat</filesystem>
+            <partition_id config:type="integer">259</partition_id>
+            <mount>/boot/efi</mount>
+            <size>128M</size>
+          </partition>
+          <% end %>
           <partition>
             <create config:type="boolean">true</create>
             <partition_id config:type="integer">263</partition_id>
@@ -146,6 +156,16 @@
           <type config:type="symbol">CT_DISK</type>
           <initialize config:type="boolean">true</initialize>
           <partitions config:type="list">
+            <% if @use_uefi %>
+            <partition>
+              <create config:type="boolean">true</create>
+              <format config:type="boolean">true</format>
+              <filesystem config:type="symbol">vfat</filesystem>
+              <partition_id config:type="integer">259</partition_id>
+              <mount>/boot/efi</mount>
+              <size>128M</size>
+            </partition>
+            <% end %>
             <partition>
               <create config:type="boolean">true</create>
               <partition_id config:type="integer">263</partition_id>