diff --git a/.github/workflows/reuse-get-test-matrix.yml b/.github/workflows/reuse-get-test-matrix.yml
index 76f5aaf63b..6860f8e9ba 100644
--- a/.github/workflows/reuse-get-test-matrix.yml
+++ b/.github/workflows/reuse-get-test-matrix.yml
@@ -47,26 +47,24 @@ jobs:
           changed_files="$(git diff --name-only ${base_commit} ${merged_commit} | \
           grep 'comps/' | grep -vE '*.md|*.txt|comps/cores')" || true
           services=$(printf '%s\n' "${changed_files[@]}" | cut -d'/' -f2 | grep -vE '*.py' | sort -u) || true
-          path_level_1=("asr" "tts")
-          path_level_3=("llms/summarization" "llms/text-generation" "dataprep/redis" "retrievers/langchain")
           run_matrix="{\"include\":["
           for service in ${services}; do
               hardware="gaudi" # default hardware, set based on the changed files
-              if [[ "${path_level_1[@]}" =~ "${service}" ]]; then
+              if [[ $(ls comps/${service} | grep -E "Dockerfile*|docker*") ]]; then
                   run_matrix="${run_matrix}{\"service\":\"${service}\",\"hardware\":\"${hardware}\"},"
-              else
-                  vendors=$(printf '%s\n' "${changed_files[@]}" | grep ${service} | cut -d'/' -f3 | grep -vE '*.py|Dockerfile|*.md|*.sh' | sort -u)
-                  for vendor in ${vendors}; do
-                      if [[ "${path_level_3[@]}" =~ "${service}/${vendor}" ]]; then
-                          sub_vendors=$(printf '%s\n' "${changed_files[@]}" | grep ${service} | grep ${vendor} | cut -d'/' -f4 | grep -vE '*.py' | sort -u)
-                          for sub_vendor in ${sub_vendors}; do
-                              run_matrix="${run_matrix}{\"service\":\"${service}/${vendor}/${sub_vendor}\",\"hardware\":\"${hardware}\"},"
-                          done
-                      else
-                          run_matrix="${run_matrix}{\"service\":\"${service}/${vendor}\",\"hardware\":\"${hardware}\"},"
+              fi
+              vendors=$(printf '%s\n' "${changed_files[@]}" | grep ${service} | cut -d'/' -f3 | grep -vE '*.py|Dockerfile|*.sh|docker|*.yaml|*.yml' | sort -u)
+              for vendor in ${vendors}; do
+                  if [[ $(ls comps/${service}/${vendor} | grep -E "Dockerfile*|docker*") ]]; then
+                      run_matrix="${run_matrix}{\"service\":\"${service}/${vendor}\",\"hardware\":\"${hardware}\"},"
+                  fi
+                  sub_vendors=$(printf '%s\n' "${changed_files[@]}" | grep ${service} | grep ${vendor} | cut -d'/' -f4 | grep -vE '*.py|Dockerfile|*.sh|docker|*.yaml|*.yml' | sort -u)
+                  for sub_vendor in ${sub_vendors}; do
+                      if [[ $(ls comps/${service}/${vendor}/${sub_vendor} | grep -E "Dockerfile*|docker*") ]]; then
+                          run_matrix="${run_matrix}{\"service\":\"${service}/${vendor}/${sub_vendor}\",\"hardware\":\"${hardware}\"},"
                       fi
                   done
-              fi
+              done
           done
 
           # add test for comps/dataprep/utils.py
diff --git a/.github/workflows/scripts/docker_images_build_push.sh b/.github/workflows/scripts/docker_images_build_push.sh
index d37be3bdee..9c888fbde6 100644
--- a/.github/workflows/scripts/docker_images_build_push.sh
+++ b/.github/workflows/scripts/docker_images_build_push.sh
@@ -51,6 +51,15 @@ case ${micro_service} in
     "llms/summarization/tgi")
         IMAGE_NAME="opea/llm-docsum-tgi"
         ;;
+    "web_retrievers/langchain/chroma")
+        IMAGE_NAME="opea/web-retriever-chroma"
+        ;;
+    "tts/speecht5")
+        IMAGE_NAME="opea/speecht5"
+        ;;
+    "asr/whisper")
+        IMAGE_NAME="opea/whisper"
+        ;;
     *)
         echo "Not supported yet"
         exit 0
diff --git a/tests/test_web_retrievers_langchain.sh b/tests/test_web_retrievers_langchain_chroma.sh
similarity index 100%
rename from tests/test_web_retrievers_langchain.sh
rename to tests/test_web_retrievers_langchain_chroma.sh