diff --git a/.github/workflows/manual-freeze-images.yml b/.github/workflows/manual-freeze-images.yml
index 491ca9800..f974340f3 100644
--- a/.github/workflows/manual-freeze-images.yml
+++ b/.github/workflows/manual-freeze-images.yml
@@ -1,7 +1,7 @@
 # Copyright (C) 2024 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
-name: Freeze base images and 3rd part images on manual event
+name: Freeze base images and 3rd party images on manual event
 
 on:
   workflow_dispatch:
@@ -39,5 +39,5 @@ jobs:
       - name: Commit changes
         run: |
           git add .
-          git commit -s -m "Freeze images tag"
+          git commit -s -m "Freeze third party images tag"
           git push
diff --git a/.github/workflows/manual-freeze-tag.yml b/.github/workflows/manual-freeze-tag.yml
index 71e427482..8c86090b4 100644
--- a/.github/workflows/manual-freeze-tag.yml
+++ b/.github/workflows/manual-freeze-tag.yml
@@ -36,9 +36,11 @@ jobs:
       - name: Run script
         run: |
           find . -name "*.md" | xargs sed -i "s|^docker\ compose|TAG=${{ github.event.inputs.tag }}\ docker\ compose|g"
+          find . -type f -name "*.yaml" \( -path "*/benchmark/*" -o -path "*/kubernetes/*" \) | xargs sed -i -E 's/(opea\/[A-Za-z0-9\-]*:)latest/\1${{ github.event.inputs.tag }}/g'
+          find . -type f -name "*.md" \( -path "*/benchmark/*" -o -path "*/kubernetes/*" \) | xargs sed -i -E 's/(opea\/[A-Za-z0-9\-]*:)latest/\1${{ github.event.inputs.tag }}/g'
 
       - name: Commit changes
         run: |
           git add .
-          git commit -s -m "Freeze images tag"
+          git commit -s -m "Freeze OPEA images tag"
           git push
diff --git a/.github/workflows/scripts/freeze_images.sh b/.github/workflows/scripts/freeze_images.sh
index 0bdfa9fb2..a6beff89f 100644
--- a/.github/workflows/scripts/freeze_images.sh
+++ b/.github/workflows/scripts/freeze_images.sh
@@ -5,13 +5,13 @@
 
 declare -A dict
 dict["langchain/langchain"]="docker://docker.io/langchain/langchain"
-# dict["ghcr.io/huggingface/text-generation-inference"]="docker://ghcr.io/huggingface/text-generation-inference"
+dict["ghcr.io/huggingface/text-generation-inference"]="docker://ghcr.io/huggingface/text-generation-inference"
 
 function get_latest_version() {
     repo_image=$1
     versions=$(skopeo list-tags ${dict[$repo_image]} | jq -r '.Tags[]')
     printf "version list:\n$versions\n"
-    latest_version=$(printf "%s\n" "${versions[@]}" | grep -E '^[\.rc0-9\-]+$' | sort -V | tail -n 1)
+    latest_version=$(printf "%s\n" "${versions[@]}" | grep -E '^[\.0-9\-]+$' | sort -V | tail -n 1)
     echo "latest version: $latest_version"
     replace_image_version $repo_image $latest_version
 }
@@ -23,7 +23,9 @@ function replace_image_version() {
         echo "version is empty"
     else
         echo "replace $repo_image:latest with $repo_image:$version"
-        find . -name "Dockerfile" | xargs sed -i "s|$repo_image:latest|$repo_image:$version|g"
+        find . -name "Dockerfile" | xargs sed -i "s|$repo_image:latest.*|$repo_image:$version|g"
+        find . -name "*.yaml" | xargs sed -i "s|$repo_image:latest[A-Za-z0-9\-]*|$repo_image:$version|g"
+        find . -name "*.md" | xargs sed -i "s|$repo_image:latest[A-Za-z0-9\-]*|$repo_image:$version|g"
     fi
 }