diff --git a/br-ext-chip-goke/configs/gk7205v200_fpv_defconfig b/br-ext-chip-goke/configs/gk7205v200_fpv_defconfig
index e2cb4d3e..8c825065 100644
--- a/br-ext-chip-goke/configs/gk7205v200_fpv_defconfig
+++ b/br-ext-chip-goke/configs/gk7205v200_fpv_defconfig
@@ -36,6 +36,7 @@ BR2_OPENIPC_SOC_MODEL="gk7205v200"
 BR2_OPENIPC_SOC_FAMILY="gk7205v200"
 BR2_OPENIPC_VARIANT="fpv"
 BR2_OPENIPC_FLASH_SIZE="8"
+BR2_OPENIPC_MAJESTIC="fpv"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-goke/configs/gk7205v200_rubyfpv_defconfig b/br-ext-chip-goke/configs/gk7205v200_rubyfpv_defconfig
index 5997f5b3..9e6820d0 100644
--- a/br-ext-chip-goke/configs/gk7205v200_rubyfpv_defconfig
+++ b/br-ext-chip-goke/configs/gk7205v200_rubyfpv_defconfig
@@ -35,8 +35,8 @@ BR2_OPENIPC_SOC_VENDOR="goke"
 BR2_OPENIPC_SOC_MODEL="gk7205v200"
 BR2_OPENIPC_SOC_FAMILY="gk7205v200"
 BR2_OPENIPC_VARIANT="rubyfpv"
-BR2_OPENIPC_MAJESTIC="fpv"
 BR2_OPENIPC_FLASH_SIZE="8"
+BR2_OPENIPC_MAJESTIC="fpv"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-goke/configs/gk7205v200_ultimate_defconfig b/br-ext-chip-goke/configs/gk7205v200_ultimate_defconfig
index f978d2c4..3284a9ea 100644
--- a/br-ext-chip-goke/configs/gk7205v200_ultimate_defconfig
+++ b/br-ext-chip-goke/configs/gk7205v200_ultimate_defconfig
@@ -36,6 +36,7 @@ BR2_OPENIPC_SOC_MODEL="gk7205v200"
 BR2_OPENIPC_SOC_FAMILY="gk7205v200"
 BR2_OPENIPC_VARIANT="ultimate"
 BR2_OPENIPC_FLASH_SIZE="16"
+BR2_OPENIPC_MAJESTIC="ultimate"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-goke/configs/gk7205v210_fpv_defconfig b/br-ext-chip-goke/configs/gk7205v210_fpv_defconfig
index 71c2e9e2..23c2fb2d 100644
--- a/br-ext-chip-goke/configs/gk7205v210_fpv_defconfig
+++ b/br-ext-chip-goke/configs/gk7205v210_fpv_defconfig
@@ -36,6 +36,7 @@ BR2_OPENIPC_SOC_MODEL="gk7205v210"
 BR2_OPENIPC_SOC_FAMILY="gk7205v200"
 BR2_OPENIPC_VARIANT="fpv"
 BR2_OPENIPC_FLASH_SIZE="8"
+BR2_OPENIPC_MAJESTIC="fpv"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-goke/configs/gk7205v210_rubyfpv_defconfig b/br-ext-chip-goke/configs/gk7205v210_rubyfpv_defconfig
index 7c4fa875..621ded63 100644
--- a/br-ext-chip-goke/configs/gk7205v210_rubyfpv_defconfig
+++ b/br-ext-chip-goke/configs/gk7205v210_rubyfpv_defconfig
@@ -35,8 +35,8 @@ BR2_OPENIPC_SOC_VENDOR="goke"
 BR2_OPENIPC_SOC_MODEL="gk7205v210"
 BR2_OPENIPC_SOC_FAMILY="gk7205v200"
 BR2_OPENIPC_VARIANT="rubyfpv"
-BR2_OPENIPC_MAJESTIC="fpv"
 BR2_OPENIPC_FLASH_SIZE="8"
