diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c4a0c519..4903e262 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -56,6 +56,7 @@ jobs:
           - gk7205v300
           - gk7202v300
           - gk7605v100
+          - ssc338q
           - t31
           - t40
 
@@ -113,8 +114,6 @@ jobs:
             release: lite
           - platform: ssc337de
             release: lite
-          - platform: ssc338q
-            release: lite
           - platform: t10
             release: lite
           - platform: t20
@@ -250,7 +249,8 @@ jobs:
             fi
           }
 
-          if [ ${RELEASE} = "ultimate" ] || grep -q "USES_GLIBC" ${CONFIG}; then
+          EXCLUDE="hi3516cv500"
+          if [ ${RELEASE} = "ultimate" ] || grep -qP ${EXCLUDE} ${CONFIG}; then
             MAX_KERNEL_SIZE=${MAX_KERNEL_SIZE_ULTIMATE}
             MAX_ROOTFS_SIZE=${MAX_ROOTFS_SIZE_ULTIMATE}
           fi
diff --git a/br-ext-chip-sigmastar/configs/ssc338q_lite_defconfig b/br-ext-chip-sigmastar/configs/ssc338q_lite_defconfig
index a9e09d04..fe5c3a2b 100644
--- a/br-ext-chip-sigmastar/configs/ssc338q_lite_defconfig
+++ b/br-ext-chip-sigmastar/configs/ssc338q_lite_defconfig
@@ -38,11 +38,6 @@ BR2_OPENIPC_FLAVOR="lite"
 BR2_TARGET_ROOTFS_CPIO=y
 BR2_TARGET_ROOTFS_SQUASHFS=y
 BR2_TARGET_ROOTFS_SQUASHFS4_XZ=y
-BR2_TARGET_ROOTFS_UBI=y
-BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048
-BR2_TARGET_ROOTFS_UBI_USE_CUSTOM_CONFIG=y
-BR2_TARGET_ROOTFS_UBI_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL)/scripts/ubifs/ubinize_sigmastar.cfg"
-BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f000
 BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL)/overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL)/scripts/rootfs_script.sh"
 
@@ -83,8 +78,6 @@ BR2_PACKAGE_MICROBE_WEB=y
 BR2_PACKAGE_OPUS_OPENIPC=y
 BR2_PACKAGE_OPUS_OPENIPC_FIXED_POINT=y
 BR2_PACKAGE_SIGMASTAR_OSDRV_INFINITY6E=y
-BR2_PACKAGE_DOSFSTOOLS=y
-BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
 BR2_PACKAGE_EXFAT_OPENIPC=y
 BR2_PACKAGE_EXFATPROGS=y
 # BR2_PACKAGE_SSHPASS is not set
@@ -93,16 +86,6 @@ BR2_PACKAGE_VTUND_OPENIPC=y
 BR2_PACKAGE_YAML_CLI=y
 BR2_PACKAGE_ZLIB=y
 
-# Wireless
-BR2_PACKAGE_WIRELESS_TOOLS=y
-BR2_PACKAGE_WPA_SUPPLICANT=y
-BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
-BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y
-BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y
-BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
-BR2_PACKAGE_RTL8733BU=y
-BR2_PACKAGE_WIRELESS_CONFIGURATION=y
-
 # Debug
 # BR2_PACKAGE_HOST_GDB is not set
 # BR2_PACKAGE_GDB is not set
