diff --git a/bbt-calamares-config/etc/calamares/modules/partition.conf b/bbt-calamares-config/etc/calamares/modules/partition.conf
index da80f75..a05edcb 100644
--- a/bbt-calamares-config/etc/calamares/modules/partition.conf
+++ b/bbt-calamares-config/etc/calamares/modules/partition.conf
@@ -90,7 +90,7 @@ alwaysShowPartitionLabels: true
 #
 # The default is "none"
 #
-initialPartitioningChoice: none
+initialPartitioningChoice: erase
 #
 # Similarly, some of the installation choices may offer a choice of swap;
 # the available choices depend on *userSwapChoices*, above, and this
@@ -98,7 +98,7 @@ initialPartitioningChoice: none
 #
 # The default is "none" (no swap) if that is one of the enabled options, otherwise
 # one of the items from the options.
-initialSwapChoice: none
+initialSwapChoice: small
 
 # Default partition table type, used when a "erase" disk is made.
 #
@@ -156,7 +156,8 @@ defaultFileSystemType:  "ext4"
 #
 # If not specified at all, uses *defaultFileSystemType* without a
 # warning (this matches traditional no-choice-available behavior best).
-availableFileSystemTypes:  ["ext4","ext3","btrfs","jfs","xfs","f2fs"]
+# availableFileSystemTypes:  ["ext4","ext3","btrfs","jfs","xfs","f2fs"]
+availableFileSystemTypes:  ["ext4"]
 
 # Show/hide LUKS related functionality in automated partitioning modes.
 # Disable this if you choose not to deploy early unlocking support in GRUB2