diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3280af3a..9662b00c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -60,7 +60,7 @@ jobs:
           ./fq-connector-go-tests -projectPath=$(pwd)
       - name: Build binary package
         run: |
-          tar czf fq-connector-go-${{ github.event.inputs.tag }}-$GOOS-$GOARCH.tar.gz fq-connector-go
+          tar czf fq-connector-go-${{ github.event.inputs.tag }}-${{ env.GOOS }}-${{ env.GOARCH }}.tar.gz fq-connector-go
       - name: Build and push Docker image
         run: |
           docker login --username vitalyisaev2 --password ${{ secrets.GHCR_TOKEN }} ghcr.io
@@ -72,4 +72,5 @@ jobs:
         uses: softprops/action-gh-release@v1
         with:
           files: |
-            fq-connector-go-${{ github.event.inputs.tag }}-$GOOS-$GOARCH.tar.gz
+            fq-connector-go-${{ github.event.inputs.tag }}-${{ env.GOOS }}-${{ env.GOARCH }}.tar.gz
+          tag_name: ${{ github.event.inputs.tag }}