diff --git a/.github/workflows/ci-workflow-for-tag.yml b/.github/workflows/ci-workflow-for-tag.yml
new file mode 100644
index 0000000..3959554
--- /dev/null
+++ b/.github/workflows/ci-workflow-for-tag.yml
@@ -0,0 +1,46 @@
+name: Frontend & Docker CI Workflow 
+
+on:
+  push:
+    tags:
+      - '**'
+
+jobs:
+  get-npm-package-version:
+    runs-on: ubuntu-latest
+    outputs:
+      package_version: ${{ steps.get_version.outputs.package_version }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - name: Check is Lerna project
+        run: |
+          if [ -f lerna.json ]; then
+            echo "Project is a Lerna project."
+            echo "IS_LERNA=true" >> $GITHUB_ENV
+          else
+            echo "Project is NOT a Lerna project."
+            echo "IS_LERNA=false" >> $GITHUB_ENV
+          fi
+      - name: Get package version
+        id: get_version
+        run: |
+          if [ "$IS_LERNA" == "true" ]; then
+            VERSION=$(lerna list --json | jq -r '.[0].version')
+          else
+            VERSION=$(jq -r '.version' package.json)
+          fi
+          echo "package_version=$VERSION" >> $GITHUB_OUTPUT
+  call-docker-ci-workflow:
+    needs: get-npm-package-version
+    uses: netcracker/qubership-apihub-ci/.github/workflows/docker-ci.yml@main
+    with:
+      name: qubership-apihub-ui
+      file: Dockerfile
+      context: ""
+      platforms: linux/amd64,linux/arm64
+      labels: |
+        maintainer=qubership
+        npm-package-version=${{ needs.jobs.get-npm-package-version.outputs.package_version }}
+    secrets:
+      NPMRC: ${{ secrets.NPMRC }}
diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml
index 8f5843c..04713fd 100644
--- a/.github/workflows/ci-workflow.yml
+++ b/.github/workflows/ci-workflow.yml
@@ -1,16 +1,12 @@
 name: Frontend & Docker CI Workflow 
 
 on:
-  release:
-    types: [created]
   push:
     branches:
       - main
       - release
       - develop
       - feature/*
-    tags:
-      - '**'
   delete:
     branches:
       - release
@@ -21,6 +17,7 @@ jobs:
     uses: netcracker/qubership-apihub-ci/.github/workflows/frontend-ci.yaml@main
   call-docker-ci-workflow:
     needs: call-frontend-ci-workflow
+    if: github.event_name == 'push'
     uses: netcracker/qubership-apihub-ci/.github/workflows/docker-ci.yml@main
     with:
       name: qubership-apihub-ui