diff --git a/daemon/api_systems_test.go b/daemon/api_systems_test.go
index 401f2d5855e..5c7458de6cc 100644
--- a/daemon/api_systems_test.go
+++ b/daemon/api_systems_test.go
@@ -978,6 +978,7 @@ func (s *systemsSuite) TestSystemsGetSpecificLabelIntegration(c *check.C) {
 								Image: "pc-boot.img",
 							},
 						},
+						YamlIndex: 0,
 					},
 					{
 						Name:       "BIOS Boot",
@@ -994,6 +995,7 @@ func (s *systemsSuite) TestSystemsGetSpecificLabelIntegration(c *check.C) {
 								Image: "pc-core.img",
 							},
 						},
+						YamlIndex: 1,
 					},
 					{
 						Name:       "ubuntu-seed",
@@ -1014,6 +1016,7 @@ func (s *systemsSuite) TestSystemsGetSpecificLabelIntegration(c *check.C) {
 								Target:           "EFI/boot/bootx64.efi",
 							},
 						},
+						YamlIndex: 2,
 					},
 					{
 						Name:       "ubuntu-boot",
@@ -1024,6 +1027,7 @@ func (s *systemsSuite) TestSystemsGetSpecificLabelIntegration(c *check.C) {
 						Offset:     asOffsetPtr(1202 * quantity.OffsetMiB),
 						Size:       750 * quantity.SizeMiB,
 						Filesystem: "ext4",
+						YamlIndex:  3,
 					},
 					{
 						Name:       "ubuntu-save",
@@ -1034,6 +1038,7 @@ func (s *systemsSuite) TestSystemsGetSpecificLabelIntegration(c *check.C) {
 						Offset:     asOffsetPtr(1952 * quantity.OffsetMiB),
 						Size:       16 * quantity.SizeMiB,
 						Filesystem: "ext4",
+						YamlIndex:  4,
 					},
 					{
 						Name:       "ubuntu-data",
@@ -1044,6 +1049,7 @@ func (s *systemsSuite) TestSystemsGetSpecificLabelIntegration(c *check.C) {
 						Offset:     asOffsetPtr(1968 * quantity.OffsetMiB),
 						Size:       1 * quantity.SizeGiB,
 						Filesystem: "ext4",
+						YamlIndex:  5,
 					},
 				},
 			},
diff --git a/gadget/export_test.go b/gadget/export_test.go
index d85ce5f353f..c4995405b02 100644
--- a/gadget/export_test.go
+++ b/gadget/export_test.go
@@ -65,6 +65,7 @@ var (
 	OnDiskStructureIsLikelyImplicitSystemDataRole = onDiskStructureIsLikelyImplicitSystemDataRole
 
 	SearchForVolumeWithTraits = searchForVolumeWithTraits
+	OrderStructuresByOffset   = orderStructuresByOffset
 )
 
 func MockEvalSymlinks(mock func(path string) (string, error)) (restore func()) {
diff --git a/gadget/gadget.go b/gadget/gadget.go
index 27fba833123..efb5eecb719 100644
--- a/gadget/gadget.go
+++ b/gadget/gadget.go
@@ -192,6 +192,9 @@ type VolumeStructure struct {
 	// and just used as part of the POST /systems/<label> API that
 	// is used by an installer.
 	Device string `yaml:"-" json:"device,omitempty"`
+
+	// Index of the structure definition in gadget YAML, note this starts at 0.
+	YamlIndex int `yaml:"-" json:"-"`
 }
 
 // IsRoleMBR tells us if v has MBR role or not.
@@ -579,6 +582,68 @@ func compatWithPibootOrIndeterminate(m Model) bool {
 	return m == nil || m.Grade() != asserts.ModelGradeUnset
 }
 
+// Ancillary structs to sort volume structures. We split volumes in
+// contiguousStructs slices, with each of these beginning with a structure with
+// a known fixed offset, followed by structures for which the offset is unknown
+// so we can know for sure that they appear after the first structure in
+// contiguousStruct. The unknown offsets appear because of min-size use. The
+// contiguousStructs are the things that we need to order, as all have a known
+// starting offset, which is not true for all the volume structures.
+type contiguousStructs struct {
+	// vss contains contiguous structures with the first one
+	// containing a valid Offset
+	vss []VolumeStructure
+}
+
+type contiguousStructsSet []*contiguousStructs
+
+func (scss contiguousStructsSet) Len() int {
+	return len(scss)
+}
+
+func (scss contiguousStructsSet) Less(i, j int) bool {
+	return *scss[i].vss[0].Offset < *scss[j].vss[0].Offset
+}
+
+func (scss contiguousStructsSet) Swap(i, j int) {
+	scss[i], scss[j] = scss[j], scss[i]
+}
+
+func orderStructuresByOffset(vss []VolumeStructure) []VolumeStructure {
+	if vss == nil {
+		return nil
+	}
+
+	// Build contiguous structures
+	scss := contiguousStructsSet{}
+	var currentCont *contiguousStructs
+	for _, s := range vss {
+		// If offset is set we can start a new "block", otherwise the
+		// structure goes right after the latest structure of the
+		// current block. Note that currentCont will never be accessed
+		// as nil as necessarily the first structure in gadget.yaml will
+		// have offset explicitly or implicitly (the only way for a
+		// structure to have nil offset is when the current structure
+		// does not have explicit offset and the previous one either
+		// does not have itself offset or has min-size set).
+		if s.Offset != nil {
+			currentCont = &contiguousStructs{}
+			scss = append(scss, currentCont)
+		}
+
+		currentCont.vss = append(currentCont.vss, s)
+	}
+
+	sort.Sort(scss)
+
+	// Build plain list of structures now
+	ordVss := []VolumeStructure{}
+	for _, cs := range scss {
+		ordVss = append(ordVss, cs.vss...)
+	}
+	return ordVss
+}
+
 // InfoFromGadgetYaml parses the provided gadget metadata.
 // If model is nil only self-consistency checks are performed.
 // If model is not nil implied values for filesystem labels will be set
@@ -638,6 +703,8 @@ func InfoFromGadgetYaml(gadgetYaml []byte, model Model) (*Info, error) {
 			return nil, fmt.Errorf("invalid volume %q: %v", name, err)
 		}
 
+		v.Structure = orderStructuresByOffset(v.Structure)
+
 		switch v.Bootloader {
 		case "":
 			// pass
@@ -702,6 +769,8 @@ func setImplicitForVolume(vol *Volume, model Model) error {
 	for i := range vol.Structure {
 		// set the VolumeName for the structure from the volume itself
 		vol.Structure[i].VolumeName = vol.Name
+		// Store index as we will reorder later
+		vol.Structure[i].YamlIndex = i
 
 		// set other implicit data for the structure
 		if err := setImplicitForVolumeStructure(&vol.Structure[i], rs, knownFsLabels); err != nil {
diff --git a/gadget/gadget_test.go b/gadget/gadget_test.go
index 8b9257879c5..bed3982cb4f 100644
--- a/gadget/gadget_test.go
+++ b/gadget/gadget_test.go
@@ -826,6 +826,7 @@ func (s *gadgetYamlTestSuite) TestReadMultiVolumeGadgetYamlValid(c *C) {
 								Target:           ".",
 							},
 						},
+						YamlIndex: 0,
 					},
 					{
 						VolumeName: "frobinator-image",
@@ -836,6 +837,7 @@ func (s *gadgetYamlTestSuite) TestReadMultiVolumeGadgetYamlValid(c *C) {
 						Type:       "83",
 						Filesystem: "ext4",
 						Size:       mustParseGadgetSize(c, "380M"),
+						YamlIndex:  1,
 					},
 				},
 			},
@@ -3936,3 +3938,121 @@ func (s *gadgetYamlTestSuite) TestVolumeMinSize(c *C) {
 		s.testVolumeMinSize(c, tc.gadgetYaml, tc.volsSizes)
 	}
 }
+
+func (s *gadgetYamlTestSuite) TestOrderStructuresByOffset(c *C) {
+	for _, tc := range []struct {
+		unordered   []gadget.VolumeStructure
+		ordered     []gadget.VolumeStructure
+		description string
+	}{
+		{
+			unordered: []gadget.VolumeStructure{
+				{Offset: asOffsetPtr(100)},
+				{Offset: asOffsetPtr(0)},
+				{Offset: nil},
+				{Offset: asOffsetPtr(50)},
+			},
+			ordered: []gadget.VolumeStructure{
+				{Offset: asOffsetPtr(0)},
+				{Offset: nil},
+				{Offset: asOffsetPtr(50)},
+				{Offset: asOffsetPtr(100)},
+			},
+			description: "test one",
+		},
+		{
+			unordered:   []gadget.VolumeStructure{},
+			ordered:     []gadget.VolumeStructure{},
+			description: "test two",
+		},
+		{
+			unordered: []gadget.VolumeStructure{
+				{Offset: asOffsetPtr(300)},
+				{Offset: nil, Name: "nil1"},
+				{Offset: asOffsetPtr(1)},
+				{Offset: asOffsetPtr(100)},
+				{Offset: nil, Name: "nil2"},
+				{Offset: nil, Name: "nil3"},
+			},
+			ordered: []gadget.VolumeStructure{
+				{Offset: asOffsetPtr(1)},
+				{Offset: asOffsetPtr(100)},
+				{Offset: nil, Name: "nil2"},
+				{Offset: nil, Name: "nil3"},
+				{Offset: asOffsetPtr(300)},
+				{Offset: nil, Name: "nil1"},
+			},
+			description: "test three",
+		},
+	} {
+		c.Logf("testing order structures: %s", tc.description)
+		ordered := gadget.OrderStructuresByOffset(tc.unordered)
+		c.Check(ordered, DeepEquals, tc.ordered)
+	}
+}
+
+func (s *gadgetYamlTestSuite) TestGadgetUnorderedStructures(c *C) {
+	var unorderedYaml = []byte(`
+volumes:
+  unordered:
+    bootloader: u-boot
+    schema: gpt
+    structure:
+      - name: ubuntu-seed
+        filesystem: ext4
+        size: 499M
+        type: 83,0FC63DAF-8483-4772-8E79-3D69D8477DE4
+        role: system-seed
+      - name: ubuntu-save
+        size: 100M
+        offset: 700M
+        filesystem: ext4
+        type: 83,0FC63DAF-8483-4772-8E79-3D69D8477DE4
+        role: system-save
+      - name: ubuntu-boot
+        filesystem: ext4
+        size: 100M
+        offset: 500M
+        type: 83,0FC63DAF-8483-4772-8E79-3D69D8477DE4
+        role: system-boot
+      - name: other1
+        size: 100M
+        type: bare
+      - name: ubuntu-data
+        filesystem: ext4
+        offset: 800M
+        size: 1G
+        type: 83,0FC63DAF-8483-4772-8E79-3D69D8477DE4
+        role: system-data
+`)
+
+	// TODO add more tests when min-size is introduced
+	tests := []struct {
+		yaml         []byte
+		orderedNames []string
+		info         string
+	}{
+		{
+			yaml: unorderedYaml,
+			orderedNames: []string{"ubuntu-seed", "ubuntu-boot",
+				"other1", "ubuntu-save", "ubuntu-data"},
+			info: "test one",
+		},
+	}
+	for _, tc := range tests {
+		c.Logf("tc: %s", tc.info)
+		giMeta, err := gadget.InfoFromGadgetYaml(tc.yaml, nil)
+		c.Assert(err, IsNil)
+		c.Assert(len(giMeta.Volumes), Equals, 1)
+
+		var vol *gadget.Volume
+		for vn := range giMeta.Volumes {
+			vol = giMeta.Volumes[vn]
+		}
+		names := []string{}
+		for _, s := range vol.Structure {
+			names = append(names, s.Name)
+		}
+		c.Check(names, DeepEquals, tc.orderedNames)
+	}
+}
diff --git a/gadget/install/content_test.go b/gadget/install/content_test.go
index ee5bbbf6b5f..b84ad925c46 100644
--- a/gadget/install/content_test.go
+++ b/gadget/install/content_test.go
@@ -92,8 +92,8 @@ func mockOnDiskStructureSystemSeed(gadgetRoot string) *gadget.LaidOutStructure {
 					Target:           "EFI/boot/grubx64.efi",
 				},
 			},
+			YamlIndex: 1000, // to demonstrate we do not use the laid out index
 		},