diff --git a/br-ext-chip-sigmastar/configs/ssc338q_ultimate_defconfig b/br-ext-chip-sigmastar/configs/ssc338q_ultimate_defconfig
new file mode 100644
index 00000000..db9a700c
--- /dev/null
+++ b/br-ext-chip-sigmastar/configs/ssc338q_ultimate_defconfig
@@ -0,0 +1,123 @@
+# Architecture
+BR2_arm=y
+BR2_cortex_a7=y
+BR2_ARM_EABIHF=y
+BR2_ARM_FPU_NEON_VFPV4=y
+BR2_ARM_INSTRUCTIONS_THUMB2=y
+BR2_KERNEL_HEADERS_VERSION=y
+BR2_DEFAULT_KERNEL_VERSION="4.9.84"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
+
+# Toolchain
+BR2_PER_PACKAGE_DIRECTORIES=y
+BR2_GCC_VERSION_12_X=y
+BR2_TOOLCHAIN_USES_GLIBC=y
+BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
+BR2_TOOLCHAIN_BUILDROOT_LIBC="glibc"
+BR2_TOOLCHAIN_BUILDROOT_CXX=y
+BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
+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_USE_CUSTOM_CONFIG=y
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/infinity6e/kernel/ssc338q.generic.config"
+BR2_LINUX_KERNEL_UIMAGE=y
+BR2_LINUX_KERNEL_XZ=y
+
+# OpenIPC
+BR2_OPENIPC_SOC_VENDOR="sigmastar"
+BR2_OPENIPC_SOC_MODEL="ssc338q"
+BR2_OPENIPC_SOC_FAMILY="infinity6e"
+BR2_OPENIPC_FLAVOR="ultimate"
+
+# Filesystem
+# BR2_TARGET_TZ_INFO is not set
+BR2_TARGET_ROOTFS_CPIO=y
+BR2_TARGET_ROOTFS_SQUASHFS=y
+BR2_TARGET_ROOTFS_SQUASHFS4_XZ=y
+BR2_TARGET_ROOTFS_UBI=y
+BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048
+BR2_TARGET_ROOTFS_UBI_USE_CUSTOM_CONFIG=y
+BR2_TARGET_ROOTFS_UBI_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL)/scripts/ubifs/ubinize_sigmastar.cfg"
+BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f000
+BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL)/overlay"
+BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL)/scripts/rootfs_script.sh"
+
+# OpenIPC configuration
+BR2_TOOLCHAIN_BUILDROOT_VENDOR="openipc"
+BR2_TARGET_GENERIC_ISSUE="Welcome to OpenIPC"
+BR2_TARGET_GENERIC_HOSTNAME="openipc-ssc338q"
+BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL)/package/all-patches"
+
+# OpenIPC packages
+BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL)/package/busybox/busybox.config"
+BR2_PACKAGE_DROPBEAR_OPENIPC=y
+# BR2_PACKAGE_FDK_AAC_OPENIPC is not set
+BR2_PACKAGE_UBOOT_TOOLS=y
+BR2_PACKAGE_HASERL=y
+BR2_PACKAGE_IPCTOOL=y
+BR2_PACKAGE_JSON_C=y
+BR2_PACKAGE_JSONFILTER=y
+BR2_PACKAGE_LIBCURL_OPENIPC=y
+BR2_PACKAGE_LIBCURL_OPENIPC_CURL=y
+# BR2_PACKAGE_LIBCURL_OPENIPC_VERBOSE is not set
+# BR2_PACKAGE_LIBCURL_OPENIPC_PROXY_SUPPORT is not set
+# BR2_PACKAGE_LIBCURL_OPENIPC_COOKIES_SUPPORT is not set
+# BR2_PACKAGE_LIBCURL_OPENIPC_EXTRA_PROTOCOLS_FEATURES is not set
+BR2_PACKAGE_LIBCURL_OPENIPC_MBEDTLS=y
+BR2_PACKAGE_LIBEVENT_OPENIPC=y
+BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y
+BR2_PACKAGE_LIBOGG_OPENIPC=y
+BR2_PACKAGE_LIBYAML=y
+# BR2_PACKAGE_MAJESTIC_FONTS is not set
+BR2_PACKAGE_MAJESTIC=y
+BR2_PACKAGE_MBEDTLS_OPENIPC=y
+# BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set
+# BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set
+BR2_PACKAGE_MICROBE_WEB=y
+# BR2_PACKAGE_MINI_SNMPD is not set
+# BR2_PACKAGE_MOTORS is not set
+BR2_PACKAGE_OPUS_OPENIPC=y
+BR2_PACKAGE_OPUS_OPENIPC_FIXED_POINT=y
+BR2_PACKAGE_SIGMASTAR_OSDRV_INFINITY6E=y
+BR2_PACKAGE_DOSFSTOOLS=y
+BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
+BR2_PACKAGE_EXFAT_OPENIPC=y
+BR2_PACKAGE_EXFATPROGS=y
+# BR2_PACKAGE_SSHPASS is not set
+BR2_PACKAGE_UACME_OPENIPC=y
+BR2_PACKAGE_VTUND_OPENIPC=y
+BR2_PACKAGE_YAML_CLI=y
+BR2_PACKAGE_ZLIB=y
+
+# Wireless
+BR2_PACKAGE_WIRELESS_TOOLS=y
+BR2_PACKAGE_WPA_SUPPLICANT=y
+BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
+BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y
+BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y
+BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
+BR2_PACKAGE_RTL8733BU=y
+BR2_PACKAGE_WIRELESS_CONFIGURATION=y
+
+# Debug
+# BR2_PACKAGE_HOST_GDB is not set
+# BR2_PACKAGE_GDB is not set
+
+# CCACHE
+BR2_CCACHE=y
+BR2_CCACHE_DIR="$(HOME)/.ccache"
+
+# External
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="arm-openipc-linux-gnueabihf"
+BR2_TOOLCHAIN_EXTERNAL_CXX=y
+BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_9=y
+# BR2_TOOLCHAIN_EXTERNAL_INET_RPC is not set
+BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/openipc/firmware/releases/download/$(OPENIPC_TOOLCHAIN).tgz"
diff --git a/general/package/majestic/majestic.mk b/general/package/majestic/majestic.mk
index b7f22dd4..848b4a0e 100644
--- a/general/package/majestic/majestic.mk
+++ b/general/package/majestic/majestic.mk
@@ -14,12 +14,14 @@ MAJESTIC_LICENSE_FILES = LICENSE
 MAJESTIC_FAMILY = $(OPENIPC_SOC_FAMILY)
 MAJESTIC_RELEASE = $(OPENIPC_FLAVOR)
 
