diff --git a/internal/distro/fedora/partition_tables.go b/internal/distro/fedora/partition_tables.go
index 89955c23c..214f1ee76 100644
--- a/internal/distro/fedora/partition_tables.go
+++ b/internal/distro/fedora/partition_tables.go
@@ -162,6 +162,15 @@ var iotBasePartitionTables = distro.BasePartitionTableMap{
 				Size:     501 * common.MebiByte, // 501 MiB
 				Type:     "06",
 				Bootable: true,
+				Payload: &disk.Filesystem{
+					Type:         "vfat",
+					UUID:         disk.EFIFilesystemUUID,
+					Mountpoint:   "/boot/efi",
+					Label:        "EFI-SYSTEM",
+					FSTabOptions: "umask=0077,shortname=winnt",
+					FSTabFreq:    0,
+					FSTabPassNo:  2,
+				},
 			},
 			{
 				Size: 1 * common.GibiByte, // 1 GiB
diff --git a/test/data/manifests/fedora_36-aarch64-iot_raw_image-boot.json b/test/data/manifests/fedora_36-aarch64-iot_raw_image-boot.json
index 8dc0ef9e3..96ee7cc89 100644
--- a/test/data/manifests/fedora_36-aarch64-iot_raw_image-boot.json
+++ b/test/data/manifests/fedora_36-aarch64-iot_raw_image-boot.json
@@ -198,6 +198,14 @@
                       }
                     }
                   },
+                  {
+                    "id": "sha256:8aa090f3e7647b8f9fea241410b96277e8f9577da1b86f868681584aceeba400",
+                    "options": {
+                      "metadata": {
+                        "rpm.check_gpg": true
+                      }
+                    }
+                  },
                   {
                     "id": "sha256:8742c24ce33c2df36bba94451a96eee6fe9a95a2524c0985125953cbe610014c",
                     "options": {
@@ -2136,6 +2144,13 @@
                   "options": "defaults",
                   "freq": 1,
                   "passno": 2
+                },
+                {
+                  "uuid": "7B77-95E7",
+                  "vfs_type": "vfat",
+                  "path": "/boot/efi",
+                  "options": "umask=0077,shortname=winnt",
+                  "passno": 2
                 }
               ]
             },
@@ -2305,6 +2320,23 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.mkfs.fat",
+            "options": {
+              "volid": "7B7795E7"
+            },
+            "devices": {
+              "device": {
+                "type": "org.osbuild.loopback",
+                "options": {
+                  "filename": "disk.img",
+                  "start": 2048,
+                  "size": 1026048,
+                  "lock": true
+                }
+              }
+            }
+          },
           {
             "type": "org.osbuild.mkfs.ext4",
             "options": {
@@ -2369,6 +2401,14 @@
                   "size": 2097152
                 }
               },
+              "boot.efi": {
+                "type": "org.osbuild.loopback",
+                "options": {
+                  "filename": "disk.img",
+                  "start": 2048,
+                  "size": 1026048
+                }
+              },
               "root": {
                 "type": "org.osbuild.loopback",
                 "options": {
@@ -2390,6 +2430,12 @@
                 "type": "org.osbuild.ext4",
                 "source": "boot",
                 "target": "/boot"
+              },
+              {
+                "name": "boot.efi",
+                "type": "org.osbuild.fat",
+                "source": "boot.efi",
+                "target": "/boot/efi"
               }
             ]
           }
@@ -2824,6 +2870,9 @@
           "sha256:8a929fce4cf768b44b6fc0a548b89f84d2a26d46f1edb863d037defc372ff054": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/public/f36/f36-aarch64-fedora-20220617/Packages/z/zlib-1.2.11-31.fc36.aarch64.rpm"
           },
+          "sha256:8aa090f3e7647b8f9fea241410b96277e8f9577da1b86f868681584aceeba400": {
+            "url": "https://rpmrepo.osbuild.org/v2/mirror/public/f36/f36-aarch64-fedora-20220617/Packages/d/dosfstools-4.2-3.fc36.aarch64.rpm"
+          },
           "sha256:8c0ed9385ccb82bec74755e2ba3977a1edecfc449998b88e03e1096f8f5084d0": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/public/f36/f36-aarch64-fedora-20220617/Packages/l/libnfnetlink-1.0.1-21.fc36.aarch64.rpm"
           },
