diff --git a/rust/agama-server/src/l10n/model.rs b/rust/agama-server/src/l10n/model.rs
index f6ad9b8120..595c7c6c9c 100644
--- a/rust/agama-server/src/l10n/model.rs
+++ b/rust/agama-server/src/l10n/model.rs
@@ -240,7 +240,7 @@ impl L10n {
                 "--locale",
                 self.locales.first().unwrap_or(&"en_US.UTF-8".to_string()),
                 "--keymap",
-                &self.keymap.to_string(),
+                &self.keymap.dashed(),
                 "--timezone",
                 &self.timezone,
             ])
diff --git a/rust/package/agama.changes b/rust/package/agama.changes
index 495c35efdb..053361be9d 100644
--- a/rust/package/agama.changes
+++ b/rust/package/agama.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jan 28 07:13:17 UTC 2025 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
+
+- Use the "dashed" form of the keymap identifier when calling
+  systemd-firstboot (bsc#1236174).
+
 -------------------------------------------------------------------
 Fri Jan 24 09:33:31 UTC 2025 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>