+# we don't have Majestic ultimate for these platforms
 ifeq ($(MAJESTIC_RELEASE),ultimate)
-	# we don't have Majestic ultimate for these platforms
 	ifeq ($(MAJESTIC_FAMILY),hi3516av100)
 		MAJESTIC_RELEASE = lite
 	else ifeq ($(MAJESTIC_FAMILY),hi3519v101)
 		MAJESTIC_RELEASE = lite
+	else ifeq ($(MAJESTIC_FAMILY),infinity6e)
+		MAJESTIC_RELEASE = lite
 	endif
 endif
 
diff --git a/general/package/sigmastar-osdrv-infinity6b0/Config.in b/general/package/sigmastar-osdrv-infinity6b0/Config.in
index c550ea81..a924e332 100644
--- a/general/package/sigmastar-osdrv-infinity6b0/Config.in
+++ b/general/package/sigmastar-osdrv-infinity6b0/Config.in
@@ -1,4 +1,4 @@
 config BR2_PACKAGE_SIGMASTAR_OSDRV_INFINITY6B0
 	bool "sigmastar-osdrv-infinity6b0"
 	help
-	  sigmastar-osdrv-infinity6b0 - SigmaStar kernel modules and libs
+	  SigmaStar infinity6b0 kernel modules
diff --git a/general/package/sigmastar-osdrv-infinity6e/Config.in b/general/package/sigmastar-osdrv-infinity6e/Config.in
index 12261a54..b14e010f 100644
--- a/general/package/sigmastar-osdrv-infinity6e/Config.in
+++ b/general/package/sigmastar-osdrv-infinity6e/Config.in
@@ -1,4 +1,4 @@
 config BR2_PACKAGE_SIGMASTAR_OSDRV_INFINITY6E
 	bool "sigmastar-osdrv-infinity6e"
 	help
-	  sigmastar-osdrv-infinity6e - SigmaStar kernel modules and libs
+	  SigmaStar infinity6e kernel modules