diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a143cb2..b7ac080 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -80,23 +80,23 @@ jobs:
 
     - name: Build only (on commits)
       uses: docker/build-push-action@v4
-      if: ${{ ! startsWith(github.ref, 'refs/tags/') }}
+      if: ${{ github.ref_type != 'tag' }}
       with:
         push: false
         tags: kovetskiy/mark:latest
 
     - name: Login to Docker Hub
       uses: docker/login-action@v2
-      if: ${{ startsWith(github.ref, 'refs/tags/') }}
+      if: ${{ github.ref_type == 'tag' }}
       with:
         username: ${{ secrets.DOCKERHUB_USERNAME }}
         password: ${{ secrets.DOCKERHUB_PASSWORD }}
 
     - name: Build and push (on tag)
       uses: docker/build-push-action@v4
-      if: ${{ startsWith(github.ref, 'refs/tags/') }}
+      if: ${{ github.ref_type == 'tag' }}
       with:
         push: true
         tags: |
-           kovetskiy/mark:${{ steps.extract_tag.outputs.tag }}
+           kovetskiy/mark:${{ github.ref_name }}
            kovetskiy/mark:latest
diff --git a/.github/workflows/goreleaser.yml b/.github/workflows/goreleaser.yml
index 8146a64..58b28c5 100644
--- a/.github/workflows/goreleaser.yml
+++ b/.github/workflows/goreleaser.yml
@@ -14,7 +14,7 @@ jobs:
       with:
         fetch-depth: 0
     - name: Set Up Go
-      uses: actions/setup-go@v3
+      uses: actions/setup-go@v4
       with:
         go-version: 1.20
     - name: Run GoReleaser