diff --git a/bootstrap.d/13-kernel.sh b/bootstrap.d/13-kernel.sh
index 1fc9377..2802792 100644
--- a/bootstrap.d/13-kernel.sh
+++ b/bootstrap.d/13-kernel.sh
@@ -656,7 +656,7 @@ if [ "$BUILD_KERNEL" = true ] ; then
         echo "CONFIG_FHANDLE=y" >> "${KERNEL_DIR}"/.config
         echo "CONFIG_LBDAF=y" >> "${KERNEL_DIR}"/.config
 
-        if [ "$KERNEL_CRYPTFS" = true ] ; then
+        if [ "$ENABLE_CRYPTFS" = true ] ; then
           {
             echo "CONFIG_EMBEDDED=y"
             echo "CONFIG_EXPERT=y"
diff --git a/templates/RPI3+ b/templates/RPI3+
index 9d55806..90ea021 100644
--- a/templates/RPI3+
+++ b/templates/RPI3+
@@ -15,16 +15,18 @@ KERNEL_BPF=true
 KERNEL_DEFAULT_GOV=ondemand
 KERNEL_SECURITY=false
 
-#ENABLE_CRYPTFS=false
-#ENABLE_USBBOOT=true
-#CRYPTFS_PASSWORD=
-#CRYPTFS_DROPBEAR=false
-
-
+ENABLE_CRYPTFS=true
+ENABLE_USBBOOT=false
+CRYPTFS_PASSWORD=Password123!
+CRYPTFS_DROPBEAR=true
+CRYPTFS_CIPHER="aes-xts-plain64
+CRYPTFS_HASH=sha512
+CRYPTFS_XTSKEYSIZE=512
+#CRYPTFS_DROPBEAR_PUBKEY=pathtokey
 
 HOSTNAME=RPI
 USER_NAME=helge
-USER_PASSWORD=helge
+USER_PASSWORD=Password123!
 PASSWORD=helge
 
 ENABLE_DPHYSSWAP=false
@@ -79,7 +81,7 @@ SSH_LIMIT_USERS=true
 #RPI_FIRMWARE_DIR=/home/helge/firmware
 #UBOOTSRC_DIR=/home/helge/u-boot
 #VIDEOCORESRC_DIR=/home/helge/userland
-APT_INCLUDES=git,usbutils,hostapd,firmware-linux-free
+APT_INCLUDES=git,usbutils,firmware-linux-free
 APT_PROXY="http://127.0.0.1:3142/"
 IMAGE_NAME=RPI-3P
 #ENABLE_UBOOTUSB=true