diff --git a/common/modules/shellprocess_fixconkeys_part2.conf b/common/modules/shellprocess_fixconkeys_part2.conf
index 5d3b3b1..542aa54 100644
--- a/common/modules/shellprocess_fixconkeys_part2.conf
+++ b/common/modules/shellprocess_fixconkeys_part2.conf
@@ -1,5 +1,5 @@
 ---
 dontChroot: false
-timeout: 30
+timeout: 300
 script:
     - /usr/libexec/fixconkeys-part2
diff --git a/debian/changelog b/debian/changelog
index 7426a79..b236a34 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ calamares-settings-ubuntu (1:24.04.25) UNRELEASED; urgency=medium
   * Be completely sure apt will not try to prompt the user.
   * Bump the timeout limits to 15 minutes for both pkgselect
     contextualprocess modules.
+  * Allow fixconkeys-part2 a 5 minute window to run, which should be
+    enough to run update-initramfs (LP: #2060429).
 
  -- Simon Quigley <tsimonq2@ubuntu.com>  Tue, 09 Apr 2024 03:01:19 -0500