+BR2_OPENIPC_MAJESTIC="fpv"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-goke/configs/gk7205v300_fpv_defconfig b/br-ext-chip-goke/configs/gk7205v300_fpv_defconfig
index 4247b4cf..fb1e4b44 100644
--- a/br-ext-chip-goke/configs/gk7205v300_fpv_defconfig
+++ b/br-ext-chip-goke/configs/gk7205v300_fpv_defconfig
@@ -36,6 +36,7 @@ BR2_OPENIPC_SOC_MODEL="gk7205v300"
 BR2_OPENIPC_SOC_FAMILY="gk7205v200"
 BR2_OPENIPC_VARIANT="fpv"
 BR2_OPENIPC_FLASH_SIZE="8"
+BR2_OPENIPC_MAJESTIC="fpv"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-goke/configs/gk7205v300_rubyfpv_defconfig b/br-ext-chip-goke/configs/gk7205v300_rubyfpv_defconfig
index 306b0474..984d709b 100644
--- a/br-ext-chip-goke/configs/gk7205v300_rubyfpv_defconfig
+++ b/br-ext-chip-goke/configs/gk7205v300_rubyfpv_defconfig
@@ -35,8 +35,8 @@ BR2_OPENIPC_SOC_VENDOR="goke"
 BR2_OPENIPC_SOC_MODEL="gk7205v300"
 BR2_OPENIPC_SOC_FAMILY="gk7205v200"
 BR2_OPENIPC_VARIANT="rubyfpv"
-BR2_OPENIPC_MAJESTIC="fpv"
 BR2_OPENIPC_FLASH_SIZE="8"
+BR2_OPENIPC_MAJESTIC="fpv"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-goke/configs/gk7205v300_ultimate_defconfig b/br-ext-chip-goke/configs/gk7205v300_ultimate_defconfig
index 089d2e21..7c3034a6 100644
--- a/br-ext-chip-goke/configs/gk7205v300_ultimate_defconfig
+++ b/br-ext-chip-goke/configs/gk7205v300_ultimate_defconfig
@@ -36,6 +36,7 @@ BR2_OPENIPC_SOC_MODEL="gk7205v300"
 BR2_OPENIPC_SOC_FAMILY="gk7205v200"
 BR2_OPENIPC_VARIANT="ultimate"
 BR2_OPENIPC_FLASH_SIZE="16"
+BR2_OPENIPC_MAJESTIC="ultimate"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-hisilicon/configs/hi3516av100_ultimate_defconfig b/br-ext-chip-hisilicon/configs/hi3516av100_ultimate_defconfig
index 2155a0f0..67ff8855 100644
--- a/br-ext-chip-hisilicon/configs/hi3516av100_ultimate_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3516av100_ultimate_defconfig
@@ -36,7 +36,6 @@ BR2_OPENIPC_SOC_MODEL="hi3516av100"
 BR2_OPENIPC_SOC_FAMILY="hi3516av100"
 BR2_OPENIPC_VARIANT="ultimate"
 BR2_OPENIPC_FLASH_SIZE="16"
-BR2_OPENIPC_MAJESTIC="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-hisilicon/configs/hi3516av200_ultimate_defconfig b/br-ext-chip-hisilicon/configs/hi3516av200_ultimate_defconfig
index 50b8b08f..d6416285 100644
--- a/br-ext-chip-hisilicon/configs/hi3516av200_ultimate_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3516av200_ultimate_defconfig
@@ -36,7 +36,6 @@ BR2_OPENIPC_SOC_MODEL="hi3516av200"
 BR2_OPENIPC_SOC_FAMILY="hi3519v101"
 BR2_OPENIPC_VARIANT="ultimate"
 BR2_OPENIPC_FLASH_SIZE="16"
-BR2_OPENIPC_MAJESTIC="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-hisilicon/configs/hi3516cv300_ultimate_defconfig b/br-ext-chip-hisilicon/configs/hi3516cv300_ultimate_defconfig
index 70dfb8a4..3d0d2dd1 100644
--- a/br-ext-chip-hisilicon/configs/hi3516cv300_ultimate_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3516cv300_ultimate_defconfig
@@ -35,6 +35,7 @@ BR2_OPENIPC_SOC_MODEL="hi3516cv300"
 BR2_OPENIPC_SOC_FAMILY="hi3516cv300"
 BR2_OPENIPC_VARIANT="ultimate"
 BR2_OPENIPC_FLASH_SIZE="16"