-		YamlIndex: 1000, // to demonstrate we do not use the laid out index
 		ResolvedContent: []gadget.ResolvedContent{
 			{
 				VolumeContent: &gadget.VolumeContent{
diff --git a/gadget/install/partition_test.go b/gadget/install/partition_test.go
index d9da2aed76a..d89d29be656 100644
--- a/gadget/install/partition_test.go
+++ b/gadget/install/partition_test.go
@@ -185,9 +185,9 @@ var mockLaidoutStructureWritable = gadget.LaidOutStructure{
 		// Note the DiskIndex appears to be the same as the YamlIndex, but this is
 		// because YamlIndex starts at 0 and DiskIndex starts at 1, and there is a
 		// yaml structure (the MBR) that does not appear on disk
-		Offset: asOffsetPtr(1260388352),
+		Offset:    asOffsetPtr(1260388352),
+		YamlIndex: 3,
 	},
-	YamlIndex: 3,
 }
 
 var mockLaidoutStructureSave = gadget.LaidOutStructure{
@@ -213,8 +213,8 @@ var mockLaidoutStructureSave = gadget.LaidOutStructure{
 		Role:       "system-save",
 		Filesystem: "ext4",
 		Offset:     asOffsetPtr(1260388352),
+		YamlIndex:  3,
 	},
-	YamlIndex: 3,
 }
 
 var mockLaidoutStructureWritableAfterSave = gadget.LaidOutStructure{
@@ -241,8 +241,8 @@ var mockLaidoutStructureWritableAfterSave = gadget.LaidOutStructure{
 		Label:      "ubuntu-data",
 		Filesystem: "ext4",
 		Offset:     asOffsetPtr(1394606080),
+		YamlIndex:  4,
 	},
-	YamlIndex: 4,
 }
 
 type uc20Model struct{}
diff --git a/gadget/layout.go b/gadget/layout.go
index 9f5e977e6df..e332b3046c5 100644
--- a/gadget/layout.go
+++ b/gadget/layout.go
@@ -84,8 +84,6 @@ type LaidOutStructure struct {
 	// AbsoluteOffsetWrite is the resolved absolute position of offset-write
 	// for this structure element within the enclosing volume
 	AbsoluteOffsetWrite *quantity.Offset
-	// Index of the structure definition in gadget YAML, note this starts at 0.
-	YamlIndex int
 	// LaidOutContent is a list of raw content inside the structure
 	LaidOutContent []LaidOutContent
 	// ResolvedContent is a list of filesystem content that has all
@@ -139,7 +137,7 @@ func (l *LaidOutStructure) IsPartition() bool {
 }
 
 func (p LaidOutStructure) String() string {
-	return fmtIndexAndName(p.YamlIndex, p.Name())
+	return fmtIndexAndName(p.VolumeStructure.YamlIndex, p.Name())
 }
 
 type byStartOffset []LaidOutStructure
@@ -193,7 +191,6 @@ func layoutVolumeStructures(volume *Volume) (structures []LaidOutStructure, byNa
 	for idx := range volume.Structure {
 		ps := LaidOutStructure{
 			VolumeStructure: &volume.Structure[idx],
-			YamlIndex:       idx,
 		}
 
 		if ps.Name() != "" {
diff --git a/gadget/layout_test.go b/gadget/layout_test.go
index 2a2fe69d852..b687a5f4817 100644
--- a/gadget/layout_test.go
+++ b/gadget/layout_test.go
@@ -114,7 +114,6 @@ volumes:
 					StartOffset: 1 * quantity.OffsetMiB,
 				},
 				VolumeStructure: &vol.Structure[0],
-				YamlIndex:       0,
 			},
 			{
 				OnDiskStructure: gadget.OnDiskStructure{
@@ -123,7 +122,6 @@ volumes:
 					StartOffset: 401 * quantity.OffsetMiB,
 				},
 				VolumeStructure: &vol.Structure[1],
-				YamlIndex:       1,
 			},
 		},
 	})
@@ -179,7 +177,6 @@ volumes:
 					PartitionFSLabel: saveFsLabel,
 				},
 				VolumeStructure: &vol.Structure[0],
