diff --git a/br-ext-chip-ingenic/board/t21/kernel/t10.generic.config b/br-ext-chip-ingenic/board/t20/kernel/t10.generic.config
similarity index 100%
rename from br-ext-chip-ingenic/board/t21/kernel/t10.generic.config
rename to br-ext-chip-ingenic/board/t20/kernel/t10.generic.config
diff --git a/br-ext-chip-ingenic/board/t21/kernel/t20.generic.config b/br-ext-chip-ingenic/board/t20/kernel/t20.generic.config
similarity index 100%
rename from br-ext-chip-ingenic/board/t21/kernel/t20.generic.config
rename to br-ext-chip-ingenic/board/t20/kernel/t20.generic.config
diff --git a/br-ext-chip-ingenic/configs/t10_lite_defconfig b/br-ext-chip-ingenic/configs/t10_lite_defconfig
index d4013569..d1bf5874 100644
--- a/br-ext-chip-ingenic/configs/t10_lite_defconfig
+++ b/br-ext-chip-ingenic/configs/t10_lite_defconfig
@@ -27,16 +27,16 @@ BR2_TOOLCHAIN_BUILDROOT_USE_SSP=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/$(OPENIPC_KERNEL).tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/$(OPENIPC_SOC_VENDOR)-t31.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/t21/kernel/t10.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/t20/kernel/t10.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_LZMA=y
 
 # OpenIPC
 BR2_OPENIPC_SOC_VENDOR="ingenic"
 BR2_OPENIPC_SOC_MODEL="t10"
-BR2_OPENIPC_SOC_FAMILY="t21"
+BR2_OPENIPC_SOC_FAMILY="t20"
 BR2_OPENIPC_FLAVOR="lite"
 BR2_OPENIPC_FLASH_SIZE="8"
 
diff --git a/br-ext-chip-ingenic/configs/t20_lite_defconfig b/br-ext-chip-ingenic/configs/t20_lite_defconfig
index 23a1e124..f01e89a4 100644
--- a/br-ext-chip-ingenic/configs/t20_lite_defconfig
+++ b/br-ext-chip-ingenic/configs/t20_lite_defconfig
@@ -27,16 +27,16 @@ BR2_TOOLCHAIN_BUILDROOT_USE_SSP=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/$(OPENIPC_KERNEL).tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/$(OPENIPC_SOC_VENDOR)-t31.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/t21/kernel/t20.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/t20/kernel/t20.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_LZMA=y
 
 # OpenIPC
 BR2_OPENIPC_SOC_VENDOR="ingenic"
 BR2_OPENIPC_SOC_MODEL="t20"
-BR2_OPENIPC_SOC_FAMILY="t21"
+BR2_OPENIPC_SOC_FAMILY="t20"
 BR2_OPENIPC_FLAVOR="lite"
 BR2_OPENIPC_FLASH_SIZE="8"
 
diff --git a/br-ext-chip-ingenic/configs/t20_ultimate_defconfig b/br-ext-chip-ingenic/configs/t20_ultimate_defconfig
index dc78b1e6..d8d6723f 100644
--- a/br-ext-chip-ingenic/configs/t20_ultimate_defconfig
+++ b/br-ext-chip-ingenic/configs/t20_ultimate_defconfig
@@ -27,16 +27,16 @@ BR2_TOOLCHAIN_BUILDROOT_USE_SSP=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/$(OPENIPC_KERNEL).tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/$(OPENIPC_SOC_VENDOR)-t31.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/t21/kernel/t20.generic.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/t20/kernel/t20.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_LZMA=y
 
 # OpenIPC
 BR2_OPENIPC_SOC_VENDOR="ingenic"
 BR2_OPENIPC_SOC_MODEL="t20"
-BR2_OPENIPC_SOC_FAMILY="t21"
+BR2_OPENIPC_SOC_FAMILY="t20"
 BR2_OPENIPC_FLAVOR="ultimate"
 BR2_OPENIPC_FLASH_SIZE="16"
 