+BR2_OPENIPC_MAJESTIC="ultimate"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-hisilicon/configs/hi3516dv100_ultimate_defconfig b/br-ext-chip-hisilicon/configs/hi3516dv100_ultimate_defconfig
index a0bd6fe5..f08e042d 100644
--- a/br-ext-chip-hisilicon/configs/hi3516dv100_ultimate_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3516dv100_ultimate_defconfig
@@ -36,7 +36,6 @@ BR2_OPENIPC_SOC_MODEL="hi3516dv100"
 BR2_OPENIPC_SOC_FAMILY="hi3516av100"
 BR2_OPENIPC_VARIANT="ultimate"
 BR2_OPENIPC_FLASH_SIZE="16"
-BR2_OPENIPC_MAJESTIC="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-hisilicon/configs/hi3516ev200_fpv_defconfig b/br-ext-chip-hisilicon/configs/hi3516ev200_fpv_defconfig
index a24a857f..290fb886 100644
--- a/br-ext-chip-hisilicon/configs/hi3516ev200_fpv_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3516ev200_fpv_defconfig
@@ -36,6 +36,7 @@ BR2_OPENIPC_SOC_MODEL="hi3516ev200"
 BR2_OPENIPC_SOC_FAMILY="hi3516ev200"
 BR2_OPENIPC_VARIANT="fpv"
 BR2_OPENIPC_FLASH_SIZE="8"
+BR2_OPENIPC_MAJESTIC="fpv"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-hisilicon/configs/hi3516ev200_ultimate_defconfig b/br-ext-chip-hisilicon/configs/hi3516ev200_ultimate_defconfig
index b25d0f34..b60737fb 100644
--- a/br-ext-chip-hisilicon/configs/hi3516ev200_ultimate_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3516ev200_ultimate_defconfig
@@ -36,6 +36,7 @@ BR2_OPENIPC_SOC_MODEL="hi3516ev200"
 BR2_OPENIPC_SOC_FAMILY="hi3516ev200"
 BR2_OPENIPC_VARIANT="ultimate"
 BR2_OPENIPC_FLASH_SIZE="16"
+BR2_OPENIPC_MAJESTIC="ultimate"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-hisilicon/configs/hi3516ev300_fpv_defconfig b/br-ext-chip-hisilicon/configs/hi3516ev300_fpv_defconfig
index 52bc263e..678644f7 100644
--- a/br-ext-chip-hisilicon/configs/hi3516ev300_fpv_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3516ev300_fpv_defconfig
@@ -36,6 +36,7 @@ BR2_OPENIPC_SOC_MODEL="hi3516ev300"
 BR2_OPENIPC_SOC_FAMILY="hi3516ev200"
 BR2_OPENIPC_VARIANT="fpv"
 BR2_OPENIPC_FLASH_SIZE="8"
+BR2_OPENIPC_MAJESTIC="fpv"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-hisilicon/configs/hi3516ev300_ultimate_defconfig b/br-ext-chip-hisilicon/configs/hi3516ev300_ultimate_defconfig
index 5f78a063..64261c5b 100644
--- a/br-ext-chip-hisilicon/configs/hi3516ev300_ultimate_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3516ev300_ultimate_defconfig
@@ -36,6 +36,7 @@ BR2_OPENIPC_SOC_MODEL="hi3516ev300"
 BR2_OPENIPC_SOC_FAMILY="hi3516ev200"
 BR2_OPENIPC_VARIANT="ultimate"
 BR2_OPENIPC_FLASH_SIZE="16"
+BR2_OPENIPC_MAJESTIC="ultimate"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-hisilicon/configs/hi3518ev200_ultimate_defconfig b/br-ext-chip-hisilicon/configs/hi3518ev200_ultimate_defconfig
index 42e82fde..09101adb 100644
--- a/br-ext-chip-hisilicon/configs/hi3518ev200_ultimate_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3518ev200_ultimate_defconfig
@@ -35,6 +35,7 @@ BR2_OPENIPC_SOC_MODEL="hi3518ev200"
 BR2_OPENIPC_SOC_FAMILY="hi3516cv200"
 BR2_OPENIPC_VARIANT="ultimate"
 BR2_OPENIPC_FLASH_SIZE="16"
