diff --git a/system/base-system.scm b/system/base-system.scm
index fa5620d..bfe97de 100644
--- a/system/base-system.scm
+++ b/system/base-system.scm
@@ -281,9 +281,15 @@
                   (keyboard-layout keyboard-layout)))
     (file-systems (cons* (file-system
                            (mount-point "/")
-                           (device (file-system-label "guixsd"))
+                           (device (file-system-label "guix-data"))
                            (type "xfs")
-                           (check? #f)) %base-file-systems))
+                           (check? #f))
+                          (file-system
+                           (mount-point "/boot/efi")
+                           (device (file-system-label "guix-boot"))
+                           (type "fat32")
+                           (check? #f))
+                         %base-file-systems))
     (users %metznet-base-user-accounts)
     (groups %metznet-base-groups)
     (packages %metznet-base-packages)