-				YamlIndex:       0,
 			},
 			{
 				OnDiskStructure: gadget.OnDiskStructure{
@@ -190,7 +187,6 @@ volumes:
 					PartitionFSLabel: dataFsLabel,
 				},
 				VolumeStructure: &vol.Structure[1],
-				YamlIndex:       1,
 			},
 		},
 	})
@@ -239,7 +235,6 @@ volumes:
 					StartOffset: 1 * quantity.OffsetMiB,
 				},
 				VolumeStructure: &vol.Structure[0],
-				YamlIndex:       0,
 			},
 			{
 				OnDiskStructure: gadget.OnDiskStructure{
@@ -248,7 +243,6 @@ volumes:
 					StartOffset: 401 * quantity.OffsetMiB,
 				},
 				VolumeStructure: &vol.Structure[1],
-				YamlIndex:       1,
 			},
 			{
 				OnDiskStructure: gadget.OnDiskStructure{
@@ -257,7 +251,6 @@ volumes:
 					StartOffset: 901 * quantity.OffsetMiB,
 				},
 				VolumeStructure: &vol.Structure[2],
-				YamlIndex:       2,
 			},
 			{
 				OnDiskStructure: gadget.OnDiskStructure{
@@ -266,7 +259,6 @@ volumes:
 					StartOffset: 1001 * quantity.OffsetMiB,
 				},
 				VolumeStructure: &vol.Structure[3],
-				YamlIndex:       3,
 			},
 		},
 	})
