diff --git a/package/ctcgfw/luci-app-vssr/Makefile b/package/ctcgfw/luci-app-vssr/Makefile
index 7f288a1869..84c59cf56c 100644
--- a/package/ctcgfw/luci-app-vssr/Makefile
+++ b/package/ctcgfw/luci-app-vssr/Makefile
@@ -24,7 +24,7 @@ LUCI_DEPENDS:= \
 	+PACKAGE_$(PKG_NAME)_INCLUDE_Trojan:ipt2socks \
 	+PACKAGE_$(PKG_NAME)_INCLUDE_V2ray:v2ray \
 	+PACKAGE_$(PKG_NAME)_INCLUDE_V2ray_plugin:v2ray-plugin \
-	+PACKAGE_$(PKG_NAME)_INCLUDE_Xray:xray
+	+PACKAGE_$(PKG_NAME)_INCLUDE_Xray:xray-core
 
 define Package/$(PKG_NAME)/config
 
diff --git a/package/lean/luci-app-ssr-plus/Makefile b/package/lean/luci-app-ssr-plus/Makefile
index f137f90032..cbce2a77dd 100644
--- a/package/lean/luci-app-ssr-plus/Makefile
+++ b/package/lean/luci-app-ssr-plus/Makefile
@@ -35,7 +35,7 @@ LUCI_DEPENDS:=+coreutils +coreutils-base64 +dns2socks +dnsmasq-full +ipset +ip-f
 	+PACKAGE_$(PKG_NAME)_INCLUDE_Trojan:ipt2socks \
 	+PACKAGE_$(PKG_NAME)_INCLUDE_V2ray:v2ray \
 	+PACKAGE_$(PKG_NAME)_INCLUDE_V2ray_Plugin:v2ray-plugin \
-	+PACKAGE_$(PKG_NAME)_INCLUDE_Xray:xray
+	+PACKAGE_$(PKG_NAME)_INCLUDE_Xray:xray-core
 
 define Package/$(PKG_NAME)/config
 config PACKAGE_$(PKG_NAME)_INCLUDE_Kcptun
diff --git a/package/lean/luci-app-v2ray-server/Makefile b/package/lean/luci-app-v2ray-server/Makefile
index 33c3077211..b85f8a6d2b 100644
--- a/package/lean/luci-app-v2ray-server/Makefile
+++ b/package/lean/luci-app-v2ray-server/Makefile
@@ -6,7 +6,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=LuCI support for V2ray Server
-LUCI_DEPENDS:=+xray
+LUCI_DEPENDS:=+xray-core
 LUCI_PKGARCH:=all
 PKG_VERSION:=1.1
 PKG_RELEASE:=5
