diff --git a/.github/workflows/test_on_push.yaml b/.github/workflows/test_on_push.yaml
index bfb71342..cb6d1f4d 100644
--- a/.github/workflows/test_on_push.yaml
+++ b/.github/workflows/test_on_push.yaml
@@ -52,19 +52,22 @@ jobs:
     runs-on: [ ubuntu-latest ]
     steps:
       - uses: actions/checkout@master
+      # https://stackoverflow.com/questions/58177786/get-the-current-pushed-tag-in-github-actions
+      - name: Set env
+        run: echo "GIT_TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
       - name: Push scm rockspec
         if: github.event_name == 'push' && github.ref == 'refs/heads/master'
         run: |
           curl --fail -X PUT -F rockspec=@$ROCK_NAME-scm-1.rockspec \
             https://${{ secrets.ROCKS_USERNAME }}:${{ secrets.ROCKS_PASSWORD }}@${{ secrets.ROCKS_SERVER }}
       - name: Push release rockspec
-        if: github.event_name == 'push' && github.ref == 'refs/tags/'
+        if: startsWith(github.ref, 'refs/tags')
         run: |
           curl --fail -X PUT -F rockspec=@$ROCK_NAME-scm-1.rockspec \
             https://${{ secrets.ROCKS_USERNAME }}:${{ secrets.ROCKS_PASSWORD }}@${{ secrets.ROCKS_SERVER }} \
           cat $ROCK_NAME-scm-1.rockspec |
               sed -E \
-                -e "s/branch = '.+'/tag = '$GITHUB_REF'/g" \
-                -e "s/version = '.+'/version = '$GITHUB_REF-1'/g" |
-              curl --fail -X PUT -F "rockspec=@-;filename=$ROCK_NAME-$GITHUB_REF-1.rockspec" \
+                -e "s/branch = '.+'/tag = '${GIT_TAG}'/g" \
+                -e "s/version = '.+'/version = '${GIT_TAG}-1'/g" |
+              curl --fail -X PUT -F "rockspec=@-;filename=$ROCK_NAME-${GIT_TAG}-1.rockspec" \
                 https://${{ secrets.ROCKS_USERNAME }}:${{ secrets.ROCKS_PASSWORD }}@rocks.tarantool.org