diff --git a/projects/t31_ultimate_gateway/br-ext-chip-ingenic/Config.in b/projects/t31_lite_gateway/br-ext-chip-ingenic/Config.in
similarity index 100%
rename from projects/t31_ultimate_gateway/br-ext-chip-ingenic/Config.in
rename to projects/t31_lite_gateway/br-ext-chip-ingenic/Config.in
diff --git a/projects/t31_ultimate_gateway/br-ext-chip-ingenic/board/t31/kernel/Readme.md b/projects/t31_lite_gateway/br-ext-chip-ingenic/board/t31/kernel/Readme.md
similarity index 100%
rename from projects/t31_ultimate_gateway/br-ext-chip-ingenic/board/t31/kernel/Readme.md
rename to projects/t31_lite_gateway/br-ext-chip-ingenic/board/t31/kernel/Readme.md
diff --git a/projects/t31_ultimate_gateway/br-ext-chip-ingenic/board/t31/kernel/t31.generic.nat-nowifi-nof2fs.config b/projects/t31_lite_gateway/br-ext-chip-ingenic/board/t31/kernel/t31.generic.nat-nowifi-nof2fs.config
similarity index 100%
rename from projects/t31_ultimate_gateway/br-ext-chip-ingenic/board/t31/kernel/t31.generic.nat-nowifi-nof2fs.config
rename to projects/t31_lite_gateway/br-ext-chip-ingenic/board/t31/kernel/t31.generic.nat-nowifi-nof2fs.config
diff --git a/projects/t31_ultimate_gateway/br-ext-chip-ingenic/board/t31/kernel/t31.generic.nat.config b/projects/t31_lite_gateway/br-ext-chip-ingenic/board/t31/kernel/t31.generic.nat.config
similarity index 100%
rename from projects/t31_ultimate_gateway/br-ext-chip-ingenic/board/t31/kernel/t31.generic.nat.config
rename to projects/t31_lite_gateway/br-ext-chip-ingenic/board/t31/kernel/t31.generic.nat.config
diff --git a/projects/t31_ultimate_gateway/br-ext-chip-ingenic/configs/t31_ultimate_gateway_defconfig b/projects/t31_lite_gateway/br-ext-chip-ingenic/configs/t31_lite_gateway_defconfig
similarity index 100%
rename from projects/t31_ultimate_gateway/br-ext-chip-ingenic/configs/t31_ultimate_gateway_defconfig
rename to projects/t31_lite_gateway/br-ext-chip-ingenic/configs/t31_lite_gateway_defconfig
diff --git a/projects/t31_ultimate_gateway/br-ext-chip-ingenic/package/dbell-ina219 b/projects/t31_lite_gateway/br-ext-chip-ingenic/package/dbell-ina219
similarity index 100%
rename from projects/t31_ultimate_gateway/br-ext-chip-ingenic/package/dbell-ina219
rename to projects/t31_lite_gateway/br-ext-chip-ingenic/package/dbell-ina219
diff --git a/projects/t31_ultimate_gateway/br-ext-chip-ingenic/package/demo-openipc b/projects/t31_lite_gateway/br-ext-chip-ingenic/package/demo-openipc
similarity index 100%
rename from projects/t31_ultimate_gateway/br-ext-chip-ingenic/package/demo-openipc
rename to projects/t31_lite_gateway/br-ext-chip-ingenic/package/demo-openipc
diff --git a/projects/t31_ultimate_gateway/br-ext-chip-ingenic/package/i2c-gpio-custom b/projects/t31_lite_gateway/br-ext-chip-ingenic/package/i2c-gpio-custom
similarity index 100%
rename from projects/t31_ultimate_gateway/br-ext-chip-ingenic/package/i2c-gpio-custom
rename to projects/t31_lite_gateway/br-ext-chip-ingenic/package/i2c-gpio-custom
diff --git a/projects/t31_ultimate_gateway/general/overlay/etc/composer.ini b/projects/t31_lite_gateway/general/overlay/etc/composer.ini
similarity index 100%
rename from projects/t31_ultimate_gateway/general/overlay/etc/composer.ini
rename to projects/t31_lite_gateway/general/overlay/etc/composer.ini
diff --git a/projects/t31_ultimate_gateway/general/overlay/etc/init.d/S98iptables b/projects/t31_lite_gateway/general/overlay/etc/init.d/S98iptables
similarity index 85%
rename from projects/t31_ultimate_gateway/general/overlay/etc/init.d/S98iptables
rename to projects/t31_lite_gateway/general/overlay/etc/init.d/S98iptables
index c28abb3..d0cfb5c 100755
--- a/projects/t31_ultimate_gateway/general/overlay/etc/init.d/S98iptables
+++ b/projects/t31_lite_gateway/general/overlay/etc/init.d/S98iptables
@@ -2,9 +2,10 @@
 
 
 # General masquerade
