diff --git a/ProductivitySuite/docker_compose/intel/cpu/xeon/README.md b/ProductivitySuite/docker_compose/intel/cpu/xeon/README.md
index 91921c8c23..55af17f1e8 100644
--- a/ProductivitySuite/docker_compose/intel/cpu/xeon/README.md
+++ b/ProductivitySuite/docker_compose/intel/cpu/xeon/README.md
@@ -108,12 +108,12 @@ Since the `compose.yaml` will consume some environment variables, you need to se
 export host_ip="External_Public_IP"
 ```
 
-**Export the value of your Huggingface API token to the `HUGGINGFACEHUB_API_TOKEN` environment variable**
+**Export the value of your Huggingface API token to the `HF_TOKEN` environment variable**
 
 > Change the Your_Huggingface_API_Token below with tyour actual Huggingface API Token value
 
 ```
-export HUGGINGFACEHUB_API_TOKEN="Your_Huggingface_API_Token"
+export HF_TOKEN="Your_Huggingface_API_Token"
 ```
 
 **Append the value of the public IP address to the no_proxy list**
@@ -129,7 +129,7 @@ export RERANK_MODEL_ID="BAAI/bge-reranker-base"
 export LLM_MODEL_ID="Intel/neural-chat-7b-v3-3"
 export LLM_MODEL_ID_CODEGEN="meta-llama/CodeLlama-7b-hf"
 export INDEX_NAME="rag-redis"
-export HUGGINGFACEHUB_API_TOKEN=${HUGGINGFACEHUB_API_TOKEN}
+export HF_TOKEN=${HF_TOKEN}
 export BACKEND_SERVICE_ENDPOINT_CHATQNA="http://${host_ip}:8888/v1/chatqna"
 export DATAPREP_DELETE_FILE_ENDPOINT="http://${host_ip}:6007/v1/dataprep/delete"
 export BACKEND_SERVICE_ENDPOINT_CODEGEN="http://${host_ip}:7778/v1/codegen"
diff --git a/ProductivitySuite/docker_compose/intel/cpu/xeon/compose.yaml b/ProductivitySuite/docker_compose/intel/cpu/xeon/compose.yaml
index 00a16c1670..ddc8790951 100644
--- a/ProductivitySuite/docker_compose/intel/cpu/xeon/compose.yaml
+++ b/ProductivitySuite/docker_compose/intel/cpu/xeon/compose.yaml
@@ -29,7 +29,7 @@ services:
       REDIS_HOST: redis-vector-db
       INDEX_NAME: ${INDEX_NAME}
       TEI_EMBEDDING_ENDPOINT: http://tei-embedding-service:80
-      HUGGINGFACEHUB_API_TOKEN: ${HUGGINGFACEHUB_API_TOKEN}
+      HUGGINGFACEHUB_API_TOKEN: ${HF_TOKEN}
       DATAPREP_TYPE: ${DATAPREP_TYPE}
       LOGFLAG: ${LOGFLAG}
     healthcheck:
@@ -73,7 +73,7 @@ services:
       REDIS_HOST: redis-vector-db
       INDEX_NAME: ${INDEX_NAME}
       TEI_EMBEDDING_ENDPOINT: http://tei-embedding-service:80
-      HUGGINGFACEHUB_API_TOKEN: ${HUGGINGFACEHUB_API_TOKEN}
+      HUGGINGFACEHUB_API_TOKEN: ${HF_TOKEN}
       LOGFLAG: ${LOGFLAG}
       RETRIEVER_COMPONENT_NAME: "OPEA_RETRIEVER_REDIS"
     restart: unless-stopped
@@ -90,7 +90,7 @@ services:
       no_proxy: ${no_proxy}
       http_proxy: ${http_proxy}
       https_proxy: ${https_proxy}
-      HUGGINGFACEHUB_API_TOKEN: ${HUGGINGFACEHUB_API_TOKEN}
+      HUGGINGFACEHUB_API_TOKEN: ${HF_TOKEN}
       HF_HUB_DISABLE_PROGRESS_BARS: 1
       HF_HUB_ENABLE_HF_TRANSFER: 0
       host_ip: ${host_ip}
@@ -111,7 +111,7 @@ services:
       no_proxy: ${no_proxy}
       http_proxy: ${http_proxy}
       https_proxy: ${https_proxy}
-      HF_TOKEN: ${HUGGINGFACEHUB_API_TOKEN}
+      HF_TOKEN: ${HF_TOKEN}
       HF_HUB_DISABLE_PROGRESS_BARS: 1
       HF_HUB_ENABLE_HF_TRANSFER: 0
       host_ip: ${host_ip}
@@ -167,7 +167,7 @@ services:
       no_proxy: ${no_proxy}
       http_proxy: ${http_proxy}
       https_proxy: ${https_proxy}
-      HF_TOKEN: ${HUGGINGFACEHUB_API_TOKEN}
+      HF_TOKEN: ${HF_TOKEN}
       host_ip: ${host_ip}
     healthcheck:
       test: ["CMD-SHELL", "curl -f http://localhost:80/health || exit 1"]
@@ -190,7 +190,7 @@ services:
       https_proxy: ${https_proxy}
       LLM_ENDPOINT: http://tgi_service_codegen:80
       LLM_MODEL_ID: ${LLM_MODEL_ID_CODEGEN}
-      HUGGINGFACEHUB_API_TOKEN: ${HUGGINGFACEHUB_API_TOKEN}
+      HUGGINGFACEHUB_API_TOKEN: ${HF_TOKEN}
       LOGFLAG: ${LOGFLAG}
     restart: unless-stopped
   codegen-xeon-backend-server:
@@ -303,7 +303,7 @@ services:
       https_proxy: ${https_proxy}
       LLM_ENDPOINT: http://tgi-service:80
       LLM_MODEL_ID: ${LLM_MODEL_ID}
-      HUGGINGFACEHUB_API_TOKEN: ${HUGGINGFACEHUB_API_TOKEN}
+      HUGGINGFACEHUB_API_TOKEN: ${HF_TOKEN}
       MAX_INPUT_TOKENS: ${MAX_INPUT_TOKENS:-1024}
       MAX_TOTAL_TOKENS: ${MAX_TOTAL_TOKENS:-2048}
       DocSum_COMPONENT_NAME: ${DocSum_COMPONENT_NAME}
diff --git a/ProductivitySuite/docker_compose/intel/cpu/xeon/set_env.sh b/ProductivitySuite/docker_compose/intel/cpu/xeon/set_env.sh
index a70561f28b..f88f72e444 100755
--- a/ProductivitySuite/docker_compose/intel/cpu/xeon/set_env.sh
+++ b/ProductivitySuite/docker_compose/intel/cpu/xeon/set_env.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 # Copyright (C) 2024 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 pushd "../../../../../" > /dev/null
@@ -10,7 +11,7 @@ export RERANK_MODEL_ID="BAAI/bge-reranker-base"
 export LLM_MODEL_ID="Intel/neural-chat-7b-v3-3"
 export LLM_MODEL_ID_CODEGEN="Intel/neural-chat-7b-v3-3"
 export INDEX_NAME="rag-redis"
-export HUGGINGFACEHUB_API_TOKEN=${HUGGINGFACEHUB_API_TOKEN}
+export HF_TOKEN=${HF_TOKEN}
 export BACKEND_SERVICE_ENDPOINT_CHATQNA="http://${host_ip}:8888/v1/chatqna"
 export DATAPREP_DELETE_FILE_ENDPOINT="http://${host_ip}:6007/v1/dataprep/delete"
 export BACKEND_SERVICE_ENDPOINT_CODEGEN="http://${host_ip}:7778/v1/codegen"
diff --git a/ProductivitySuite/tests/README.md b/ProductivitySuite/tests/README.md
index a7bc0ab7ce..fdd2bce112 100644
--- a/ProductivitySuite/tests/README.md
+++ b/ProductivitySuite/tests/README.md
@@ -3,7 +3,7 @@
 ## Set the required environment variable
 
 ```bash