@@ -310,8 +302,7 @@ volumes:
 					Size:        100 * quantity.SizeMiB,
 					StartOffset: 1 * quantity.OffsetMiB,
 				},
-				VolumeStructure: &vol.Structure[3],
-				YamlIndex:       3,
+				VolumeStructure: &vol.Structure[0],
 			},
 			{
 				OnDiskStructure: gadget.OnDiskStructure{
@@ -320,7 +311,6 @@ volumes:
 					StartOffset: 200 * quantity.OffsetMiB,
 				},
 				VolumeStructure: &vol.Structure[1],
-				YamlIndex:       1,
 			},
 			{
 				OnDiskStructure: gadget.OnDiskStructure{
@@ -328,8 +318,7 @@ volumes:
 					Size:        400 * quantity.SizeMiB,
 					StartOffset: 800 * quantity.OffsetMiB,
 				},
-				VolumeStructure: &vol.Structure[0],
-				YamlIndex:       0,
+				VolumeStructure: &vol.Structure[2],
 			},
 			{
 				OnDiskStructure: gadget.OnDiskStructure{
@@ -337,8 +326,7 @@ volumes:
 					Size:        100 * quantity.SizeMiB,
 					StartOffset: 1200 * quantity.OffsetMiB,
 				},
-				VolumeStructure: &vol.Structure[2],
-				YamlIndex:       2,
+				VolumeStructure: &vol.Structure[3],
 			},
 		},
 	})