@@ -3340,6 +3389,16 @@
         "checksum": "sha256:dbd082622d6f4310d289f4959d3c00f389cbd270ba85e2bc6b38376a181a1d64",
         "check_gpg": true
       },
+      {
+        "name": "dosfstools",
+        "epoch": 0,
+        "version": "4.2",
+        "release": "3.fc36",
+        "arch": "aarch64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f36/f36-aarch64-fedora-20220617/Packages/d/dosfstools-4.2-3.fc36.aarch64.rpm",
+        "checksum": "sha256:8aa090f3e7647b8f9fea241410b96277e8f9577da1b86f868681584aceeba400",
+        "check_gpg": true
+      },
       {
         "name": "dracut",
         "epoch": 0,
diff --git a/test/data/manifests/fedora_37-aarch64-iot_raw_image-boot.json b/test/data/manifests/fedora_37-aarch64-iot_raw_image-boot.json
index db292c366..f64739ff8 100644
--- a/test/data/manifests/fedora_37-aarch64-iot_raw_image-boot.json
+++ b/test/data/manifests/fedora_37-aarch64-iot_raw_image-boot.json
@@ -280,6 +280,14 @@
                       }
                     }
                   },
+                  {
+                    "id": "sha256:caf01590a095a0ded437ff9a6100de6b2a9d5c638c0d8df218685e9ca049a257",
+                    "options": {
+                      "metadata": {
+                        "rpm.check_gpg": true
+                      }
+                    }
+                  },
                   {
                     "id": "sha256:e4716da965a3141394efc6cfca127880bbab451c7cb285bfc48d1911d8402164",
                     "options": {
@@ -2152,6 +2160,13 @@
                   "options": "defaults",
                   "freq": 1,
                   "passno": 2
+                },
+                {
+                  "uuid": "7B77-95E7",
+                  "vfs_type": "vfat",
+                  "path": "/boot/efi",
+                  "options": "umask=0077,shortname=winnt",
+                  "passno": 2
                 }
               ]
             },
@@ -2321,6 +2336,23 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.mkfs.fat",
+            "options": {
+              "volid": "7B7795E7"
+            },
+            "devices": {
+              "device": {
+                "type": "org.osbuild.loopback",
+                "options": {
+                  "filename": "disk.img",
+                  "start": 2048,
+                  "size": 1026048,
+                  "lock": true
+                }
+              }
+            }
+          },
           {
             "type": "org.osbuild.mkfs.ext4",
             "options": {
@@ -2385,6 +2417,14 @@
                   "size": 2097152
                 }
               },
+              "boot.efi": {
+                "type": "org.osbuild.loopback",
+                "options": {
+                  "filename": "disk.img",
+                  "start": 2048,
+                  "size": 1026048
+                }
+              },
               "root": {
                 "type": "org.osbuild.loopback",
                 "options": {
@@ -2406,6 +2446,12 @@
                 "type": "org.osbuild.ext4",
                 "source": "boot",
                 "target": "/boot"
+              },
+              {
+                "name": "boot.efi",
+                "type": "org.osbuild.fat",
+                "source": "boot.efi",
+                "target": "/boot/efi"
               }
             ]
           }
@@ -3008,6 +3054,9 @@
           "sha256:c9a351964d88b8f4162b8349c7ef8c5aae3e56b53f2f9f4acc081c1d998bbb39": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/public/f37/f37-aarch64-fedora-development-20221025/Packages/a/aardvark-dns-1.1.0-1.fc37.aarch64.rpm"
           },
+          "sha256:caf01590a095a0ded437ff9a6100de6b2a9d5c638c0d8df218685e9ca049a257": {
+            "url": "https://rpmrepo.osbuild.org/v2/mirror/public/f37/f37-aarch64-fedora-development-20221025/Packages/d/dosfstools-4.2-4.fc37.aarch64.rpm"
+          },
           "sha256:ccf0d18c15586c0a7ad9e7e69551fa9b997c25970701b5e635a981878c8a9dfe": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/public/f37/f37-aarch64-fedora-development-20221025/Packages/i/iptables-libs-1.8.8-3.fc37.aarch64.rpm"
           },
@@ -3488,6 +3537,16 @@
         "checksum": "sha256:2b34436e8003d7d1ab95f9a16db3ee455f571c56bf06a4833771046810dd5368",
         "check_gpg": true
       },
