diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm
index e631e5a834..2d41c5756b 100644
--- a/gnu/build/vm.scm
+++ b/gnu/build/vm.scm
@@ -431,7 +431,7 @@ (define (partition-esp? partition)
           (lambda (port)
             (format port
                     "insmod part_msdos~@
-                    search --set=root --label gnu-disk-image~@
+                    search --set=root --label GuixSD~@
                     configfile /boot/grub/grub.cfg~%")))
 
         (display "creating EFI firmware image...")
diff --git a/gnu/system/install.scm b/gnu/system/install.scm
index d5d11371a3..f9aa7f6733 100644
--- a/gnu/system/install.scm
+++ b/gnu/system/install.scm
@@ -306,7 +306,7 @@ (define installation-os
      ;; the appropriate one.
      (cons* (file-system
               (mount-point "/")
-              (device "gnu-disk-image")
+              (device "GuixSD")
               (title 'label)
               (type "ext4"))
 
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index 3e722d0815..66a2448ceb 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -335,11 +335,17 @@ (define* (system-disk-image os
 system described by OS.  Said image can be copied on a USB stick as is.  When
 VOLATILE? is true, the root file system is made volatile; this is useful
 to USB sticks meant to be read-only."
+  (define normalize-label
+    ;; ISO labels are all-caps (case-insensitive), but since
+    ;; 'find-partition-by-label' is case-sensitive, make it all-caps here.
+    (if (string=? "iso9660" file-system-type)
+        string-upcase
+        identity))
   (define root-label
     ;; Volume name of the root file system.  Since we don't know which device
     ;; will hold it, we use the volume name to find it (using the UUID would
     ;; be even better, but somewhat less convenient.)
-    "gnu-disk-image")
+    (normalize-label "GuixSD"))
 
   (define file-systems-to-keep
     (remove (lambda (fs)