@@ -381,8 +369,7 @@ volumes:
 					Size:        100 * quantity.SizeMiB,
 					StartOffset: 1 * quantity.OffsetMiB,
 				},
-				VolumeStructure: &vol.Structure[3],
-				YamlIndex:       3,
+				VolumeStructure: &vol.Structure[0],
 			},
 			{
 				OnDiskStructure: gadget.OnDiskStructure{
@@ -391,7 +378,6 @@ volumes:
 					StartOffset: 200 * quantity.OffsetMiB,
 				},
 				VolumeStructure: &vol.Structure[1],
-				YamlIndex:       1,
 			},
 			{
 				OnDiskStructure: gadget.OnDiskStructure{
@@ -400,7 +386,6 @@ volumes:
 					StartOffset: 700 * quantity.OffsetMiB,
 				},
 				VolumeStructure: &vol.Structure[2],
-				YamlIndex:       2,
 			},
 			{
 				OnDiskStructure: gadget.OnDiskStructure{
@@ -408,8 +393,7 @@ volumes:
 					Size:        400 * quantity.SizeMiB,
 					StartOffset: 800 * quantity.OffsetMiB,
 				},
-				VolumeStructure: &vol.Structure[0],
-				YamlIndex:       0,
+				VolumeStructure: &vol.Structure[3],
 			},
 		},
 	})