+      {
+        "name": "dosfstools",
+        "epoch": 0,
+        "version": "4.2",
+        "release": "4.fc37",
+        "arch": "aarch64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f37/f37-aarch64-fedora-development-20221025/Packages/d/dosfstools-4.2-4.fc37.aarch64.rpm",
+        "checksum": "sha256:caf01590a095a0ded437ff9a6100de6b2a9d5c638c0d8df218685e9ca049a257",
+        "check_gpg": true
+      },
       {
         "name": "dracut",
         "epoch": 0,
diff --git a/test/data/manifests/fedora_38-aarch64-iot_raw_image-boot.json b/test/data/manifests/fedora_38-aarch64-iot_raw_image-boot.json
index 690020e76..74107d511 100644
--- a/test/data/manifests/fedora_38-aarch64-iot_raw_image-boot.json
+++ b/test/data/manifests/fedora_38-aarch64-iot_raw_image-boot.json
@@ -248,6 +248,14 @@
                       }
                     }
                   },
+                  {
+                    "id": "sha256:38e6676864f276c4364b6324b787b6e19ad4d160107e9867a57fbbf84530a7ef",
+                    "options": {
+                      "metadata": {
+                        "rpm.check_gpg": true
+                      }
+                    }
+                  },
                   {
                     "id": "sha256:b25ce7686cc5c1cf3d59e8a9ac89156e9f4bb846de8a6fb44ad33c1a19179067",
                     "options": {
@@ -1967,6 +1975,13 @@
                   "options": "defaults",
                   "freq": 1,
                   "passno": 2
+                },
+                {
+                  "uuid": "7B77-95E7",
+                  "vfs_type": "vfat",
+                  "path": "/boot/efi",
+                  "options": "umask=0077,shortname=winnt",
+                  "passno": 2
                 }
               ]
             },
@@ -2136,6 +2151,23 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.mkfs.fat",
+            "options": {
+              "volid": "7B7795E7"
+            },
+            "devices": {
+              "device": {
+                "type": "org.osbuild.loopback",
+                "options": {
+                  "filename": "disk.img",
+                  "start": 2048,
+                  "size": 1026048,
+                  "lock": true
+                }
+              }
+            }
+          },
           {
             "type": "org.osbuild.mkfs.ext4",
             "options": {
@@ -2200,6 +2232,14 @@
                   "size": 2097152
                 }
               },
+              "boot.efi": {
+                "type": "org.osbuild.loopback",
+                "options": {
+                  "filename": "disk.img",
+                  "start": 2048,
+                  "size": 1026048
+                }
+              },
               "root": {
                 "type": "org.osbuild.loopback",
                 "options": {
@@ -2221,6 +2261,12 @@
                 "type": "org.osbuild.ext4",
                 "source": "boot",
                 "target": "/boot"
+              },
+              {
+                "name": "boot.efi",
+                "type": "org.osbuild.fat",
+                "source": "boot.efi",
+                "target": "/boot/efi"
               }
             ]
           }
@@ -2448,6 +2494,9 @@
           "sha256:36e6835f02c897ea7d1929163cf0dba9317a9fe38637bfa349ecd291ba4b36ae": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-aarch64-rawhide-20221025/Packages/s/selinux-policy-targeted-37.13-1.fc38.noarch.rpm"
           },
+          "sha256:38e6676864f276c4364b6324b787b6e19ad4d160107e9867a57fbbf84530a7ef": {
+            "url": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-aarch64-rawhide-20221025/Packages/d/dosfstools-4.2-4.fc37.aarch64.rpm"
+          },
           "sha256:3a4df46e9482e6dd68f6ff70603e36aaf846d4767ecb69b034900813566f705d": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-aarch64-rawhide-20221025/Packages/f/file-libs-5.42-4.fc37.aarch64.rpm"
           },
@@ -3194,6 +3243,16 @@
         "checksum": "sha256:786cec3721ba9907a4c69620cee6bc3952de8f27dec33f57d9939619b8514f87",
         "check_gpg": true
       },
