diff --git a/install.sh b/install.sh
index 4699679..385822a 100644
--- a/install.sh
+++ b/install.sh
@@ -4,22 +4,21 @@ DISK="/dev/sda"
 # Create a new partition table
 parted $DISK -- mklabel gpt
 
-# Create a 512MB partition for UEFI boot
-parted $DISK -- mkpart ESP fat32 1MiB 513MiB
-parted $DISK -- set 1 boot on
-
 # Create the root partition
-parted $DISK -- mkpart primary ext4 513MiB 100%
+parted $DISK -- mkpart root ext4 512MiB -8GB
 
-# Format the boot partition
-mkfs.fat -F32 ${DISK}1
+# Create the swap partition
+parted $DISK -- mkpart swap linux-swap -8GB 100%
+
+parted $DISK -- mkpart ESP fat32 1MB 512MiB
+parted $DISK -- set 3 esp on
 
 # DO NOT FORMAT the root partition before encryption!
 # cryptsetup will fail if the partition is already formatted
 
 # Encrypt the root partition
-cryptsetup luksFormat ${DISK}2
-cryptsetup open ${DISK}2 root
+cryptsetup luksFormat ${DISK}1
+cryptsetup open ${DISK}1 root
 
 # Now format the encrypted partition
 mkfs.ext4 /dev/mapper/root
@@ -27,16 +26,21 @@ mkfs.ext4 /dev/mapper/root
 # Mount the partitions
 mount /dev/mapper/root /mnt
 
+# Format 
+mkfs.ext4 -L nixos ${DISK}1
+mkswap -L swap ${DISK}2
+mkfs.fat -F 32 -n boot ${DISK}3
+
+# Mount the partitions
+mount /dev/disk/by-label/nixos /mnt
 mkdir -p /mnt/boot
-mount ${DISK}1 /mnt/boot
+mount /dev/disk/by-label/boot /mnt/boot
+
 
 # Clone the configuration repository
 mkdir -p /mnt/etc/nixos
 git clone https://git.luke-else.co.uk/luke-else/nixos-config.git /mnt/etc/nixos
 
-# Generate NixOS configuration (optional if using flakes)
-nixos-generate-config --root /mnt
-
 # Install NixOS using the cloned configuration
 nixos-install --flake /mnt/etc/nixos#vm
 
diff --git a/modules/common.nix b/modules/common.nix
index 6788015..4d6651b 100644
--- a/modules/common.nix
+++ b/modules/common.nix
@@ -18,7 +18,7 @@
     fsType = "ext4";
   };
 
-  swapDevices = [{ device = "/swapfile"; size = 4096; }];
+  swapDevices = [{ device = "/swapfile"; size = 8192; }];
 
   # Locales and timezone
   time.timeZone = "Europe/London";