diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml
index dc58f99..57915f5 100644
--- a/.github/workflows/build-image.yml
+++ b/.github/workflows/build-image.yml
@@ -48,7 +48,7 @@ jobs:
   build:
     needs: matrix
     runs-on: self-hosted
-    timeout-minutes: 360
+    timeout-minutes: 720
     permissions:
       contents: write
 
diff --git a/build_image.sh b/build_image.sh
index f23814a..bc3dc5b 100755
--- a/build_image.sh
+++ b/build_image.sh
@@ -19,7 +19,7 @@ usage() {
     echo "Options:"
     echo "  --distro     Distribution to build: ubuntu2604, arch, cachyos, kali, all (default: ubuntu2604)"
     echo "  --kernel     Path to kernel source directory (default: auto-clone to work/linux/)"
-    echo "  --img-size   Disk image size in MB (default: 12000, 32000 for --distro all, 49152 for kali)"
+    echo "  --img-size   Disk image size in MB (default: 12000, 32000 for --distro all, 98304 for kali)"
     echo "  --clean      Remove all cached build artifacts and start from scratch"
     echo "  --clean-only Remove all cached build artifacts and exit"
     echo "  --kernel-only  Build and package the kernel only, then exit"
@@ -65,7 +65,7 @@ if [ "$DISTRO" = "all" ] && [ "$IMG_SIZE" = "12000" ]; then
     IMG_SIZE=32000
 fi
 if [ "$DISTRO" = "kali" ] && [ "$IMG_SIZE" = "12000" ]; then
-    IMG_SIZE=49152
+    IMG_SIZE=98304
 fi
 
 if [ -z "$FORMAT" ]; then
diff --git a/distros/kali/image.yaml b/distros/kali/image.yaml
index 2dcaac1..1cdde0b 100644
--- a/distros/kali/image.yaml
+++ b/distros/kali/image.yaml
@@ -28,10 +28,9 @@ packages:
 
   sets:
   - packages:
-    # Official Kali desktop and default toolset. The full "everything" set is
-    # too large for reliable release builds on the self-hosted runner.
+    # Full Kali desktop and toolset
     - kali-desktop-xfce
-    - kali-linux-default
+    - kali-linux-everything
     - kali-defaults
     - kali-defaults-desktop
     - kali-themes