diff --git a/br-ext-chip-ingenic/configs/t21_lite_defconfig b/br-ext-chip-ingenic/configs/t21_lite_defconfig
index 3c6aff77..3009f401 100644
--- a/br-ext-chip-ingenic/configs/t21_lite_defconfig
+++ b/br-ext-chip-ingenic/configs/t21_lite_defconfig
@@ -27,7 +27,7 @@ BR2_TOOLCHAIN_BUILDROOT_USE_SSP=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/$(OPENIPC_KERNEL).tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/$(OPENIPC_SOC_VENDOR)-t31.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/t21/kernel/t21.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
diff --git a/br-ext-chip-ingenic/configs/t21_ultimate_defconfig b/br-ext-chip-ingenic/configs/t21_ultimate_defconfig
index 9c36a30f..afbb896e 100644
--- a/br-ext-chip-ingenic/configs/t21_ultimate_defconfig
+++ b/br-ext-chip-ingenic/configs/t21_ultimate_defconfig
@@ -27,7 +27,7 @@ BR2_TOOLCHAIN_BUILDROOT_USE_SSP=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/$(OPENIPC_KERNEL).tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/$(OPENIPC_SOC_VENDOR)-t31.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/t21/kernel/t21.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
diff --git a/br-ext-chip-ingenic/configs/t30_lite_defconfig b/br-ext-chip-ingenic/configs/t30_lite_defconfig
index 2232dca0..6c315b24 100644
--- a/br-ext-chip-ingenic/configs/t30_lite_defconfig
+++ b/br-ext-chip-ingenic/configs/t30_lite_defconfig
@@ -27,7 +27,7 @@ BR2_TOOLCHAIN_BUILDROOT_USE_SSP=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/$(OPENIPC_KERNEL).tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/$(OPENIPC_SOC_VENDOR)-t31.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/t21/kernel/t30.generic.config"
 BR2_LINUX_KERNEL_UIMAGE=y
diff --git a/general/external.mk b/general/external.mk
index 53c49356..a4658fab 100644
--- a/general/external.mk
+++ b/general/external.mk
@@ -5,19 +5,6 @@ export OPENIPC_FLAVOR := $(call qstrip,$(BR2_OPENIPC_FLAVOR))
 
 EXTERNAL_VENDOR := $(BR2_EXTERNAL)/../br-ext-chip-$(OPENIPC_SOC_VENDOR)
 OPENIPC_TOOLCHAIN := latest/$(shell $(BR2_EXTERNAL)/scripts/show_toolchains.sh $(BR2_DEFCONFIG))
-
-ifeq ($(OPENIPC_SOC_FAMILY),t21)
-	BR2_OPENIPC_KERNEL := $(OPENIPC_SOC_VENDOR)-t31
-else
-	BR2_OPENIPC_KERNEL := $(OPENIPC_SOC_VENDOR)-$(OPENIPC_SOC_FAMILY)
-endif
-
-ifeq ($(call qstrip,$(BR2_DL_DIR)),$(TOPDIR)/dl)
-	OPENIPC_KERNEL := $(BR2_OPENIPC_KERNEL)
-else
-	OPENIPC_KERNEL := $(shell git ls-remote https://github.com/openipc/linux \
-		$(BR2_OPENIPC_KERNEL) | head -1 | cut -f1)
-	LOCAL_DOWNLOAD = y
-endif
+OPENIPC_KERNEL := $(OPENIPC_SOC_VENDOR)-$(OPENIPC_SOC_FAMILY)
 
 include $(sort $(wildcard $(BR2_EXTERNAL)/package/*/*.mk))
diff --git a/general/package/majestic/majestic.mk b/general/package/majestic/majestic.mk
index 57e96c26..1b05b98d 100644
--- a/general/package/majestic/majestic.mk
+++ b/general/package/majestic/majestic.mk
@@ -6,15 +6,14 @@
 
 MAJESTIC_SITE = https://openipc.s3-eu-west-1.amazonaws.com
 MAJESTIC_SOURCE = majestic.$(MAJESTIC_FAMILY).$(MAJESTIC_RELEASE).master.tar.bz2
-
 MAJESTIC_LICENSE = PROPRIETARY
 MAJESTIC_LICENSE_FILES = LICENSE
 
 MAJESTIC_FAMILY = $(OPENIPC_SOC_FAMILY)
 MAJESTIC_RELEASE = $(OPENIPC_FLAVOR)
 
-# we don't have Majestic ultimate for these platforms
-MAJESTIC_LIST = hi3516av100 hi3519v101
+# filter Majestic ultimate for these platforms
+MAJESTIC_LIST = t20 t21 hi3516av100 hi3519v101
 
 ifneq ($(filter $(MAJESTIC_LIST),$(MAJESTIC_FAMILY)),)
 	MAJESTIC_RELEASE = lite
@@ -29,8 +28,7 @@ MAJESTIC_DEPENDENCIES = \
 	libogg-openipc \
 	mbedtls-openipc \
 	opus-openipc \
-	json-c \
-	zlib
+	json-c
 
 MAJESTIC_STRIP_COMPONENTS = 0
 
@@ -44,8 +42,6 @@ define MAJESTIC_INSTALL_TARGET_CMDS
 
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin
 	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/majestic
-
-	rm -rf $(MAJESTIC_DL_DIR)
 endef
 
 $(eval $(generic-package))