@@ -856,7 +840,6 @@ volumes:
 					StartOffset: 0,
 				},
 				VolumeStructure: &vol.Structure[0],
-				YamlIndex:       0,
 			}, {
 				OnDiskStructure: gadget.OnDiskStructure{
 					Name:        "other",
@@ -865,7 +848,6 @@ volumes:
 					StartOffset: 1 * quantity.OffsetMiB,
 				},
 				VolumeStructure: &vol.Structure[1],
-				YamlIndex:       1,
 			},
 		},
 	})
@@ -918,7 +900,6 @@ volumes:
 					StartOffset: 0,
 				},
 				VolumeStructure: &vol.Structure[0],
-				YamlIndex:       0,
 			}, {
 				// foo
 				OnDiskStructure: gadget.OnDiskStructure{
@@ -928,7 +909,6 @@ volumes:
 					StartOffset: 1 * quantity.OffsetMiB,
 				},
 				VolumeStructure: &vol.Structure[1],
-				YamlIndex:       1,
 				// break for gofmt < 1.11
 				AbsoluteOffsetWrite: asOffsetPtr(92),
 				LaidOutContent: []gadget.LaidOutContent{
@@ -949,7 +929,6 @@ volumes:
 					StartOffset: 2 * quantity.OffsetMiB,
 				},
 				VolumeStructure: &vol.Structure[2],
-				YamlIndex:       2,
 				// break for gofmt < 1.11
 				AbsoluteOffsetWrite: asOffsetPtr(600),
 				LaidOutContent: []gadget.LaidOutContent{
@@ -1102,7 +1081,6 @@ volumes:
 					StartOffset: 800 * quantity.OffsetMiB,
 				},
 				VolumeStructure: &vol.Structure[0],
-				YamlIndex:       0,
 			},
 		},
 	})
@@ -1148,7 +1126,6 @@ volumes:
 			StartOffset: 1 * quantity.OffsetMiB,
 		},
 		VolumeStructure: &vol.Structure[0],