+BR2_OPENIPC_MAJESTIC="ultimate"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-hisilicon/configs/hi3518ev300_ultimate_defconfig b/br-ext-chip-hisilicon/configs/hi3518ev300_ultimate_defconfig
index 41540e6a..eb07b0c8 100644
--- a/br-ext-chip-hisilicon/configs/hi3518ev300_ultimate_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3518ev300_ultimate_defconfig
@@ -36,6 +36,7 @@ BR2_OPENIPC_SOC_MODEL="hi3518ev300"
 BR2_OPENIPC_SOC_FAMILY="hi3516ev200"
 BR2_OPENIPC_VARIANT="ultimate"
 BR2_OPENIPC_FLASH_SIZE="16"
+BR2_OPENIPC_MAJESTIC="ultimate"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-hisilicon/configs/hi3536dv100_fpv_defconfig b/br-ext-chip-hisilicon/configs/hi3536dv100_fpv_defconfig
index 377bbaf3..d380717a 100644
--- a/br-ext-chip-hisilicon/configs/hi3536dv100_fpv_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3536dv100_fpv_defconfig
@@ -34,6 +34,7 @@ BR2_OPENIPC_SOC_MODEL="hi3536dv100"
 BR2_OPENIPC_SOC_FAMILY="hi3536dv100"
 BR2_OPENIPC_VARIANT="fpv"
 BR2_OPENIPC_FLASH_SIZE="16"
+BR2_OPENIPC_MAJESTIC="fpv"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-ingenic/configs/t20_ultimate_defconfig b/br-ext-chip-ingenic/configs/t20_ultimate_defconfig
index d81350cb..cf305ef7 100644
--- a/br-ext-chip-ingenic/configs/t20_ultimate_defconfig
+++ b/br-ext-chip-ingenic/configs/t20_ultimate_defconfig
@@ -40,7 +40,6 @@ BR2_OPENIPC_SOC_FAMILY="t20"
 BR2_OPENIPC_SNS_MODEL=""
 BR2_OPENIPC_VARIANT="ultimate"
 BR2_OPENIPC_FLASH_SIZE="16"
-BR2_OPENIPC_MAJESTIC="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-ingenic/configs/t21_ultimate_defconfig b/br-ext-chip-ingenic/configs/t21_ultimate_defconfig
index 243a7ccf..6150b7a2 100644
--- a/br-ext-chip-ingenic/configs/t21_ultimate_defconfig
+++ b/br-ext-chip-ingenic/configs/t21_ultimate_defconfig
@@ -40,7 +40,6 @@ BR2_OPENIPC_SOC_FAMILY="t21"
 BR2_OPENIPC_SNS_MODEL=""
 BR2_OPENIPC_VARIANT="ultimate"
 BR2_OPENIPC_FLASH_SIZE="16"
-BR2_OPENIPC_MAJESTIC="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-ingenic/configs/t31_ultimate_defconfig b/br-ext-chip-ingenic/configs/t31_ultimate_defconfig
index b215d404..623b3370 100644
--- a/br-ext-chip-ingenic/configs/t31_ultimate_defconfig
+++ b/br-ext-chip-ingenic/configs/t31_ultimate_defconfig
@@ -40,7 +40,6 @@ BR2_OPENIPC_SOC_FAMILY="t31"
 BR2_OPENIPC_SNS_MODEL=""
 BR2_OPENIPC_VARIANT="ultimate"
 BR2_OPENIPC_FLASH_SIZE="16"
-BR2_OPENIPC_MAJESTIC="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-ingenic/configs/t40_ultimate_defconfig b/br-ext-chip-ingenic/configs/t40_ultimate_defconfig
index 6cc91d89..65f9cc07 100644
--- a/br-ext-chip-ingenic/configs/t40_ultimate_defconfig
+++ b/br-ext-chip-ingenic/configs/t40_ultimate_defconfig
@@ -40,7 +40,6 @@ BR2_OPENIPC_SOC_FAMILY="t40"
 BR2_OPENIPC_SNS_MODEL=""
 BR2_OPENIPC_VARIANT="ultimate"
 BR2_OPENIPC_FLASH_SIZE="16"