diff --git a/package/lean/xray/Makefile b/package/lean/xray/Makefile
deleted file mode 100644
index ff7a2ea35e..0000000000
--- a/package/lean/xray/Makefile
+++ /dev/null
@@ -1,140 +0,0 @@
-#
-# Copyright (C) 2019-2020 Xingwang Liao
-# Copyright (C) 2020-2021 Mattraks
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=xray
-PKG_VERSION:=1.2.4
-PKG_RELEASE:=1
-PKG_BUILD_DIR:=$(BUILD_DIR)/Xray-core-$(PKG_VERSION)
-
-PKG_SOURCE:=xray-core-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://codeload.github.com/XTLS/xray-core/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=25f6c9edec0ac1f98328943cd2bb760ac7b69107582f9d27e43559da39dc01ed
-
-PKG_LICENSE:=MPL
-PKG_LICENSE_FILES:=LICENSE
-
-PKG_CONFIG_DEPENDS:= \
-	CONFIG_XRAY_EXCLUDE_ASSETS \
-	CONFIG_XRAY_COMPRESS_GOPROXY \
-	CONFIG_XRAY_COMPRESS_UPX \
-	CONFIG_XRAY_PROVIDE_V2RAY
-
-PKG_BUILD_DEPENDS:=golang/host
-PKG_BUILD_PARALLEL:=1
-PKG_USE_MIPS16:=0
-
-GO_PKG:=github.com/xtls/xray-core
-GO_PKG_LDFLAGS:=-s -w
-GO_PKG_LDFLAGS_X:= \
-	$(GO_PKG)/core.version=$(PKG_VERSION) \
-	$(GO_PKG)/core.codename=OpenWrt
-
-include $(INCLUDE_DIR)/package.mk
-include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk
-
-define Package/$(PKG_NAME)
-  TITLE:=A platform for building proxies
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Web Servers/Proxies
-  DEPENDS:=$(GO_ARCH_DEPENDS) +ca-certificates
-endef
-
-define Package/$(PKG_NAME)/description
-Project X originates from XTLS protocol, provides a set of network tools such as Xray-core and Xray-flutter.
-It secures your network connections and thus protects your privacy.
-
-  This package contains Xray, geoip.dat and geosite.dat.
-endef
-
-define Package/$(PKG_NAME)/config
-menu "Xray Configuration"
-	depends on PACKAGE_xray
-
-config XRAY_PROVIDE_V2RAY
-	bool "Provide V2RAY binary using XRAY"
-	default y
-
-config XRAY_COMPRESS_GOPROXY
-	bool "Compiling with GOPROXY proxy"
-	default n
-
-config XRAY_EXCLUDE_ASSETS
-	bool "Exclude geoip.dat & geosite.dat"
-	default y
-
-config XRAY_COMPRESS_UPX
-	bool "Compress executable files with UPX"
-	default y
-endmenu
-endef
-
-ifeq ($(CONFIG_XRAY_COMPRESS_GOPROXY),y)
-export GO111MODULE=on
-export GOPROXY=https://goproxy.io
-endif
-
-GEOIP_VER:=latest
-GEOIP_FILE:=geoip-$(GEOIP_VER).dat
-
-define Download/geoip.dat
-  URL:=https://github.com/v2fly/geoip/releases/$(GEOIP_VER)/download
-  URL_FILE:=geoip.dat
-  FILE:=$(GEOIP_FILE)
-  HASH:=skip
-endef
-
-GEOSITE_VER:=latest
-GEOSITE_FILE:=geosite-$(GEOSITE_VER).dat
-
-define Download/geosite.dat
-  URL:=https://github.com/v2fly/domain-list-community/releases/$(GEOSITE_VER)/download
-  URL_FILE:=dlc.dat
-  FILE:=$(GEOSITE_FILE)
-  HASH:=skip
-endef
-
-define Build/Prepare
-	$(call Build/Prepare/Default)
-ifneq ($(CONFIG_XRAY_EXCLUDE_ASSETS),y)
-	# move file to make sure download new file every build
-	mv -f $(DL_DIR)/$(GEOIP_FILE) $(PKG_BUILD_DIR)/release/config/geoip.dat
-	mv -f $(DL_DIR)/$(GEOSITE_FILE) $(PKG_BUILD_DIR)/release/config/geosite.dat
-endif
-endef
-
-define Build/Compile
-	$(eval GO_PKG_BUILD_PKG:=$(GO_PKG)/main)
-	$(call GoPackage/Build/Compile)
-	mv -f $(GO_PKG_BUILD_BIN_DIR)/main $(GO_PKG_BUILD_BIN_DIR)/xray
-ifeq ($(CONFIG_XRAY_COMPRESS_UPX),y)
-	$(STAGING_DIR_HOST)/bin/upx --lzma --best $(GO_PKG_BUILD_BIN_DIR)/xray || true
-endif
-endef
-
-define Package/$(PKG_NAME)/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/xray $(1)/usr/bin
-ifeq ($(CONFIG_XRAY_PROVIDE_V2RAY),y)
-	$(LN) xray $(1)/usr/bin/v2ray
-endif
-ifneq ($(CONFIG_XRAY_EXCLUDE_ASSETS),y)
-	$(INSTALL_DIR) $(1)/usr/share/xray
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/release/config/{geoip,geosite}.dat $(1)/usr/share/xray
-endif
-endef
-
-ifneq ($(CONFIG_XRAY_EXCLUDE_ASSETS),y)
-$(eval $(call Download,geoip.dat))
-$(eval $(call Download,geosite.dat))
-endif
-
-$(eval $(call GoBinPackage,$(PKG_NAME)))
-$(eval $(call BuildPackage,$(PKG_NAME)))
diff --git a/package/lienol/luci-app-passwall/Makefile b/package/lienol/luci-app-passwall/Makefile
index 6878bc3863..0445859de7 100644
--- a/package/lienol/luci-app-passwall/Makefile
+++ b/package/lienol/luci-app-passwall/Makefile
@@ -100,7 +100,7 @@ define Package/$(PKG_NAME)
   +PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR:shadowsocksr-libev-ssr-redir \
   +PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR:shadowsocksr-libev-ssr-local \
   +PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Server:shadowsocksr-libev-ssr-server \
-  +PACKAGE_$(PKG_NAME)_INCLUDE_Xray:xray \
+  +PACKAGE_$(PKG_NAME)_INCLUDE_Xray:xray-core \
   +PACKAGE_$(PKG_NAME)_INCLUDE_Trojan_Plus:trojan-plus \
   +PACKAGE_$(PKG_NAME)_INCLUDE_Trojan_GO:trojan-go \
   +PACKAGE_$(PKG_NAME)_INCLUDE_NaiveProxy:naiveproxy \