-iptables -A POSTROUTING -t nat -j MASQUERADE
+iptables -A POSTROUTING -t nat -s 172.19.32.0/24 -d 192.168.192.0/24 -j MASQUERADE
+iptables -A POSTROUTING -t nat -d 172.19.32.0/24 -s 192.168.192.0/24 -j MASQUERADE
 #
-# Gemeral postrouting
+# General postrouting
 iptables -A POSTROUTING -t nat -j SNAT -p TCP -o eth0 -d 172.19.32.0/24 --to-source 172.19.32.200
 #
 # Host 1 - 172.19.32.178
diff --git a/projects/t31_ultimate_gateway/general/overlay/etc/sysctl.conf b/projects/t31_lite_gateway/general/overlay/etc/sysctl.conf
similarity index 100%
rename from projects/t31_ultimate_gateway/general/overlay/etc/sysctl.conf
rename to projects/t31_lite_gateway/general/overlay/etc/sysctl.conf
diff --git a/projects/t31_ultimate_gateway/building.sh b/projects/t31_ultimate_gateway/building.sh
deleted file mode 100755
index f7a3bc7..0000000
--- a/projects/t31_ultimate_gateway/building.sh
+++ /dev/null
@@ -1,271 +0,0 @@
-#!/bin/bash
-#
-# OpenIPC.org (c)
-#
-
-#
-# Constants
-#
-
-MAX_KERNEL_SIZE=0x200000              #    2MiB,  2097152
-MAX_KERNEL_SIZE_ULTIMATE=0x300000     #    3MiB,  3145728
-MAX_KERNEL_SIZE_EXPERIMENTAL=0x3E8480 # ~3.9MiB,  4097152
-MAX_ROOTFS_SIZE=0x500000              #    5MiB,  5242880
-MAX_ROOTFS_SIZE_ULTIMATE=0xA00000     #   10MiB, 10485760
-
-_d=$(date +"%y.%m.%d")
-OPENIPC_VER=$(echo OpenIPC v${_d:0:1}.${_d:1})
-unset _d
-
-SRC_CACHE_DIR="/tmp/buildroot_dl"
-LOCK_FILE="$(pwd)/openipc.lock"
-
-#
-# Functions
-#
-
-echo_c() {
-  # 30 grey, 31 red, 32 green, 33 yellow, 34 blue, 35 magenta, 36 cyan,37 white
-  echo -e "\e[1;$1m$2\e[0m"
-}
-
-check_or_set_lock() {
-  if [ -f "$LOCK_FILE" ] && ps -ax | grep "^\s*\b$(cat "$LOCK_FILE")\b" >/dev/null; then
-    echo_c 31 "Another instance running with PID $(cat "$LOCK_FILE")."
-    exit 1
-  fi
-
-  echo_c 32 "Starting OpenIPC builder."
-  echo $$ >$LOCK_FILE
-}
-
-build_list_of_projects() {
-  FUNCS=()
-  AVAILABLE_PROJECTS=$(find br-ext-chip-*/configs/* -name "*_defconfig")
-  local p
-  for p in $AVAILABLE_PROJECTS; do
-    p=${p##*/}; p=${p//_defconfig/}
-    FUNCS+=($p)
-  done
-}
-
-select_project() {
-  if [ $# -eq 0 ]; then
-    if [ -n "$(command -v fzf)" ]; then
-      local entries=$(echo $AVAILABLE_PROJECTS | sed "s/ /\n/g" | fzf)
-      [ -z "$entries" ] && echo_c 31 "Cancelled." && drop_lock_and_exit
-      BOARD=$(echo $entries | cut -d / -f 3 | awk -F_ '{printf "%s_%s", $1, $2}')
-    elif [ -n "$(command -v whiptail)" ]; then
-      local cmd="whiptail --title \"Available projects\" --menu \"Please select a project from the list:\" --notags 20 76 12"
-      local entry
-      for entry in $AVAILABLE_PROJECTS; do
-        local project=${entry##*/}; project=${project//_defconfig/}
-        local vendor=${entry%%/*}; vendor=${vendor##*-}
-        local flavor=${project##*_}
-        local chip=${project%%_*}
-        cmd="${cmd} \"${project}\" \"${vendor^} ${chip^^} ${flavor}\""
-      done
-      BOARD=$(eval "${cmd} 3>&1 1>&2 2>&3")
-      [ $? != 0 ] && echo_c 31 "Cancelled." && drop_lock_and_exit
-    else
-      echo -ne "Usage: $0 <variant>\nVariants:"
-      local i
-      for i in "${FUNCS[@]}"; do echo -n " ${i}"; done
-      echo
-      drop_lock_and_exit
-    fi
-  else
-    BOARD=$1
-  fi
-}
-
-drop_lock_and_exit() {
-  [ -f "$LOCK_FILE" ] && rm $LOCK_FILE
-  exit 0
-}
-
-log_and_run() {
-  local command=$1
-  echo_c 35 "$command"
-  $command
-}
-
-clone() {
-  sudo apt-get update -y
-  sudo apt-get install -y automake make wget cpio file autotools-dev bc build-essential curl fzf git libtool rsync unzip
-  git clone --depth=1 https://github.com/OpenIPC/firmware.git
-}
-
-fresh() {
-  BR_VER=$1
-
-  if [ -d "$SRC_CACHE_DIR" ]; then
-    echo_c 36 "Found cache directory."
-  else
-    echo_c 31 "Cache directory not found."
-    echo_c 34 "Creating cache directory ..."
-    log_and_run "mkdir -p ${SRC_CACHE_DIR}"
-    echo_c 34 "Done.\n"
-  fi
-
-  if [ -d "buildroot-${BR_VER}" ]; then
-    echo_c 36 "Found existing Buildroot directory."
-
-    if [ -d "buildroot-${BR_VER}/dl" ]; then
-      echo_c 36 "Found existing Buildroot downloads directory."
-      echo_c 34 "Copying Buildroot downloads to cache directory ..."
-      log_and_run "cp -rvf buildroot-${BR_VER}/dl/* ${SRC_CACHE_DIR}"
-      echo_c 34 "Done.\n"
-    fi
-
-    echo_c 34 "Cleaning source directory."
-    echo_c 35 "make distclean"
-    make distclean
-    echo_c 34 "Done.\n"
-  else
-    echo_c 31 "Buildroot sources not found."
-  fi
-
-  echo_c 34 "Downloading Buildroot sources to cache directory ..."
-  log_and_run "curl --continue-at - --output ${SRC_CACHE_DIR}/buildroot-${BR_VER}.tar.gz https://buildroot.org/downloads/buildroot-${BR_VER}.tar.gz"
-  echo_c 34 "Done.\n"
-
-  echo_c 34 "Extracting a fresh copy of Buildroot from Buildroot sources ..."
-  log_and_run "tar xvf ${SRC_CACHE_DIR}/buildroot-${BR_VER}.tar.gz"
-  echo_c 34 "Done.\n"
-
-  echo_c 34 "Copying cached source files back to Buildroot ..."
-  log_and_run "mkdir -p buildroot-${BR_VER}/dl/"
-  log_and_run "cp -rvf ${SRC_CACHE_DIR}/* buildroot-${BR_VER}/dl/"
-  echo_c 34 "Done.\n"
-
-  # prevent to double download buildroot
-  # make prepare
-
-  echo_c 33 "Start building OpenIPC Firmware ${OPENIPC_VER} for ${SOC}."
-  echo "The start-stop times" >/tmp/openipc_buildtime.txt
-  date >>/tmp/openipc_buildtime.txt
-}
-
-should_fit() {
-  local filename=$1
-  local maxsize=$2
-  local filesize=$(stat --printf="%s" ./output/images/$filename)
-  if [[ $filesize -gt $maxsize ]]; then
-    export TG_NOTIFY="Warning: $filename is too large: $filesize vs $maxsize"
-    echo_c 31 "Warning: $filename is too large: $filesize vs $maxsize"
-    exit 1
-  fi
-}
-
-rename() {
-  if grep -q ultimate_defconfig ./output/.config || grep -q fpv_defconfig ./output/.config || grep -q ultimate_gateway_defconfig ./output/.config; then
-    should_fit uImage $MAX_KERNEL_SIZE_ULTIMATE
-    should_fit rootfs.squashfs $MAX_ROOTFS_SIZE_ULTIMATE
-  else
-    should_fit uImage $MAX_KERNEL_SIZE
-    should_fit rootfs.squashfs $MAX_ROOTFS_SIZE
-  fi
-  mv -v ./output/images/uImage ./output/images/uImage.${SOC}
-  mv -v ./output/images/rootfs.squashfs ./output/images/rootfs.squashfs.${SOC}
-  mv -v ./output/images/rootfs.cpio ./output/images/rootfs.${SOC}.cpio
-  mv -v ./output/images/rootfs.tar ./output/images/rootfs.${SOC}.tar
-  date >>/tmp/openipc_buildtime.txt
-  echo_c 31 "\n\n$(cat /tmp/openipc_buildtime.txt)\n\n"
-}
-
-rename_initramfs() {
-  should_fit uImage $MAX_KERNEL_SIZE_EXPERIMENTAL
-  mv -v ./output/images/uImage ./output/images/uImage.initramfs.${SOC}
-  mv -v ./output/images/rootfs.cpio ./output/images/rootfs.${SOC}.cpio
-  mv -v ./output/images/rootfs.tar ./output/images/rootfs.${SOC}.tar
-  date >>/tmp/openipc_buildtime.txt
-  echo_c 31 "\n\n$(cat /tmp/openipc_buildtime.txt)\n\n"
-}
-
-autoup_rootfs() {
-  echo_c 34 "\nDownloading u-boot created by OpenIPC"
-  curl --location --output ./output/images/u-boot-${SOC}-universal.bin \
-    https://github.com/OpenIPC/firmware/releases/download/latest/u-boot-${SOC}-universal.bin
-
-  echo_c 34 "\nMaking autoupdate u-boot image"
-  ./output/host/bin/mkimage -A arm -O linux -T firmware -n "$OPENIPC_VER" \
-    -a 0x0 -e 0x50000 -d ./output/images/u-boot-${SOC}-universal.bin \
-    ./output/images/autoupdate-uboot.img
-
-  echo_c 34 "\nMaking autoupdate kernel image"
-  ./output/host/bin/mkimage -A arm -O linux -T kernel -C none -n "$OPENIPC_VER" \
-    -a 0x50000 -e 0x250000 -d ./output/images/uImage.${SOC} \
-    ./output/images/autoupdate-kernel.img
-
-  echo_c 34 "\nMaking autoupdate rootfs image"
-  ./output/host/bin/mkimage -A arm -O linux -T filesystem -n "$OPENIPC_VER" \
-    -a 0x250000 -e 0x750000 -d ./output/images/rootfs.squashfs.${SOC} \
-    ./output/images/autoupdate-rootfs.img
-}
-
-copy_function() {
-  test -n "$(declare -f "$1")" || return
-  eval "${_/$1/$2}"
-}
-
-uni_build() {
-  [ -z "$BOARD" ] && BOARD=$FUNCNAME
-
-  SOC=$(echo $BOARD | cut -d '_' -f 1)
-
-  set -e
-  if [ "$(echo $BOARD | cut -sd '_' -f 2)" == "" ]; then
-    BOARD="${BOARD}_lite"
-  fi
-
-  if [ "$BOARD" == "hi3518ev200_lite" ]; then
-    NEED_AUTOUP=1
-  fi
-
-  echo_c 33 "\n  SoC: $SOC\nBoard: $BOARD\n"
-
-  if [ "all" = "${COMMAND}" ]; then
-    fresh $(make BOARD=${BOARD} buildroot-version)
-  fi
-
-  log_and_run "make BOARD=${BOARD} ${COMMAND}"
-
-  if [ "all" == "${COMMAND}" ]; then
-    if [ "ssc335_initramfs" == "$BOARD" ]; then
-      rename_initramfs
-    else
-      rename
-    fi
-
-    if [ ! -z "$NEED_AUTOUP" ]; then
-      autoup_rootfs
-    fi
-  fi
-}
-
-#######
-
-check_or_set_lock
-
-build_list_of_projects
-
-if [ -n "$1" ]; then
-  BOARD=$1
-else
-  select_project
-fi
-
-[ -z "$BOARD" ] && echo_c 31 "Nothing selected." && drop_lock_and_exit
-
-COMMAND=$2
-[ -z "$COMMAND" ] && COMMAND=all
-
-for i in "${FUNCS[@]}"; do
-  copy_function uni_build $i
-done
-
-echo_c 37 "Building OpenIPC for ${BOARD}"
-uni_build $BOARD $COMMAND
-
-drop_lock_and_exit
diff --git a/projects/t31_ultimate_gateway/building.sh_patch b/projects/t31_ultimate_gateway/building.sh_patch
deleted file mode 100644
index b23c165..0000000
--- a/projects/t31_ultimate_gateway/building.sh_patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/building.sh	2023-02-02 15:32:57.318398151 +0300
-+++ b/building.sh	2023-02-02 17:04:45.877941273 +0300
-@@ -159,7 +159,7 @@
- }
- 
- rename() {
--  if grep -q ultimate_defconfig ./output/.config || grep -q fpv_defconfig ./output/.config; then
-+  if grep -q ultimate_defconfig ./output/.config || grep -q fpv_defconfig ./output/.config || grep -q ultimate_gateway_defconfig ./output/.config; then
-     should_fit uImage $MAX_KERNEL_SIZE_ULTIMATE
-     should_fit rootfs.squashfs $MAX_ROOTFS_SIZE_ULTIMATE
-   else