--- generic-amd64/meta/gadget.yaml	2016-11-29 19:00:54.560417217 +0100
+++ generic-i386/meta/gadget.yaml	2016-11-29 19:00:45.276161597 +0100
@@ -14,15 +14,8 @@
         offset-write: mbr+92
         content:
           - image: pc-core.img
-      - name: EFI System
-        type: EF,C12A7328-F81F-11D2-BA4B-00A0C93EC93B
+      - name: system-boot
+        type: 0C,EBD0A0A2-B9E5-4433-87C0-68B6B72699C7
         filesystem: vfat
         filesystem-label: system-boot
         size: 50M
-        content:
-          - source: grubx64.efi
-            target: EFI/boot/grubx64.efi
-          - source: shim.efi.signed
-            target: EFI/boot/bootx64.efi
-          - source: grub.cfg
-            target: EFI/ubuntu/grub.cfg