+      {
+        "name": "dosfstools",
+        "epoch": 0,
+        "version": "4.2",
+        "release": "4.fc37",
+        "arch": "aarch64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-aarch64-rawhide-20221025/Packages/d/dosfstools-4.2-4.fc37.aarch64.rpm",
+        "checksum": "sha256:38e6676864f276c4364b6324b787b6e19ad4d160107e9867a57fbbf84530a7ef",
+        "check_gpg": true
+      },
       {
         "name": "dracut",
         "epoch": 0,
diff --git a/test/data/manifests/fedora_39-aarch64-iot_raw_image-boot.json b/test/data/manifests/fedora_39-aarch64-iot_raw_image-boot.json
index 7e875d3f8..18b33dc27 100644
--- a/test/data/manifests/fedora_39-aarch64-iot_raw_image-boot.json
+++ b/test/data/manifests/fedora_39-aarch64-iot_raw_image-boot.json
@@ -256,6 +256,14 @@
                       }
                     }
                   },
+                  {
+                    "id": "sha256:0c11e634fc2571a811eded10a912538838093706011e1785b9cc7b17a940b432",
+                    "options": {
+                      "metadata": {
+                        "rpm.check_gpg": true
+                      }
+                    }
+                  },
                   {
                     "id": "sha256:e7dfdcae92d385722866d220d79fed574af730eab1102fcfa5405f4dddcf6533",
                     "options": {
@@ -1983,6 +1991,13 @@
                   "options": "defaults",
                   "freq": 1,
                   "passno": 2
+                },
+                {
+                  "uuid": "7B77-95E7",
+                  "vfs_type": "vfat",
+                  "path": "/boot/efi",
+                  "options": "umask=0077,shortname=winnt",
+                  "passno": 2
                 }
               ]
             },
@@ -2152,6 +2167,23 @@
               }
             }
           },
+          {
+            "type": "org.osbuild.mkfs.fat",
+            "options": {
+              "volid": "7B7795E7"
+            },
+            "devices": {
+              "device": {
+                "type": "org.osbuild.loopback",
+                "options": {
+                  "filename": "disk.img",
+                  "start": 2048,
+                  "size": 1026048,
+                  "lock": true
+                }
+              }
+            }
+          },
           {
             "type": "org.osbuild.mkfs.ext4",
             "options": {
@@ -2216,6 +2248,14 @@
                   "size": 2097152
                 }
               },
+              "boot.efi": {
+                "type": "org.osbuild.loopback",
+                "options": {
+                  "filename": "disk.img",
+                  "start": 2048,
+                  "size": 1026048
+                }
+              },
               "root": {
                 "type": "org.osbuild.loopback",
                 "options": {
@@ -2237,6 +2277,12 @@
                 "type": "org.osbuild.ext4",
                 "source": "boot",
                 "target": "/boot"
+              },
+              {
+                "name": "boot.efi",
+                "type": "org.osbuild.fat",
+                "source": "boot.efi",
+                "target": "/boot/efi"
               }
             ]
           }
@@ -2305,6 +2351,9 @@
           "sha256:09dc9676b44df287dfa05d9bc7b14c83b8474fb44c48e10c1e244d23017b5656": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/public/f39/f39-aarch64-rawhide-20230310/Packages/l/libsemanage-3.5-1.fc39.aarch64.rpm"
           },
+          "sha256:0c11e634fc2571a811eded10a912538838093706011e1785b9cc7b17a940b432": {
+            "url": "https://rpmrepo.osbuild.org/v2/mirror/public/f39/f39-aarch64-rawhide-20230310/Packages/d/dosfstools-4.2-6.fc38.aarch64.rpm"
+          },
           "sha256:0cbad3c0b6b1b8c73ac219d5ed3772c89331e46a5fd8e4be3dc065e2021ef904": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/public/f39/f39-aarch64-rawhide-20230310/Packages/c/container-selinux-2.203.0-1.fc39.noarch.rpm"
           },
@@ -3226,6 +3275,16 @@
         "checksum": "sha256:f75e48a0bf1a3f957d356727daf0773868104d98faeca73aa86955e15dcfd01c",
         "check_gpg": true
       },
+      {
+        "name": "dosfstools",
+        "epoch": 0,
+        "version": "4.2",
+        "release": "6.fc38",
+        "arch": "aarch64",
+        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/public/f39/f39-aarch64-rawhide-20230310/Packages/d/dosfstools-4.2-6.fc38.aarch64.rpm",
+        "checksum": "sha256:0c11e634fc2571a811eded10a912538838093706011e1785b9cc7b17a940b432",
+        "check_gpg": true
+      },
       {
         "name": "dracut",
         "epoch": 0,