diff --git a/.github/workflows/gm8136_images.yml b/.github/workflows/gm8136_images.yml
index ed2ac39a..e41079e1 100644
--- a/.github/workflows/gm8136_images.yml
+++ b/.github/workflows/gm8136_images.yml
@@ -67,8 +67,7 @@ jobs:
           ARCHIVE_FW="${GITHUB_WORKSPACE}/output/images/openipc.${BOARD}-br.tgz"
           echo "ARCHIVE_FW=$ARCHIVE_FW" >> $GITHUB_ENV
           cd $GITHUB_WORKSPACE
-          # make PLATFORM=grainmedia BOARD=unknown_unknown_gm8136_openipc all
-          make PLATFORM=grainmedia BOARD=unknown_unknown_gm8136_uclibc all
+          make PLATFORM=grainmedia BOARD=unknown_unknown_gm8136_openipc all
           [[ $(stat --printf="%s" ${GITHUB_WORKSPACE}/output/images/uImage) -gt 2097152 ]] && echo "TG_NOTIFY=Warning, kernel size exceeded : $(stat --printf="%s" ${GITHUB_WORKSPACE}/output/images/uImage) vs 2097152... ${BOARD}" >> $GITHUB_ENV && exit 1
           [[ $(stat --printf="%s" ${GITHUB_WORKSPACE}/output/images/rootfs.squashfs) -gt 5242880 ]] && echo "TG_NOTIFY=Warning, rootfs size exceeded - $(stat --printf="%s" ${GITHUB_WORKSPACE}/output/images/rootfs.squashfs) vs 5242880... ${BOARD}" >> $GITHUB_ENV && exit 1
           cd ${GITHUB_WORKSPACE}/output/images
diff --git a/br-ext-chip-grainmedia/Config.in b/br-ext-chip-grainmedia/Config.in
index 1bcc8cda..58696a9c 100644
--- a/br-ext-chip-grainmedia/Config.in
+++ b/br-ext-chip-grainmedia/Config.in
@@ -15,8 +15,8 @@ source "$BR2_EXTERNAL_GRAINMEDIA_PATH/package/libogg-openipc/Config.in"
 source "$BR2_EXTERNAL_GRAINMEDIA_PATH/package/libsrt-openipc/Config.in"
 source "$BR2_EXTERNAL_GRAINMEDIA_PATH/package/libwebsockets-openipc/Config.in"
 source "$BR2_EXTERNAL_GRAINMEDIA_PATH/package/linux-firmware-openipc/Config.in"
-#source "$BR2_EXTERNAL_GRAINMEDIA_PATH/package/majestic-fonts/Config.in"
-#source "$BR2_EXTERNAL_GRAINMEDIA_PATH/package/majestic/Config.in"
+source "$BR2_EXTERNAL_GRAINMEDIA_PATH/package/majestic-fonts/Config.in"
+source "$BR2_EXTERNAL_GRAINMEDIA_PATH/package/majestic-gm8136/Config.in"
 source "$BR2_EXTERNAL_GRAINMEDIA_PATH/package/mbedtls-openipc/Config.in"
 source "$BR2_EXTERNAL_GRAINMEDIA_PATH/package/microbe-web/Config.in"
 source "$BR2_EXTERNAL_GRAINMEDIA_PATH/package/motors/Config.in"
diff --git a/br-ext-chip-grainmedia/configs/unknown_unknown_gm8135_openipc_defconfig b/br-ext-chip-grainmedia/configs/unknown_unknown_gm8135_openipc_defconfig
index 0f5013d4..5c3db386 100644
--- a/br-ext-chip-grainmedia/configs/unknown_unknown_gm8135_openipc_defconfig
+++ b/br-ext-chip-grainmedia/configs/unknown_unknown_gm8135_openipc_defconfig
@@ -8,12 +8,12 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_3=y
 # Toolchain
 BR2_PER_PACKAGE_DIRECTORIES=y
 BR2_GCC_VERSION_7_X=y