-export HUGGINGFACEHUB_API_TOKEN="Your_Huggingface_API_Token"
+export HF_TOKEN="Your_Huggingface_API_Token"
 ```
 
 ## Run test
diff --git a/RerankFinetuning/tests/test_compose_on_gaudi.sh b/RerankFinetuning/tests/test_compose_on_gaudi.sh
index dca0bc2512..db6c468b6f 100644
--- a/RerankFinetuning/tests/test_compose_on_gaudi.sh
+++ b/RerankFinetuning/tests/test_compose_on_gaudi.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 # Copyright (C) 2024 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
diff --git a/RerankFinetuning/tests/test_compose_on_xeon.sh b/RerankFinetuning/tests/test_compose_on_xeon.sh
index ca9faa0222..3b9cf0786f 100644
--- a/RerankFinetuning/tests/test_compose_on_xeon.sh
+++ b/RerankFinetuning/tests/test_compose_on_xeon.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 # Copyright (C) 2024 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
diff --git a/SearchQnA/docker_compose/amd/gpu/rocm/README.md b/SearchQnA/docker_compose/amd/gpu/rocm/README.md
index 40533aac9f..4146dbbe92 100644
--- a/SearchQnA/docker_compose/amd/gpu/rocm/README.md
+++ b/SearchQnA/docker_compose/amd/gpu/rocm/README.md
@@ -50,7 +50,7 @@ To set up environment variables for deploying SearchQnA services, set up some pa
 export host_ip="External_Public_IP"           # ip address of the node
 export GOOGLE_CSE_ID="your cse id"
 export GOOGLE_API_KEY="your google api key"
-export HUGGINGFACEHUB_API_TOKEN="Your_HuggingFace_API_Token"
+export HF_TOKEN="Your_HuggingFace_API_Token"
 export http_proxy="Your_HTTP_Proxy"           # http proxy if any
 export https_proxy="Your_HTTPs_Proxy"         # https proxy if any
 export no_proxy=localhost,127.0.0.1,$host_ip  # additional no proxies if needed
@@ -64,7 +64,7 @@ source ./set_env_vllm.sh
 export host_ip="External_Public_IP"           # ip address of the node
 export GOOGLE_CSE_ID="your cse id"
 export GOOGLE_API_KEY="your google api key"
-export HUGGINGFACEHUB_API_TOKEN="Your_HuggingFace_API_Token"
+export HF_TOKEN="Your_HuggingFace_API_Token"
 export http_proxy="Your_HTTP_Proxy"           # http proxy if any
 export https_proxy="Your_HTTPs_Proxy"         # https proxy if any
 export no_proxy=localhost,127.0.0.1,$host_ip  # additional no proxies if needed
diff --git a/SearchQnA/docker_compose/amd/gpu/rocm/set_env.sh b/SearchQnA/docker_compose/amd/gpu/rocm/set_env.sh
index 3d84e01fcf..faeca0ae51 100644
--- a/SearchQnA/docker_compose/amd/gpu/rocm/set_env.sh
+++ b/SearchQnA/docker_compose/amd/gpu/rocm/set_env.sh
@@ -8,7 +8,7 @@ export EXTERNAL_HOST_IP=${ip_address}
 export SEARCH_EMBEDDING_MODEL_ID='BAAI/bge-base-en-v1.5'
 export SEARCH_GOOGLE_API_KEY=${GOOGLE_API_KEY}
 export SEARCH_GOOGLE_CSE_ID=${GOOGLE_CSE_ID}
-export SEARCH_HUGGINGFACEHUB_API_TOKEN=${HUGGINGFACEHUB_API_TOKEN}
+export SEARCH_HUGGINGFACEHUB_API_TOKEN=${HF_TOKEN}
 export SEARCH_LLM_MODEL_ID='Intel/neural-chat-7b-v3-3'
 export SEARCH_RERANK_MODEL_ID='BAAI/bge-reranker-base'
 
diff --git a/SearchQnA/docker_compose/amd/gpu/rocm/set_env_vllm.sh b/SearchQnA/docker_compose/amd/gpu/rocm/set_env_vllm.sh
index a891cce2a0..9ee0d24f79 100644
--- a/SearchQnA/docker_compose/amd/gpu/rocm/set_env_vllm.sh
+++ b/SearchQnA/docker_compose/amd/gpu/rocm/set_env_vllm.sh
@@ -8,7 +8,7 @@ export EXTERNAL_HOST_IP=${ip_address}
 export SEARCH_EMBEDDING_MODEL_ID='BAAI/bge-base-en-v1.5'
 export SEARCH_GOOGLE_API_KEY=${GOOGLE_API_KEY}
 export SEARCH_GOOGLE_CSE_ID=${GOOGLE_CSE_ID}
-export SEARCH_HUGGINGFACEHUB_API_TOKEN=${HUGGINGFACEHUB_API_TOKEN}
+export SEARCH_HUGGINGFACEHUB_API_TOKEN=${HF_TOKEN}
 export SEARCH_LLM_MODEL_ID='Intel/neural-chat-7b-v3-3'
 export SEARCH_RERANK_MODEL_ID='BAAI/bge-reranker-base'
 
diff --git a/SearchQnA/docker_compose/intel/cpu/xeon/README.md b/SearchQnA/docker_compose/intel/cpu/xeon/README.md
index 742a6ae1cd..c59d5fade5 100644
--- a/SearchQnA/docker_compose/intel/cpu/xeon/README.md
+++ b/SearchQnA/docker_compose/intel/cpu/xeon/README.md
@@ -43,7 +43,7 @@ To set up environment variables for deploying SearchQnA services, set up some pa
 export host_ip="External_Public_IP"           # ip address of the node
 export GOOGLE_CSE_ID="your cse id"
 export GOOGLE_API_KEY="your google api key"
-export HUGGINGFACEHUB_API_TOKEN="Your_HuggingFace_API_Token"
+export HF_TOKEN="Your_HuggingFace_API_Token"
 export http_proxy="Your_HTTP_Proxy"           # http proxy if any
 export https_proxy="Your_HTTPs_Proxy"         # https proxy if any
 export no_proxy=localhost,127.0.0.1,$host_ip  # additional no proxies if needed
diff --git a/SearchQnA/docker_compose/intel/cpu/xeon/compose.yaml b/SearchQnA/docker_compose/intel/cpu/xeon/compose.yaml
index 4503a645bb..dfc05a5b31 100644
--- a/SearchQnA/docker_compose/intel/cpu/xeon/compose.yaml
+++ b/SearchQnA/docker_compose/intel/cpu/xeon/compose.yaml
@@ -35,7 +35,7 @@ services:
       http_proxy: ${http_proxy}
       https_proxy: ${https_proxy}
       TEI_EMBEDDING_ENDPOINT: ${TEI_EMBEDDING_ENDPOINT}
-      HF_TOKEN: ${HUGGINGFACEHUB_API_TOKEN}
+      HF_TOKEN: ${HF_TOKEN}
       LOGFLAG: ${LOGFLAG}
     restart: unless-stopped
   web-retriever:
@@ -87,7 +87,7 @@ services:
       https_proxy: ${https_proxy}
       RERANK_TYPE: ${RERANK_TYPE}
       TEI_RERANKING_ENDPOINT: ${TEI_RERANKING_ENDPOINT}
-      HUGGINGFACEHUB_API_TOKEN: ${HUGGINGFACEHUB_API_TOKEN}
+      HUGGINGFACEHUB_API_TOKEN: ${HF_TOKEN}
       LOGFLAG: ${LOGFLAG}
     restart: unless-stopped
   tgi-service:
@@ -102,7 +102,7 @@ services:
       no_proxy: ${no_proxy}
       http_proxy: ${http_proxy}
       https_proxy: ${https_proxy}
-      HF_TOKEN: ${HUGGINGFACEHUB_API_TOKEN}
+      HF_TOKEN: ${HF_TOKEN}
       host_ip: ${host_ip}
     healthcheck:
       test: ["CMD-SHELL", "curl -f http://$host_ip:3006/health || exit 1"]
@@ -125,7 +125,7 @@ services:
       https_proxy: ${https_proxy}
       LLM_ENDPOINT: ${TGI_LLM_ENDPOINT}
       LLM_MODEL_ID: ${LLM_MODEL_ID}
-      HUGGINGFACEHUB_API_TOKEN: ${HUGGINGFACEHUB_API_TOKEN}
+      HUGGINGFACEHUB_API_TOKEN: ${HF_TOKEN}
       LOGFLAG: ${LOGFLAG}
     restart: unless-stopped
   searchqna-xeon-backend-server:
diff --git a/SearchQnA/docker_compose/intel/hpu/gaudi/README.md b/SearchQnA/docker_compose/intel/hpu/gaudi/README.md
index 611b4a3c44..4e4cedadc6 100644
--- a/SearchQnA/docker_compose/intel/hpu/gaudi/README.md
+++ b/SearchQnA/docker_compose/intel/hpu/gaudi/README.md
@@ -43,7 +43,7 @@ To set up environment variables for deploying SearchQnA services, set up some pa
 export host_ip="External_Public_IP"           # ip address of the node
 export GOOGLE_CSE_ID="your cse id"
 export GOOGLE_API_KEY="your google api key"
-export HUGGINGFACEHUB_API_TOKEN="Your_HuggingFace_API_Token"
+export HF_TOKEN="Your_HuggingFace_API_Token"
 export http_proxy="Your_HTTP_Proxy"           # http proxy if any
 export https_proxy="Your_HTTPs_Proxy"         # https proxy if any
 export no_proxy=localhost,127.0.0.1,$host_ip  # additional no proxies if needed
diff --git a/SearchQnA/docker_compose/intel/hpu/gaudi/compose.yaml b/SearchQnA/docker_compose/intel/hpu/gaudi/compose.yaml
index 5ff29a5d7a..6affd1fa69 100644
--- a/SearchQnA/docker_compose/intel/hpu/gaudi/compose.yaml
+++ b/SearchQnA/docker_compose/intel/hpu/gaudi/compose.yaml
@@ -43,7 +43,7 @@ services:
       http_proxy: ${http_proxy}
       https_proxy: ${https_proxy}
       TEI_EMBEDDING_ENDPOINT: ${TEI_EMBEDDING_ENDPOINT}
-      HF_TOKEN: ${HUGGINGFACEHUB_API_TOKEN}
+      HF_TOKEN: ${HF_TOKEN}
       LOGFLAG: ${LOGFLAG}
     restart: unless-stopped
   web-retriever:
@@ -94,7 +94,7 @@ services:
       https_proxy: ${https_proxy}
       RERANK_TYPE: ${RERANK_TYPE}
       TEI_RERANKING_ENDPOINT: ${TEI_RERANKING_ENDPOINT}
-      HUGGINGFACEHUB_API_TOKEN: ${HUGGINGFACEHUB_API_TOKEN}
+      HUGGINGFACEHUB_API_TOKEN: ${HF_TOKEN}
       LOGFLAG: ${LOGFLAG}
     restart: unless-stopped
   tgi-service:
@@ -108,7 +108,7 @@ services:
       no_proxy: ${no_proxy}
       http_proxy: ${http_proxy}
       https_proxy: ${https_proxy}
-      HUGGING_FACE_HUB_TOKEN: ${HUGGINGFACEHUB_API_TOKEN}
+      HUGGING_FACE_HUB_TOKEN: ${HF_TOKEN}
       HF_HUB_DISABLE_PROGRESS_BARS: 1
       HF_HUB_ENABLE_HF_TRANSFER: 0
       HABANA_VISIBLE_DEVICES: all
@@ -142,7 +142,7 @@ services:
       https_proxy: ${https_proxy}
       LLM_ENDPOINT: ${TGI_LLM_ENDPOINT}
       LLM_MODEL_ID: ${LLM_MODEL_ID}
-      HUGGINGFACEHUB_API_TOKEN: ${HUGGINGFACEHUB_API_TOKEN}
+      HUGGINGFACEHUB_API_TOKEN: ${HF_TOKEN}
       HF_HUB_DISABLE_PROGRESS_BARS: 1
       HF_HUB_ENABLE_HF_TRANSFER: 0
       LOGFLAG: ${LOGFLAG}
diff --git a/SearchQnA/docker_compose/intel/set_env.sh b/SearchQnA/docker_compose/intel/set_env.sh
index 45aaa7eb48..9680c13af0 100644
--- a/SearchQnA/docker_compose/intel/set_env.sh
+++ b/SearchQnA/docker_compose/intel/set_env.sh
@@ -8,7 +8,7 @@ popd > /dev/null
 
 export GOOGLE_CSE_ID=$GOOGLE_CSE_ID
 export GOOGLE_API_KEY=$GOOGLE_API_KEY
-export HUGGINGFACEHUB_API_TOKEN=$HUGGINGFACEHUB_API_TOKEN
+export HF_TOKEN=$HF_TOKEN
 export EMBEDDING_MODEL_ID=BAAI/bge-base-en-v1.5
 export TEI_EMBEDDING_ENDPOINT=http://${host_ip}:3001
 export RERANK_MODEL_ID=BAAI/bge-reranker-base
diff --git a/SearchQnA/tests/README.md b/SearchQnA/tests/README.md
index 4dd235fbb6..652d025076 100644
--- a/SearchQnA/tests/README.md
+++ b/SearchQnA/tests/README.md
@@ -3,7 +3,7 @@
 ## Set the required environment variable
 
 ```bash
