diff --git a/feeds.conf.default b/feeds.conf.default
index ff2622f79a..9eece6fea2 100644
--- a/feeds.conf.default
+++ b/feeds.conf.default
@@ -1,4 +1,4 @@
-src-git-full packages https://github.com/immortalwrt/packages.git^97cadc2b6301460aae91c9b744631e27c0f454c6
-src-git-full luci https://github.com/immortalwrt/luci.git^dc88c6813733262e0a31a6aad917fbcdeac06c23
-src-git-full routing https://github.com/openwrt/routing.git^25e76489c83cfcee61e36a491896e1e9bfc3ec13
-src-git-full telephony https://github.com/openwrt/telephony.git^89cc8fccf757614eac1d45a684f4971393e0d984
+src-git-full packages https://github.com/immortalwrt/packages.git;openwrt-21.02
+src-git-full luci https://github.com/immortalwrt/luci.git;openwrt-21.02
+src-git-full routing https://github.com/openwrt/routing.git;openwrt-21.02
+src-git-full telephony https://github.com/openwrt/telephony.git;openwrt-21.02
diff --git a/include/version.mk b/include/version.mk
index 83c334825d..187a7322ec 100644
--- a/include/version.mk
+++ b/include/version.mk
@@ -23,13 +23,13 @@ PKG_CONFIG_DEPENDS += \
 sanitize = $(call tolower,$(subst _,-,$(subst $(space),-,$(1))))
 
 VERSION_NUMBER:=$(call qstrip,$(CONFIG_VERSION_NUMBER))
-VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),21.02.2)
+VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),21.02-SNAPSHOT)
 
 VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE))
-VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r19616-49aba5fcac)
+VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION))
 
 VERSION_REPO:=$(call qstrip,$(CONFIG_VERSION_REPO))
-VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),https://downloads.openwrt.org/releases/21.02.2)
+VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),https://downloads.immortalwrt.org/releases/21.02-SNAPSHOT)
 
 VERSION_DIST:=$(call qstrip,$(CONFIG_VERSION_DIST))
 VERSION_DIST:=$(if $(VERSION_DIST),$(VERSION_DIST),ImmortalWrt)
diff --git a/package/base-files/image-config.in b/package/base-files/image-config.in
index acf0475b3d..9e1e3ca805 100644
--- a/package/base-files/image-config.in
+++ b/package/base-files/image-config.in
@@ -259,7 +259,7 @@ if VERSIONOPT
 	config VERSION_CODE_FILENAMES
 		bool
 		prompt "Revision code in filenames"
-		default n
+		default y
 		help
 			Enable this to include the revision identifier or the configured
 			version code into the firmware image, SDK- and Image Builder archive
diff --git a/package/emortal/default-settings/Makefile b/package/emortal/default-settings/Makefile
index 1fdde08503..6a0de7d03c 100644
--- a/package/emortal/default-settings/Makefile
+++ b/package/emortal/default-settings/Makefile
@@ -36,8 +36,8 @@ define Build/Compile
 endef
 
 define Package/default-settings/install
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_DATA) ./files/openwrt_banner $(1)/etc/openwrt_banner
+	# $(INSTALL_DIR) $(1)/etc
+	# $(INSTALL_DATA) ./files/openwrt_banner $(1)/etc/openwrt_banner
 
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_BIN) ./files/99-default-settings $(1)/etc/uci-defaults/
diff --git a/package/emortal/default-settings/files/openwrt_banner b/package/emortal/default-settings/files/openwrt_banner
index 6cf7f693b0..3f58fe67d9 100644
--- a/package/emortal/default-settings/files/openwrt_banner
+++ b/package/emortal/default-settings/files/openwrt_banner
@@ -7,5 +7,5 @@
 │ mm#mm # # # # # # "#m#" #     "mm "mm"# "mm │
 │                                             │
 │─────────────────────────────────────────────│
-│             ImmortalWrt 21.02.2             │
+│              ImmortalWrt 21.02              │
 └─────────────────────────────────────────────┘
diff --git a/version b/version
deleted file mode 100644
index 9616f03c93..0000000000
--- a/version
+++ /dev/null
@@ -1 +0,0 @@
-r19616-49aba5fcac
diff --git a/version.date b/version.date
deleted file mode 100644
index 3e1bbdd855..0000000000
--- a/version.date
+++ /dev/null
@@ -1 +0,0 @@
-1665895881