diff --git a/acorinstaller/calamares/modules/fstab.conf b/acorinstaller/calamares/modules/fstab.conf
index 69ff540..8da60df 100644
--- a/acorinstaller/calamares/modules/fstab.conf
+++ b/acorinstaller/calamares/modules/fstab.conf
@@ -25,9 +25,3 @@ tmpOptions:
         tmpfs: true
         options: "defaults,noatime,mode=1777"
 
-- name: swap
-  fstype: swap
-  mountpoint: swap
-  size: 4G
-  create: true
-
diff --git a/acorinstaller/calamares/modules/partition.conf b/acorinstaller/calamares/modules/partition.conf
index d7cb865..68d182d 100644
--- a/acorinstaller/calamares/modules/partition.conf
+++ b/acorinstaller/calamares/modules/partition.conf
@@ -1,5 +1,5 @@
 efiSystemPartition:     "/boot/efi"
-efiSystemPartitionSize:     600M
+efiSystemPartitionSize:     800M
 efiSystemPartitionName:     EFI
 userSwapChoices:
     - none      # Create no swap, use no swap