-# BR2_TOOLCHAIN_USES_UCLIBC is not set
-# BR2_TOOLCHAIN_BUILDROOT_UCLIBC is not set
-# BR2_TOOLCHAIN_BUILDROOT_LIBC="uclibc"
-BR2_TOOLCHAIN_USES_MUSL=y
-BR2_TOOLCHAIN_BUILDROOT_MUSL=y
-BR2_TOOLCHAIN_BUILDROOT_LIBC="musl"
+BR2_TOOLCHAIN_USES_UCLIBC=y
+BR2_TOOLCHAIN_BUILDROOT_UCLIBC=y
+BR2_TOOLCHAIN_BUILDROOT_LIBC="uclibc"
+# BR2_TOOLCHAIN_USES_MUSL is not set
+# BR2_TOOLCHAIN_BUILDROOT_MUSL is not set
+# BR2_TOOLCHAIN_BUILDROOT_LIBC="musl"
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
 BR2_TOOLCHAIN_BUILDROOT_USE_SSP=y
@@ -64,8 +64,8 @@ BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y
 BR2_PACKAGE_LIBOGG_OPENIPC=y
 BR2_PACKAGE_LIBWEBSOCKETS_OPENIPC=y
 BR2_PACKAGE_LIBYAML=y
-# BR2_PACKAGE_MAJESTIC_FONTS=y
-# BR2_PACKAGE_MAJESTIC_GM8136=y
+BR2_PACKAGE_MAJESTIC_FONTS=y
+BR2_PACKAGE_MAJESTIC_GM8136=y
 BR2_PACKAGE_MBEDTLS_OPENIPC=y
 # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set
 # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set
diff --git a/br-ext-chip-grainmedia/configs/unknown_unknown_gm8136_openipc_defconfig b/br-ext-chip-grainmedia/configs/unknown_unknown_gm8136_openipc_defconfig
index 7beccbe4..dfbc64f3 100644
--- a/br-ext-chip-grainmedia/configs/unknown_unknown_gm8136_openipc_defconfig
+++ b/br-ext-chip-grainmedia/configs/unknown_unknown_gm8136_openipc_defconfig
@@ -8,12 +8,12 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_3=y
 # Toolchain
 BR2_PER_PACKAGE_DIRECTORIES=y
 BR2_GCC_VERSION_7_X=y
-# BR2_TOOLCHAIN_USES_UCLIBC is not set
-# BR2_TOOLCHAIN_BUILDROOT_UCLIBC is not set
-# BR2_TOOLCHAIN_BUILDROOT_LIBC="uclibc"
-BR2_TOOLCHAIN_USES_MUSL=y
-BR2_TOOLCHAIN_BUILDROOT_MUSL=y
-BR2_TOOLCHAIN_BUILDROOT_LIBC="musl"
+BR2_TOOLCHAIN_USES_UCLIBC=y
+BR2_TOOLCHAIN_BUILDROOT_UCLIBC=y
+BR2_TOOLCHAIN_BUILDROOT_LIBC="uclibc"
+# BR2_TOOLCHAIN_USES_MUSL is not set
+# BR2_TOOLCHAIN_BUILDROOT_MUSL is not set
+# BR2_TOOLCHAIN_BUILDROOT_LIBC="musl"
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
 BR2_TOOLCHAIN_BUILDROOT_USE_SSP=y
@@ -64,8 +64,8 @@ BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y
 BR2_PACKAGE_LIBOGG_OPENIPC=y
 BR2_PACKAGE_LIBWEBSOCKETS_OPENIPC=y
 BR2_PACKAGE_LIBYAML=y
-# BR2_PACKAGE_MAJESTIC_FONTS=y
-# BR2_PACKAGE_MAJESTIC_GM8136=y
+BR2_PACKAGE_MAJESTIC_FONTS=y
+BR2_PACKAGE_MAJESTIC_GM8136=y
 BR2_PACKAGE_MBEDTLS_OPENIPC=y
 # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set
 # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set
