diff --git a/PCBA/board/funkey/boot.cmd b/PCBA/board/funkey/boot.cmd
index 0ac2311..bacc006 100644
--- a/PCBA/board/funkey/boot.cmd
+++ b/PCBA/board/funkey/boot.cmd
@@ -1,2 +1,2 @@
 setenv bootargs console=ttyS0,115200 panic=5 quiet
-bootm 0x41000000 - 0x41800000
+bootz 0x41000000 - 0x41800000
diff --git a/PCBA/board/funkey/busybox.config b/PCBA/board/funkey/busybox.config
index edf3f26..9a212f6 100644
--- a/PCBA/board/funkey/busybox.config
+++ b/PCBA/board/funkey/busybox.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Busybox version: 1.31.1
-# Tue Jul 28 17:23:44 2020
+# Tue Jul 28 19:52:02 2020
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
diff --git a/PCBA/board/funkey/linux.config b/PCBA/board/funkey/linux.config
index a0a2005..386fa97 100644
--- a/PCBA/board/funkey/linux.config
+++ b/PCBA/board/funkey/linux.config
@@ -1,5 +1,5 @@
 CONFIG_LOCALVERSION="-funkey"
-CONFIG_KERNEL_LZO=y
+CONFIG_KERNEL_LZMA=y
 CONFIG_DEFAULT_HOSTNAME="funkey"
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
@@ -42,7 +42,8 @@ CONFIG_INPUT_EVDEV=y
 # CONFIG_INPUT_MOUSE is not set
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_UINPUT=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
+# CONFIG_CONSOLE_TRANSLATIONS is not set
+# CONFIG_VT_CONSOLE is not set
 CONFIG_LEGACY_PTY_COUNT=4
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
diff --git a/PCBA/board/funkey/post-build.sh b/PCBA/board/funkey/post-build.sh
index 74fe6fa..4e53acb 100755
--- a/PCBA/board/funkey/post-build.sh
+++ b/PCBA/board/funkey/post-build.sh
@@ -1,12 +1,7 @@
 #!/bin/sh
 
-# Add swap partition to fstab
-sed -i '/^\/swap/d' "${TARGET_DIR}/etc/fstab"
-echo "/swap		none		swap	defaults	0	0" >> "${TARGET_DIR}/etc/fstab"
-
-# Add local path to init scripts
-sed -i '3iexport PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin' ${TARGET_DIR}/etc/init.d/rcK
-sed -i '3iexport PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin' ${TARGET_DIR}/etc/init.d/rcS
-
 # Remove log daemon init scripts since they are loaded from inittab
 rm -f ${TARGET_DIR}/etc/init.d/S01syslogd ${TARGET_DIR}/etc/init.d/S02klogd
+
+# Remove telnet daemon as we don't have network
+rm -f ${TARGET_DIR}/etc/init.d/S50telnet
diff --git a/PCBA/board/funkey/rootfs-overlay/etc/issue b/PCBA/board/funkey/rootfs-overlay/etc/issue
index f3307d9..9392185 100644
--- a/PCBA/board/funkey/rootfs-overlay/etc/issue
+++ b/PCBA/board/funkey/rootfs-overlay/etc/issue
@@ -1,10 +1,2 @@
-
- _______               __  __              
-|    ___|.--.--.-----.|  |/  |.-----.--.--.
-|    ___||  |  |     ||     < |  -__|  |  |
-|___|    |_____|__|__||__|\__||_____|___  |
-         FUN ON A KEYCHAIN          |_____|
- -----------------------------------------------------
- Version 0.5 PCBA
- -----------------------------------------------------
+Welcome to FunKey!
 
diff --git a/PCBA/board/funkey/uboot.config b/PCBA/board/funkey/uboot.config
index 7a5d9c9..e8fe194 100644
--- a/PCBA/board/funkey/uboot.config
+++ b/PCBA/board/funkey/uboot.config
@@ -25,6 +25,8 @@ CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_CONSOLE is not set
 # CONFIG_CMD_BOOTD is not set
+# CONFIG_CMD_BOOTM is not set
+CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_ELF is not set
 # CONFIG_CMD_GO is not set
 # CONFIG_CMD_IMI is not set
diff --git a/PCBA/configs/funkey_defconfig b/PCBA/configs/funkey_defconfig
index a1846cb..24439c5 100644
--- a/PCBA/configs/funkey_defconfig
+++ b/PCBA/configs/funkey_defconfig
@@ -20,9 +20,7 @@ BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/Lichee-Pi/linux"
 BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="cda44c146b9b87290bc7c636ffa7d88cbfb03ace"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_FUNKEY_PATH)/board/funkey/linux.config"
-BR2_LINUX_KERNEL_UIMAGE=y
-BR2_LINUX_KERNEL_LZO=y
-BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x41000000"
+BR2_LINUX_KERNEL_LZMA=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-v3s-funkey"
 BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_FUNKEY_PATH)/board/funkey/busybox.config"
diff --git a/fel-boot.sh b/fel-boot.sh
index 6948086..ac62729 100755
--- a/fel-boot.sh
+++ b/fel-boot.sh
@@ -1,7 +1,8 @@
 #!/bin/sh
 cd PCBA/output/images
 sudo ~/sunxi-tools/sunxi-fel -v -p uboot u-boot-sunxi-with-spl.bin \
-     write 0x41000000 uImage \
-     write 0x41800000 sun8i-v3s-funkey.dtb \
-     write 0x41900000 boot.scr
+     multi 3 \
+     0x41000000 zImage \
+     0x41800000 sun8i-v3s-funkey.dtb \
+     0x41900000 boot.scr
 cd -