-		YamlIndex:       0,
 		LaidOutContent: []gadget.LaidOutContent{
 			{
 				VolumeContent: &vol.Structure[0].Content[0],
@@ -1174,7 +1151,6 @@ volumes:
 			StartOffset: 0,
 		},
 		VolumeStructure: &vol.Structure[0],
-		YamlIndex:       0,
 		LaidOutContent: []gadget.LaidOutContent{
 			{
 				VolumeContent: &vol.Structure[0].Content[0],
@@ -1200,7 +1176,6 @@ volumes:
 			StartOffset: 2 * quantity.OffsetMiB,
 		},
 		VolumeStructure: &vol.Structure[0],
-		YamlIndex:       0,
 		LaidOutContent: []gadget.LaidOutContent{
 			{
 				VolumeContent: &vol.Structure[0].Content[0],
diff --git a/gadget/mountedfilesystem.go b/gadget/mountedfilesystem.go
index 78619925e3b..2f53841ad84 100644
--- a/gadget/mountedfilesystem.go
+++ b/gadget/mountedfilesystem.go
@@ -333,7 +333,7 @@ func newMountedFilesystemUpdater(ps *LaidOutStructure, backupDir string, mountLo
 }
 
 func fsStructBackupPath(backupDir string, ps *LaidOutStructure) string {
-	return filepath.Join(backupDir, fmt.Sprintf("struct-%v", ps.YamlIndex))
+	return filepath.Join(backupDir, fmt.Sprintf("struct-%v", ps.VolumeStructure.YamlIndex))
 }
 
 // entryDestPaths resolves destination and backup paths for given
diff --git a/gadget/raw.go b/gadget/raw.go
index 40b59c78cdf..f80ee62aeb2 100644
--- a/gadget/raw.go
+++ b/gadget/raw.go
@@ -132,7 +132,7 @@ func newRawStructureUpdater(contentDir string, ps *LaidOutStructure, backupDir s
 }
 
 func rawContentBackupPath(backupDir string, ps *LaidOutStructure, pc *LaidOutContent) string {
-	return filepath.Join(backupDir, fmt.Sprintf("struct-%v-%v", ps.YamlIndex, pc.Index))
+	return filepath.Join(backupDir, fmt.Sprintf("struct-%v-%v", ps.VolumeStructure.YamlIndex, pc.Index))
 }
 
 func (r *rawStructureUpdater) backupOrCheckpointContent(disk io.ReadSeeker, pc *LaidOutContent) error {
diff --git a/gadget/raw_test.go b/gadget/raw_test.go
index efb33ea47ec..f00c1c8b8f3 100644
--- a/gadget/raw_test.go
+++ b/gadget/raw_test.go
@@ -799,7 +799,7 @@ func (r *rawTestSuite) TestRawUpdaterContentBackupPath(c *C) {
 	pc.Index = 5
 	p = gadget.RawContentBackupPath(r.backup, ps, pc)
 	c.Assert(p, Equals, r.backup+"/struct-0-5")
-	ps.YamlIndex = 9
+	ps.VolumeStructure.YamlIndex = 9
 	p = gadget.RawContentBackupPath(r.backup, ps, pc)
 	c.Assert(p, Equals, r.backup+"/struct-9-5")
 }
diff --git a/gadget/update.go b/gadget/update.go
index 865709e438a..df9d3475f94 100644
--- a/gadget/update.go
+++ b/gadget/update.go
@@ -1556,13 +1556,13 @@ type Updater interface {
 }
 
 func updateLocationForStructure(structureLocations map[string]map[int]StructureLocation, ps *LaidOutStructure) (loc StructureLocation, err error) {
-	loc, ok := structureLocations[ps.VolumeStructure.VolumeName][ps.YamlIndex]
+	loc, ok := structureLocations[ps.VolumeStructure.VolumeName][ps.VolumeStructure.YamlIndex]
 	if !ok {
-		return loc, fmt.Errorf("structure with index %d on volume %s not found", ps.YamlIndex, ps.VolumeStructure.VolumeName)
+		return loc, fmt.Errorf("structure with index %d on volume %s not found", ps.VolumeStructure.YamlIndex, ps.VolumeStructure.VolumeName)
 	}
 	if !ps.HasFilesystem() {
 		if loc.Device == "" {
-			return loc, fmt.Errorf("internal error: structure %d on volume %s should have had a device set but did not have one in an internal mapping", ps.YamlIndex, ps.VolumeStructure.VolumeName)
+			return loc, fmt.Errorf("internal error: structure %d on volume %s should have had a device set but did not have one in an internal mapping", ps.VolumeStructure.YamlIndex, ps.VolumeStructure.VolumeName)
 		}
 		return loc, nil
 	} else {
@@ -1574,7 +1574,7 @@ func updateLocationForStructure(structureLocations map[string]map[int]StructureL
 			// possibly mounting it, we could also mount it here instead and
 			// then proceed with the update, but we should also have a way to
 			// unmount it when we are done updating it
-			return loc, fmt.Errorf("structure %d on volume %s does not have a writable mountpoint in order to update the filesystem content", ps.YamlIndex, ps.VolumeStructure.VolumeName)
+			return loc, fmt.Errorf("structure %d on volume %s does not have a writable mountpoint in order to update the filesystem content", ps.VolumeStructure.YamlIndex, ps.VolumeStructure.VolumeName)
 		}
 		return loc, nil
 	}
diff --git a/gadget/update_test.go b/gadget/update_test.go
index 439f5c54b3e..67241813edb 100644
--- a/gadget/update_test.go
+++ b/gadget/update_test.go
@@ -647,6 +647,7 @@ func (u *updateTestSuite) updateDataSet(c *C) (oldData gadget.GadgetData, newDat
 		Content: []gadget.VolumeContent{
 			{Image: "first.img"},
 		},
+		YamlIndex: 0,
 	}
 	fsStruct := gadget.VolumeStructure{
 		VolumeName: "foo",
@@ -657,6 +658,7 @@ func (u *updateTestSuite) updateDataSet(c *C) (oldData gadget.GadgetData, newDat
 		Content: []gadget.VolumeContent{
 			{UnresolvedSource: "/second-content", Target: "/"},
 		},
+		YamlIndex: 1,
 	}
 	lastStruct := gadget.VolumeStructure{
 		VolumeName: "foo",
@@ -667,6 +669,7 @@ func (u *updateTestSuite) updateDataSet(c *C) (oldData gadget.GadgetData, newDat
 		Content: []gadget.VolumeContent{
 			{UnresolvedSource: "/third-content", Target: "/"},
 		},
+		YamlIndex: 2,
 	}
 	// start with identical data for new and old infos, they get updated by
 	// the caller as needed
diff --git a/overlord/devicestate/devicestate_remodel_test.go b/overlord/devicestate/devicestate_remodel_test.go
index d06dce698b8..aa7036432cd 100644
--- a/overlord/devicestate/devicestate_remodel_test.go
+++ b/overlord/devicestate/devicestate_remodel_test.go
@@ -1523,6 +1523,7 @@ volumes:
 							Content: []gadget.VolumeContent{
 								{UnresolvedSource: "foo-content", Target: "/"},
 							},
+							YamlIndex: 0,
 						}, {
 							VolumeName: "pc",
 							Name:       "bare-one",
@@ -1532,6 +1533,7 @@ volumes:
 							Content: []gadget.VolumeContent{
 								{Image: "bare.img"},
 							},
+							YamlIndex: 1,
 						}},
 					},
 				},
@@ -1555,6 +1557,7 @@ volumes:
 							Content: []gadget.VolumeContent{
 								{UnresolvedSource: "new-foo-content", Target: "/"},
 							},
+							YamlIndex: 0,
 						}, {
 							VolumeName: "pc",
 							Name:       "bare-one",
@@ -1564,6 +1567,7 @@ volumes:
 							Content: []gadget.VolumeContent{
 								{Image: "new-bare-content.img"},
 							},
+							YamlIndex: 1,
 						}},
 					},
 				},