diff --git a/config/boards/jetson-nano.csc b/config/boards/jetson-nano.csc
index 5db6a4800c..f0b9fd3805 100644
--- a/config/boards/jetson-nano.csc
+++ b/config/boards/jetson-nano.csc
@@ -7,4 +7,3 @@ FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="nvidia/tegra210-p3450-0000.dtb"
 SRC_EXTLINUX="yes"
-OFFSET=14
diff --git a/config/sources/families/jetson-nano.conf b/config/sources/families/jetson-nano.conf
index 7eab77d7d4..37670bf5f4 100644
--- a/config/sources/families/jetson-nano.conf
+++ b/config/sources/families/jetson-nano.conf
@@ -3,7 +3,6 @@ KERNEL_IMAGE_TYPE=Image
 ATF_COMPILE="no"
 
 BOOTSCRIPT=""
-BOOTBRANCH='tag:v2021.04'
 BOOTPATCHDIR="u-boot-arm-64"
 BOOTDIR='u-boot'
 UBOOT_TARGET_MAP=";;u-boot.bin"
@@ -20,10 +19,12 @@ case $BRANCH in
 
 	current)
 		KERNELBRANCH="branch:linux-5.10.y"
+		KERNELPATCHDIR='rockchip64-'$BRANCH
 	;;
 
 	edge)
 		KERNELBRANCH="branch:linux-5.14.y"
+		KERNELPATCHDIR='rockchip64-'$BRANCH
 	;;
 
 esac
diff --git a/patch/kernel/jetson-nano-current b/patch/kernel/jetson-nano-current
deleted file mode 120000
index 5f6a0446b6..0000000000
--- a/patch/kernel/jetson-nano-current
+++ /dev/null
@@ -1 +0,0 @@
-archive/imx6-5.10
\ No newline at end of file
diff --git a/patch/kernel/jetson-nano-edge b/patch/kernel/jetson-nano-edge
deleted file mode 120000
index bd73e6821c..0000000000
--- a/patch/kernel/jetson-nano-edge
+++ /dev/null
@@ -1 +0,0 @@
-archive/imx6-5.13
\ No newline at end of file