diff --git a/.github/workflows/build-dev.yml b/.github/workflows/build-dev.yml
index 48b66be22..2583b7805 100644
--- a/.github/workflows/build-dev.yml
+++ b/.github/workflows/build-dev.yml
@@ -3,6 +3,7 @@ name: Build OpenWrt/uCentral images
 on:
   push:
     branches: [ uCentral-* ]
+    tags: [ v* ]
 
 jobs:
   build:
@@ -35,17 +36,24 @@ jobs:
           AWS_ACCESS_KEY_ID: ${{ secrets.UCENTRAL_S3_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.UCENTRAL_S3_ACCESS_KEY_SECRET }}
       run: |
-        BRANCH=$(git rev-parse --abbrev-ref HEAD)
         LOWERCASE_TARGET=`echo ${{ matrix.target }} | tr '[:upper:]' '[:lower:]'`
         HASH=$(git rev-parse --short HEAD)
-        BASENAME="$(date +%Y%m%d)-$LOWERCASE_TARGET-$BRANCH-$HASH"
+
+        if [[ ${GITHUB_REF} == "refs/heads/"* ]]
+        then
+          REF=$(echo ${GITHUB_REF#refs/heads/} | tr '/' '-')
+        else
+          REF=$(echo ${GITHUB_REF#refs/tags/} | tr '/' '-')
+        fi
+
+        BASENAME="$(date +%Y%m%d)-$LOWERCASE_TARGET-$REF-$HASH"
         TAR_NAME="$BASENAME.tar.gz"
         IMG_NAME="$BASENAME-upgrade.bin";
         JSON_NAME="$BASENAME.json";
 
         tar cfz "$TAR_NAME" -C openwrt/bin/targets/ .
         curl -u $GH_BUILD_USERNAME:$GH_BUILD_PASSWORD -T "$TAR_NAME" "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/uCentral/$LOWERCASE_TARGET/"$TAR_NAME""
-        IMG_NAME="$(date +%Y%m%d)-$LOWERCASE_TARGET-$BRANCH-$HASH-upgrade.bin";
+        IMG_NAME="$BASENAME-upgrade.bin";
         TIP_VERSION="$(grep DISTRIB_TIP= openwrt/tmp/openwrt_release | cut -d\' -f2)"
         echo -e "{\n\t\"image\":\""${IMG_NAME}"\",\n\t\"revision\": \""${TIP_VERSION}"\",\n\t\"timestamp\":\""$(date +%s)"\",\n\t\"compatible\": \""${LOWERCASE_TARGET}"\"\n}" > latest-upgrade.json
         [ -f openwrt/tmp/image-file ] && curl -u $GH_BUILD_USERNAME:$GH_BUILD_PASSWORD -T "openwrt/$(cat openwrt/tmp/image-file)" "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/uCentral/$LOWERCASE_TARGET/"$IMG_NAME""