diff --git a/pkg/disk/disk.go b/pkg/disk/disk.go
index 0c25faa6d4..6aeab82d42 100644
--- a/pkg/disk/disk.go
+++ b/pkg/disk/disk.go
@@ -56,6 +56,9 @@ const (
 
 	// Extended Boot Loader Partition
 	XBootLDRPartitionGUID = "BC13C2FF-59E6-4262-A352-B275FD6F7172"
+
+	// DosFat16B used for the ESP-System partition
+	DosFat16B = "06"
 )
 
 // Entity is the base interface for all disk-related entities.
diff --git a/pkg/distro/fedora/partition_tables.go b/pkg/distro/fedora/partition_tables.go
index d76b0083b9..f900edfae4 100644
--- a/pkg/distro/fedora/partition_tables.go
+++ b/pkg/distro/fedora/partition_tables.go
@@ -224,7 +224,7 @@ var minimalrawPartitionTables = distro.BasePartitionTableMap{
 		Partitions: []disk.Partition{
 			{
 				Size:     200 * common.MebiByte,
-				Type:     "06",
+				Type:     disk.DosFat16B,
 				Bootable: true,
 				Payload: &disk.Filesystem{
 					Type:         "vfat",
@@ -319,7 +319,7 @@ var iotBasePartitionTables = distro.BasePartitionTableMap{
 		Partitions: []disk.Partition{
 			{
 				Size:     501 * common.MebiByte,
-				Type:     "06",
+				Type:     disk.DosFat16B,
 				Bootable: true,
 				Payload: &disk.Filesystem{
 					Type:         "vfat",