diff --git a/br-ext-chip-grainmedia/configs/unknown_unknown_gm8136_uclibc_defconfig b/br-ext-chip-grainmedia/configs/unknown_unknown_gm8136_uclibc_defconfig
deleted file mode 100644
index 82a64d13..00000000
--- a/br-ext-chip-grainmedia/configs/unknown_unknown_gm8136_uclibc_defconfig
+++ /dev/null
@@ -1,95 +0,0 @@
-# Architecture
-BR2_arm=y
-BR2_arm926t=y
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.3"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_3=y
-
-# Toolchain
-BR2_PER_PACKAGE_DIRECTORIES=y
-BR2_GCC_VERSION_7_X=y
-BR2_TOOLCHAIN_USES_UCLIBC=y
-BR2_TOOLCHAIN_BUILDROOT_UCLIBC=y
-BR2_TOOLCHAIN_BUILDROOT_LIBC="uclibc"
-# BR2_TOOLCHAIN_USES_MUSL is not set
-# BR2_TOOLCHAIN_BUILDROOT_MUSL is not set
-# BR2_TOOLCHAIN_BUILDROOT_LIBC="musl"
-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_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3"
-BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_GRAINMEDIA_PATH)/board/gm8136/kernel/gm8136.generic.config"
-BR2_LINUX_KERNEL_UIMAGE=y
-BR2_LINUX_KERNEL_XZ=y
-BR2_LINUX_KERNEL_EXT_GRAINMEDIA_PATCHER=y
-BR2_LINUX_KERNEL_EXT_GRAINMEDIA_PATCHER_LIST="$(BR2_EXTERNAL_GRAINMEDIA_PATH)/board/gm8136/kernel/patches/ $(BR2_EXTERNAL_GRAINMEDIA_PATH)/board/gm8136/kernel/overlay"
-
-# 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_ROOTFS_OVERLAY="$(TOPDIR)/../general/overlay"
-BR2_ROOTFS_POST_BUILD_SCRIPT="$(TOPDIR)/../scripts/executing_commands_for_$(BR2_TOOLCHAIN_BUILDROOT_LIBC).sh"
-
-# OpenIPC configuration
-BR2_TOOLCHAIN_BUILDROOT_VENDOR="openipc"
-BR2_TARGET_GENERIC_ISSUE="Welcome to OpenIPC v2.2"
-BR2_TARGET_GENERIC_HOSTNAME="openipc-gm8136"
-BR2_GLOBAL_PATCH_DIR="$(TOPDIR)/../general/package/all-patches"
-
-# OpenIPC packages
-BR2_PACKAGE_BUSYBOX_CONFIG="$(TOPDIR)/../general/package/busybox/busybox.config"
-BR2_PACKAGE_DROPBEAR_OPENIPC=y
-# BR2_PACKAGE_FDK_AAC_OPENIPC is not set
-BR2_PACKAGE_FWPRINTENV_OPENIPC=y
-BR2_PACKAGE_HASERL=y
-BR2_PACKAGE_IPCTOOL=y
-BR2_PACKAGE_JSON_C=y
-BR2_PACKAGE_LAME_OPENIPC=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_LIBWEBSOCKETS_OPENIPC=y
-BR2_PACKAGE_LIBYAML=y
-# BR2_PACKAGE_MAJESTIC_FONTS=y
-# BR2_PACKAGE_MAJESTIC_GM8136=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=y
-BR2_PACKAGE_OPUS_OPENIPC=y
-BR2_PACKAGE_OPUS_OPENIPC_FIXED_POINT=y
-# BR2_PACKAGE_SSHPASS is not set
-BR2_PACKAGE_UACME_OPENIPC=y
-BR2_PACKAGE_VTUND_OPENIPC=y
-BR2_PACKAGE_GRAINMEDIA_OSDRV_GM8136=y
-BR2_PACKAGE_YAML_CLI=y
-
-# WiFi
-BR2_PACKAGE_WIRELESS_TOOLS=y
-BR2_PACKAGE_WPA_SUPPLICANT=y
-BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
-BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y
-BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
-# BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC is not set
-# BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_MT7601U is not set
-BR2_PACKAGE_RTL8188EU=y
-
-# WIREGUARD
-# BR2_PACKAGE_WIREGUARD_LINUX_COMPAT is not set
-# BR2_PACKAGE_WIREGUARD_TOOLS is not set
diff --git a/br-ext-chip-grainmedia/external.mk b/br-ext-chip-grainmedia/external.mk
index cf366872..8782dc8d 100644
--- a/br-ext-chip-grainmedia/external.mk
+++ b/br-ext-chip-grainmedia/external.mk
@@ -15,8 +15,8 @@ include $(BR2_EXTERNAL_GRAINMEDIA_PATH)/package/libogg-openipc/libogg-openipc.mk
 include $(BR2_EXTERNAL_GRAINMEDIA_PATH)/package/libsrt-openipc/libsrt-openipc.mk
 include $(BR2_EXTERNAL_GRAINMEDIA_PATH)/package/libwebsockets-openipc/libwebsockets-openipc.mk
 include $(BR2_EXTERNAL_GRAINMEDIA_PATH)/package/linux-firmware-openipc/linux-firmware-openipc.mk
