diff --git a/.github/workflows/vyos-build.yaml b/.github/workflows/vyos-build.yaml
index dc7b287e..a3cc2cd4 100644
--- a/.github/workflows/vyos-build.yaml
+++ b/.github/workflows/vyos-build.yaml
@@ -79,8 +79,8 @@ jobs:
         uses: ncipollo/release-action@v1
         with:
           token: "${{ steps.oauth-token.outputs.token }}"
-          tag: "vyos-v${{ env.VYOS_VERSION }}+${{ env.VYOS_BUILDER }}-${{ env.VYOS_BUILD_TIME }}-${{ env.VYOS_ARCH }}-iso"
-          artifacts: "./vyos-build/build/vyos-${{ env.VYOS_VERSION }}+${{ env.VYOS_BUILDER }}-${{ env.VYOS_BUILD_TIME }}-${{ env.VYOS_ARCH }}.iso"
+          tag: "vyos-v${{ env.VYOS_VERSION }}-${{ env.VYOS_BUILDER }}-${{ env.VYOS_BUILD_TIME }}-${{ env.VYOS_ARCH }}-iso"
+          artifacts: "./vyos-build/build/vyos-${{ env.VYOS_VERSION }}-${{ env.VYOS_BUILDER }}-${{ env.VYOS_BUILD_TIME }}-${{ env.VYOS_ARCH }}.iso"
           artifactErrorsFailBuild: true
           prerelease: true
           body: |
@@ -108,7 +108,7 @@ jobs:
         env:
           GITHUB_TOKEN: "${{ steps.oauth-token.outputs.token }}"
         with:
-          tag_name: "vyos-v${{ env.VYOS_VERSION }}+${{ env.VYOS_BUILDER }}-${{ env.VYOS_BUILD_TIME }}-${{ env.VYOS_ARCH }}-iso"
+          tag_name: "vyos-v${{ env.VYOS_VERSION }}-${{ env.VYOS_BUILDER }}-${{ env.VYOS_BUILD_TIME }}-${{ env.VYOS_ARCH }}-iso"
           delete_release: true
 
       - name: Prune old releases
diff --git a/vyos/build.sh b/vyos/build.sh
index 065d59cd..fd88a0ed 100755
--- a/vyos/build.sh
+++ b/vyos/build.sh
@@ -53,7 +53,7 @@ ls -AlhR ./packages # debug
     --build-by "${VYOS_BUILDER:=custom}" \
     --build-type "${VYOS_BUILD_TYPE:=release}" \
     --build-comment "Biohazardous VyOS" \
-    --version "${VYOS_VERSION}+${VYOS_BUILDER:=custom}-${VYOS_BUILD_TIME}" \
+    --version "${VYOS_VERSION}-${VYOS_BUILDER:=custom}-${VYOS_BUILD_TIME}" \
     --custom-package "iptables" \
     --custom-package "jo" \
     --custom-package "moreutils" \