-export HUGGINGFACEHUB_API_TOKEN="Your_Huggingface_API_Token"
+export HF_TOKEN="Your_Huggingface_API_Token"
 ```
 
 ## Run test
diff --git a/Translation/docker_compose/amd/gpu/rocm/set_env.sh b/Translation/docker_compose/amd/gpu/rocm/set_env.sh
index dc7dbe85ac..e0457d8395 100644
--- a/Translation/docker_compose/amd/gpu/rocm/set_env.sh
+++ b/Translation/docker_compose/amd/gpu/rocm/set_env.sh
@@ -9,7 +9,7 @@ export TRANSLATION_HOST_IP=${host_ip}
 export TRANSLATION_EXTERNAL_HOST_IP=${host_ip}
 export TRANSLATION_LLM_MODEL_ID="haoranxu/ALMA-13B"
 export TRANSLATION_TGI_LLM_ENDPOINT="http://${TRANSLATION_HOST_IP}:8008"
-export TRANSLATION_HUGGINGFACEHUB_API_TOKEN=${HUGGINGFACEHUB_API_TOKEN}
+export TRANSLATION_HUGGINGFACEHUB_API_TOKEN=${HF_TOKEN}
 export TRANSLATION_MEGA_SERVICE_HOST_IP=${TRANSLATION_HOST_IP}
 export TRANSLATION_LLM_SERVICE_HOST_IP=${TRANSLATION_HOST_IP}
 export TRANSLATION_FRONTEND_SERVICE_IP=${TRANSLATION_HOST_IP}
diff --git a/Translation/docker_compose/amd/gpu/rocm/set_env_vllm.sh b/Translation/docker_compose/amd/gpu/rocm/set_env_vllm.sh
index 4ebd939baa..772430ac0c 100644
--- a/Translation/docker_compose/amd/gpu/rocm/set_env_vllm.sh
+++ b/Translation/docker_compose/amd/gpu/rocm/set_env_vllm.sh
@@ -11,7 +11,7 @@ export TRANSLATION_LLM_MODEL_ID="haoranxu/ALMA-13B"
 export TRANSLATION_VLLM_SERVICE_PORT=8088
 export TRANSLATION_LLM_ENDPOINT="http://${HOST_IP}:${TRANSLATION_VLLM_SERVICE_PORT}"
 export TRANSLATION_LLM_PORT=9088
-export TRANSLATION_HUGGINGFACEHUB_API_TOKEN=${HUGGINGFACEHUB_API_TOKEN}
+export TRANSLATION_HUGGINGFACEHUB_API_TOKEN=${HF_TOKEN}
 export TRANSLATION_MEGA_SERVICE_HOST_IP=${HOST_IP}
 export TRANSLATION_LLM_SERVICE_HOST_IP=${HOST_IP}
 export TRANSLATION_FRONTEND_SERVICE_IP=${HOST_IP}
diff --git a/Translation/docker_compose/intel/cpu/xeon/compose.yaml b/Translation/docker_compose/intel/cpu/xeon/compose.yaml
index 4b77d84484..1c3d115741 100644
--- a/Translation/docker_compose/intel/cpu/xeon/compose.yaml
+++ b/Translation/docker_compose/intel/cpu/xeon/compose.yaml
@@ -11,7 +11,7 @@ services:
       no_proxy: ${no_proxy}
       http_proxy: ${http_proxy}
       https_proxy: ${https_proxy}
-      HF_TOKEN: ${HUGGINGFACEHUB_API_TOKEN}
+      HF_TOKEN: ${HF_TOKEN}
       HF_HUB_DISABLE_PROGRESS_BARS: 1
       HF_HUB_ENABLE_HF_TRANSFER: 0
       host_ip: ${host_ip}
@@ -39,7 +39,7 @@ services:
       https_proxy: ${https_proxy}
       LLM_ENDPOINT: ${TGI_LLM_ENDPOINT}
       LLM_MODEL_ID: ${LLM_MODEL_ID}
-      HUGGINGFACEHUB_API_TOKEN: ${HUGGINGFACEHUB_API_TOKEN}
+      HUGGINGFACEHUB_API_TOKEN: ${HF_TOKEN}
       HF_HUB_DISABLE_PROGRESS_BARS: 1
       HF_HUB_ENABLE_HF_TRANSFER: 0
     restart: unless-stopped
diff --git a/Translation/docker_compose/intel/hpu/gaudi/compose.yaml b/Translation/docker_compose/intel/hpu/gaudi/compose.yaml
index 9516e60ce6..92661ab552 100644
--- a/Translation/docker_compose/intel/hpu/gaudi/compose.yaml
+++ b/Translation/docker_compose/intel/hpu/gaudi/compose.yaml
@@ -11,7 +11,7 @@ services:
       no_proxy: ${no_proxy}
       http_proxy: ${http_proxy}
       https_proxy: ${https_proxy}
-      HUGGING_FACE_HUB_TOKEN: ${HUGGINGFACEHUB_API_TOKEN}
+      HUGGING_FACE_HUB_TOKEN: ${HF_TOKEN}
       HF_HUB_DISABLE_PROGRESS_BARS: 1
       HF_HUB_ENABLE_HF_TRANSFER: 0
       HABANA_VISIBLE_DEVICES: all
@@ -47,7 +47,7 @@ services:
       https_proxy: ${https_proxy}
       LLM_ENDPOINT: ${TGI_LLM_ENDPOINT}
       LLM_MODEL_ID: ${LLM_MODEL_ID}
-      HUGGINGFACEHUB_API_TOKEN: ${HUGGINGFACEHUB_API_TOKEN}
+      HUGGINGFACEHUB_API_TOKEN: ${HF_TOKEN}
       HF_HUB_DISABLE_PROGRESS_BARS: 1
       HF_HUB_ENABLE_HF_TRANSFER: 0
     restart: unless-stopped
diff --git a/Translation/docker_compose/intel/set_env.sh b/Translation/docker_compose/intel/set_env.sh
index 37762fbd50..931ea2716a 100644
--- a/Translation/docker_compose/intel/set_env.sh
+++ b/Translation/docker_compose/intel/set_env.sh
@@ -9,7 +9,7 @@ popd > /dev/null
 
 export LLM_MODEL_ID="haoranxu/ALMA-13B"
 export TGI_LLM_ENDPOINT="http://${host_ip}:8008"
-export HUGGINGFACEHUB_API_TOKEN=${HUGGINGFACEHUB_API_TOKEN}
+export HF_TOKEN=${HF_TOKEN}
 export MEGA_SERVICE_HOST_IP=${host_ip}
 export LLM_SERVICE_HOST_IP=${host_ip}
 export BACKEND_SERVICE_ENDPOINT="http://${host_ip}:8888/v1/translation"
diff --git a/Translation/tests/README.md b/Translation/tests/README.md
index ece64cf149..7a544febb2 100644
--- a/Translation/tests/README.md
+++ b/Translation/tests/README.md
@@ -3,7 +3,7 @@
 ## Set the required environment variable
 
 ```bash
-export HUGGINGFACEHUB_API_TOKEN="Your_Huggingface_API_Token"
+export HF_TOKEN="Your_Huggingface_API_Token"
 ```
 
 ## Run test