diff --git a/common/modules/before_bootloader_context.conf b/common/modules/before_bootloader_context.conf
index 1c6d60c..88deecd 100644
--- a/common/modules/before_bootloader_context.conf
+++ b/common/modules/before_bootloader_context.conf
@@ -11,8 +11,5 @@ firmwareType:
         -    command: sed -i '/deb http/d' /etc/apt/sources.list
              timeout: 10
         -    command: apt-get update
-             timeout: 120
         -    command: apt install -y --no-upgrade -o Acquire::gpgv::Options::=--ignore-time-conflict grub-efi-$(if grep -q 64 /sys/firmware/efi/fw_platform_size; then echo amd64-signed; else echo ia32; fi)
-             timeout: 300
         -    command: apt install -y --no-upgrade -o Acquire::gpgv::Options::=--ignore-time-conflict shim-signed
-             timeout: 300
diff --git a/common/modules/shellprocess_fixconkeys_part2.conf b/common/modules/shellprocess_fixconkeys_part2.conf
index 542aa54..4e7d7fa 100644
--- a/common/modules/shellprocess_fixconkeys_part2.conf
+++ b/common/modules/shellprocess_fixconkeys_part2.conf
@@ -1,5 +1,4 @@
 ---
 dontChroot: false
-timeout: 300
 script:
     - /usr/libexec/fixconkeys-part2
diff --git a/debian/changelog b/debian/changelog
index ce3eba7..d6ee73f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+calamares-settings-ubuntu (1:24.04.35) noble; urgency=medium
+
+  * Remove timeouts for network-related package commands. (LP: #2062106)
+  * Remove timeouts for update-initramfs. (LP: #2060429) 
+
+ -- Walter Lapchynski <wxl@ubuntu.com>  Fri, 19 Apr 2024 21:23:54 +0000
+
 calamares-settings-ubuntu (1:24.04.34) noble; urgency=medium
 
   * Add icon on Desktop to finish OEM install. (LP: #2060928) 
diff --git a/kubuntu/modules/pkgselect_context.conf b/kubuntu/modules/pkgselect_context.conf
index 0fcec90..ed95361 100644
--- a/kubuntu/modules/pkgselect_context.conf
+++ b/kubuntu/modules/pkgselect_context.conf
@@ -1,6 +1,5 @@
 ---
 dontChroot: false
-timeout: 900
 "packages.minimalButton":
     true:
         - "DEBIAN_FRONTEND=noninteractive apt-get -y --purge remove kmahjongg kmines kpat ksudoku skanlite skanpage okular libreoffice* kdeconnect krdc konversation neochat elisa haruna vim snapd partitionmanager usb-creator* plasma-welcome kde-config-tablet plasma-welcome"
diff --git a/kubuntu/modules/pkgselect_snap_context.conf b/kubuntu/modules/pkgselect_snap_context.conf
index 653de5e..8340c1d 100644
--- a/kubuntu/modules/pkgselect_snap_context.conf
+++ b/kubuntu/modules/pkgselect_snap_context.conf
@@ -1,6 +1,5 @@
 ---
 dontChroot: true
-timeout: 900
 "packages.elementButton":
     true: "snap-seed-glue --seed ${ROOT}/var/lib/snapd/seed element-desktop"
 "packages.kritaButton":
diff --git a/lubuntu/modules/pkgselect_context.conf b/lubuntu/modules/pkgselect_context.conf
index c2a2045..55b859a 100644
--- a/lubuntu/modules/pkgselect_context.conf
+++ b/lubuntu/modules/pkgselect_context.conf
@@ -1,6 +1,5 @@
 ---
 dontChroot: false
-timeout: 900
 "packages.minimalButton":
     true:
         - "DEBIAN_FRONTEND=noninteractive apt-get -y --purge remove snapd lubuntu-snap-installation-monitor vlc plasma-discover transmission-qt quassel 2048-qt featherpad noblenote kcalc qps zsync partitionmanager qapt-deb-installer picom qlipper qtpass libreoffice*"
diff --git a/lubuntu/modules/pkgselect_snap_context.conf b/lubuntu/modules/pkgselect_snap_context.conf
index 653de5e..8340c1d 100644
--- a/lubuntu/modules/pkgselect_snap_context.conf
+++ b/lubuntu/modules/pkgselect_snap_context.conf
@@ -1,6 +1,5 @@
 ---
 dontChroot: true
-timeout: 900
 "packages.elementButton":
     true: "snap-seed-glue --seed ${ROOT}/var/lib/snapd/seed element-desktop"
 "packages.kritaButton":
diff --git a/ubuntuunity/modules/pkgselect_context.conf b/ubuntuunity/modules/pkgselect_context.conf
index 2992e64..a6f148a 100644
--- a/ubuntuunity/modules/pkgselect_context.conf
+++ b/ubuntuunity/modules/pkgselect_context.conf
@@ -1,6 +1,5 @@
 ---
 dontChroot: false
-timeout: 900
 "packages.minimalButton":
     true:
         - "DEBIAN_FRONTEND=noninteractive apt-get -y --purge remove snapd aisleriot atril cheese simple-scan gdebi gparted *kvantum* libreoffice* gnome-mahjongg gnome-mines remmina rhythmbox shotwell gnome-sudoku synaptic transmission-gtk vlc stacer"
diff --git a/ubuntuunity/modules/pkgselect_snap_context.conf b/ubuntuunity/modules/pkgselect_snap_context.conf
index 653de5e..8340c1d 100644
--- a/ubuntuunity/modules/pkgselect_snap_context.conf
+++ b/ubuntuunity/modules/pkgselect_snap_context.conf
@@ -1,6 +1,5 @@
 ---
 dontChroot: true
-timeout: 900
 "packages.elementButton":
     true: "snap-seed-glue --seed ${ROOT}/var/lib/snapd/seed element-desktop"
 "packages.kritaButton":