diff --git a/.github/workflows/release-clients.yml b/.github/workflows/release-clients.yml
index 639bf9def7..cb100475aa 100644
--- a/.github/workflows/release-clients.yml
+++ b/.github/workflows/release-clients.yml
@@ -102,15 +102,23 @@ jobs:
         working-directory: cloud-agent/client/generator
         run: yarn generate:all
 
+      - name: Set version for clients
+        run: |
+          if [ -z "${{ github.event.inputs.releaseTag }}" ]; then
+              echo "VERSION_TAG=cloud-agent-v${{ inputs.revision }}" >> $GITHUB_ENV
+          else
+              echo "VERSION_TAG=${{ github.event.inputs.releaseTag }}" >> $GITHUB_ENV
+          fi
+
       - name: Publish clients
         working-directory: cloud-agent/client/generator
+        env:
+          VERSION_TAG: ${{ env.VERSION_TAG }}
         run: |
           if [ -z "${{ github.event.inputs.releaseTag }}" ]; then
-            echo "Using revision version for publishing: ${{ inputs.revision }}"
-            VERSION_TAG=cloud-agent-v${{ inputs.revision }}
-            yarn publish:clients --new-version ${{ inputs.revision }}
+            echo "Using revision version for publishing: ${VERSION_TAG}"
+            yarn publish:clients
           else
-            echo "Using release tag for publishing: ${{ github.event.inputs.releaseTag }}"
-            VERSION_TAG=${{ github.event.inputs.releaseTag }}
-            yarn publish:clients --new-version ${{ github.event.inputs.releaseTag }}
+            echo "Using release tag for publishing: ${VERSION_TAG}"
+            yarn publish:clients
           fi