-#include $(BR2_EXTERNAL_GRAINMEDIA_PATH)/package/majestic-fonts/majestic-fonts.mk
-#include $(BR2_EXTERNAL_GRAINMEDIA_PATH)/package/majestic/majestic.mk
+include $(BR2_EXTERNAL_GRAINMEDIA_PATH)/package/majestic-fonts/majestic-fonts.mk
+include $(BR2_EXTERNAL_GRAINMEDIA_PATH)/package/majestic/majestic-gm8136.mk
 include $(BR2_EXTERNAL_GRAINMEDIA_PATH)/package/mbedtls-openipc/mbedtls-openipc.mk
 include $(BR2_EXTERNAL_GRAINMEDIA_PATH)/package/microbe-web/microbe-web.mk
 include $(BR2_EXTERNAL_GRAINMEDIA_PATH)/package/motors/motors.mk
diff --git a/br-ext-chip-grainmedia/package/majestic-gm8136 b/br-ext-chip-grainmedia/package/majestic-gm8136
new file mode 120000
index 00000000..f5d7913b
--- /dev/null
+++ b/br-ext-chip-grainmedia/package/majestic-gm8136
@@ -0,0 +1 @@
+../../general/package/majestic-gm8136
\ No newline at end of file
diff --git a/general/package/majestic-gm8136/Config.in b/general/package/majestic-gm8136/Config.in
new file mode 100644
index 00000000..08a55ee6
--- /dev/null
+++ b/general/package/majestic-gm8136/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_MAJESTIC_GM8136
+	bool "Tiny but powerful IPC streaming software"
+	default n
+	help
+	  Tiny but powerful IPC streaming software
+
+	  https://openipc.org
diff --git a/general/package/majestic-gm8136/majestic-gm8136.mk b/general/package/majestic-gm8136/majestic-gm8136.mk
new file mode 100644
index 00000000..f5fe77c4
--- /dev/null
+++ b/general/package/majestic-gm8136/majestic-gm8136.mk
@@ -0,0 +1,22 @@
+################################################################################
+#
+# majestic-gm8136
+#
+################################################################################
+
+MAJESTIC_GM8136_VERSION = current
+MAJESTIC_GM8136_SOURCE = majestic.gm8136.lite.master.tar.bz2
+MAJESTIC_GM8136_SITE = https://openipc.s3-eu-west-1.amazonaws.com
+MAJESTIC_GM8136_LICENSE = MIT
+MAJESTIC_GM8136_LICENSE_FILES = LICENSE
+
+define MAJESTIC_GM8136_INSTALL_TARGET_CMDS
+	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc
+	$(INSTALL) -m 644 $(@D)/majestic-mini.yaml $(TARGET_DIR)/etc/majestic.yaml
+	$(INSTALL) -m 644 $(@D)/majestic.yaml $(TARGET_DIR)/etc/majestic.full
+
+	$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin
+	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/majestic
+endef
+
+$(eval $(generic-package))