diff --git a/Makefile b/Makefile
index 3a5cc6a..e34ea3c 100644
--- a/Makefile
+++ b/Makefile
@@ -2,13 +2,15 @@ OPENWRT_DEVICE ?= 192.168.1.1
 BACKUP_DATE ?=
 
 GIT_VERSION := $(shell git describe --always)
+DATE_VERSION := $(shell date +%Y.%m.%d)
+FULL_VERSION := v$(DATE_VERSION)-$(GIT_VERSION)
 
 OPENWRT_VERSION ?= 22.03.2
 OPENWRT_TARGET ?= mvebu/cortexa9
 OPENWRT_TARGET_DASHED ?= $(shell echo $(OPENWRT_TARGET) | sed 's|/|-|')
 OPENWRT_PROFILE ?= linksys_wrt1200ac
 OPENWRT_PACKAGES ?= $(shell cat packages.txt)
-EXTRA_IMAGE_NAME ?= emissary-$(GIT_VERSION)
+EXTRA_IMAGE_NAME ?= emissary-$(FULL_VERSION)
 BIN_DIR_NAME_SUFFIX ?= 
 
 IMAGEBUILDER_URL ?= https://downloads.openwrt.org/releases/$(OPENWRT_VERSION)/targets/$(OPENWRT_TARGET)/openwrt-imagebuilder-$(OPENWRT_VERSION)-$(OPENWRT_TARGET_DASHED).Linux-x86_64.tar.xz
@@ -103,8 +105,8 @@ gitea-release: tools/gitea-release/bin/gitea-release.sh
 	GITEA_RELEASE_PROJECT="emissary-firmware" \
 		GITEA_RELEASE_ORG="arcad" \
 		GITEA_RELEASE_BASE_URL="https://forge.cadoles.com" \
-		GITEA_RELEASE_VERSION="$(GIT_VERSION)" \
-		GITEA_RELEASE_NAME="$(GIT_VERSION)" \
+		GITEA_RELEASE_VERSION="$(FULL_VERSION)" \
+		GITEA_RELEASE_NAME="$(FULL_VERSION)" \
 		GITEA_RELEASE_COMMITISH_TARGET="$(GIT_VERSION)" \
 		GITEA_RELEASE_IS_DRAFT="false" \
 		GITEA_RELEASE_BODY="" \