diff --git a/cf_remote/packages.py b/cf_remote/packages.py
index 14f19ca..2cdd75e 100644
--- a/cf_remote/packages.py
+++ b/cf_remote/packages.py
@@ -103,6 +103,12 @@ def add_tags_from_filename(self, filename):
             self.add_tag("opensuse-leap15")
             self.add_tag("opensuse-leap")
 
+
+        # We don't build for Fedora, so we need to map the distro to the correct packages
+        if "el9" in self.tags:
+            self.add_tag("fedora40")
+            log.debug("Mapping fedora40 host tag to el9 package tag")
+
         parts = filename.split(".")
         if "x86_64" in parts:
             self.add_tag("x86_64")