-BR2_OPENIPC_MAJESTIC="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-sigmastar/configs/ssc30kq_fpv_defconfig b/br-ext-chip-sigmastar/configs/ssc30kq_fpv_defconfig
index bb48d0f5..3458d491 100644
--- a/br-ext-chip-sigmastar/configs/ssc30kq_fpv_defconfig
+++ b/br-ext-chip-sigmastar/configs/ssc30kq_fpv_defconfig
@@ -33,7 +33,6 @@ BR2_OPENIPC_SOC_MODEL="ssc30kq"
 BR2_OPENIPC_SOC_FAMILY="infinity6e"
 BR2_OPENIPC_VARIANT="fpv"
 BR2_OPENIPC_FLASH_SIZE="16"
-BR2_OPENIPC_MAJESTIC="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-sigmastar/configs/ssc30kq_rubyfpv_defconfig b/br-ext-chip-sigmastar/configs/ssc30kq_rubyfpv_defconfig
index bfa84d0c..412f3ecc 100644
--- a/br-ext-chip-sigmastar/configs/ssc30kq_rubyfpv_defconfig
+++ b/br-ext-chip-sigmastar/configs/ssc30kq_rubyfpv_defconfig
@@ -33,7 +33,6 @@ BR2_OPENIPC_SOC_MODEL="ssc30kq"
 BR2_OPENIPC_SOC_FAMILY="infinity6e"
 BR2_OPENIPC_VARIANT="rubyfpv"
 BR2_OPENIPC_FLASH_SIZE="16"
-BR2_OPENIPC_MAJESTIC="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-sigmastar/configs/ssc338q_fpv_defconfig b/br-ext-chip-sigmastar/configs/ssc338q_fpv_defconfig
index dea2f4c0..ad909bac 100644
--- a/br-ext-chip-sigmastar/configs/ssc338q_fpv_defconfig
+++ b/br-ext-chip-sigmastar/configs/ssc338q_fpv_defconfig
@@ -33,7 +33,6 @@ BR2_OPENIPC_SOC_MODEL="ssc338q"
 BR2_OPENIPC_SOC_FAMILY="infinity6e"
 BR2_OPENIPC_VARIANT="fpv"
 BR2_OPENIPC_FLASH_SIZE="16"
-BR2_OPENIPC_MAJESTIC="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/br-ext-chip-sigmastar/configs/ssc338q_rubyfpv_defconfig b/br-ext-chip-sigmastar/configs/ssc338q_rubyfpv_defconfig
index e781875c..40138615 100644
--- a/br-ext-chip-sigmastar/configs/ssc338q_rubyfpv_defconfig
+++ b/br-ext-chip-sigmastar/configs/ssc338q_rubyfpv_defconfig
@@ -33,7 +33,6 @@ BR2_OPENIPC_SOC_MODEL="ssc338q"
 BR2_OPENIPC_SOC_FAMILY="infinity6e"
 BR2_OPENIPC_VARIANT="rubyfpv"
 BR2_OPENIPC_FLASH_SIZE="16"
-BR2_OPENIPC_MAJESTIC="lite"
 
 # Filesystem
 # BR2_TARGET_TZ_INFO is not set
diff --git a/general/Config.in b/general/Config.in
index 6629e98d..4ed3ac66 100644
--- a/general/Config.in
+++ b/general/Config.in
@@ -24,6 +24,6 @@ config BR2_OPENIPC_FLASH_SIZE
 
 config BR2_OPENIPC_MAJESTIC
 	string "OpenIPC Majestic"
-	default ""
+	default "lite"
 
 source "$BR2_EXTERNAL_GENERAL_PATH/package/Config.in"
diff --git a/general/package/majestic/majestic.mk b/general/package/majestic/majestic.mk
index f7db58da..8d3e8df0 100644
--- a/general/package/majestic/majestic.mk
+++ b/general/package/majestic/majestic.mk
@@ -10,7 +10,7 @@ MAJESTIC_LICENSE = PROPRIETARY
 MAJESTIC_LICENSE_FILES = LICENSE
 
 MAJESTIC_FAMILY = $(OPENIPC_SOC_FAMILY)
-MAJESTIC_VARIANT = $(or $(OPENIPC_MAJESTIC), $(OPENIPC_VARIANT))
+MAJESTIC_VARIANT = $(OPENIPC_MAJESTIC)
 
 MAJESTIC_DEPENDENCIES += \
 	libevent-openipc \