diff --git a/blsforme/src/bootloader/systemd_boot/mod.rs b/blsforme/src/bootloader/systemd_boot/mod.rs
index 79b36fb..22bdbb2 100644
--- a/blsforme/src/bootloader/systemd_boot/mod.rs
+++ b/blsforme/src/bootloader/systemd_boot/mod.rs
@@ -185,8 +185,7 @@ impl<'a, 'b> Loader<'a, 'b> {
             .boot_root
             .join_insensitive("loader")
             .join_insensitive("entries")
-            .join_insensitive(entry.id(self.schema))
-            .with_extension("conf");
+            .join_insensitive(format!("{}.conf", entry.id(self.schema)));
         log::trace!("writing entry: {}", loader_id.display());
 
         // vmlinuz primary path
diff --git a/blsforme/src/entry.rs b/blsforme/src/entry.rs
index a99c920..b096f1d 100644
--- a/blsforme/src/entry.rs
+++ b/blsforme/src/entry.rs
@@ -96,7 +96,7 @@ impl<'a> Entry<'a> {
             Schema::Legacy { os_release, .. } => os_release.name.clone(),
             Schema::Blsforme { os_release } => os_release.id.clone(),
         };
-        if let Some(state_id) = self.state_id {
+        if let Some(state_id) = self.state_id.as_ref() {
             format!("{id}-{version}-{state_id}", version = &self.kernel.version)
         } else {
             format!("{id}-{version}", version = &self.kernel.version)