diff --git a/helm-charts/common/tgi/templates/configmap.yaml b/helm-charts/common/tgi/templates/configmap.yaml
index 254cf5b0e..82be971e4 100644
--- a/helm-charts/common/tgi/templates/configmap.yaml
+++ b/helm-charts/common/tgi/templates/configmap.yaml
@@ -17,7 +17,9 @@ data:
   http_proxy: {{ .Values.global.http_proxy | quote }}
   https_proxy: {{ .Values.global.https_proxy | quote }}
   no_proxy: {{ .Values.global.no_proxy | quote }}
+  {{- if contains "tgi-gaudi" .Values.image.repository }}
   HABANA_LOGS: "/tmp/habana_logs"
+  {{- end }}
   NUMBA_CACHE_DIR: "/tmp"
   HF_HOME: "/tmp/.cache/huggingface"
   {{- if .Values.MAX_INPUT_LENGTH }}
diff --git a/helm-charts/common/vllm/templates/configmap.yaml b/helm-charts/common/vllm/templates/configmap.yaml
index c38dbefa5..50a013d08 100644
--- a/helm-charts/common/vllm/templates/configmap.yaml
+++ b/helm-charts/common/vllm/templates/configmap.yaml
@@ -15,7 +15,9 @@ data:
   http_proxy: {{ .Values.global.http_proxy | quote }}
   https_proxy: {{ .Values.global.https_proxy | quote }}
   no_proxy: {{ .Values.global.no_proxy | quote }}
+  {{- if contains "opea/vllm-hpu" .Values.image.repository }}
   HABANA_LOGS: "/tmp/habana_logs"
+  {{- end }}
   NUMBA_CACHE_DIR: "/tmp"
   HF_HOME: "/tmp/.cache/huggingface"
   # https://github.com/outlines-dev/outlines/blob/main/outlines/caching.py#L14-L29
diff --git a/microservices-connector/config/manifests/tgi.yaml b/microservices-connector/config/manifests/tgi.yaml
index 8f2da5e2c..0902b0ef6 100644
--- a/microservices-connector/config/manifests/tgi.yaml
+++ b/microservices-connector/config/manifests/tgi.yaml
@@ -20,7 +20,6 @@ data:
   http_proxy: ""
   https_proxy: ""
   no_proxy: ""
-  HABANA_LOGS: "/tmp/habana_logs"
   NUMBA_CACHE_DIR: "/tmp"
   HF_HOME: "/tmp/.cache/huggingface"
   CUDA_GRAPHS: "0"
diff --git a/microservices-connector/config/manifests/tgi_nv.yaml b/microservices-connector/config/manifests/tgi_nv.yaml
index f3a80dfd2..f841d5ffe 100644
--- a/microservices-connector/config/manifests/tgi_nv.yaml
+++ b/microservices-connector/config/manifests/tgi_nv.yaml
@@ -20,7 +20,6 @@ data:
   http_proxy: ""
   https_proxy: ""
   no_proxy: ""
-  HABANA_LOGS: "/tmp/habana_logs"
   NUMBA_CACHE_DIR: "/tmp"
   HF_HOME: "/tmp/.cache/huggingface"
   HF_HUB_DISABLE_PROGRESS_BARS: "1"
diff --git a/microservices-connector/config/manifests/vllm.yaml b/microservices-connector/config/manifests/vllm.yaml
index 4eed5cd48..33557b5a2 100644
--- a/microservices-connector/config/manifests/vllm.yaml
+++ b/microservices-connector/config/manifests/vllm.yaml
@@ -18,7 +18,6 @@ data:
   http_proxy: ""
   https_proxy: ""
   no_proxy: ""
-  HABANA_LOGS: "/tmp/habana_logs"
   NUMBA_CACHE_DIR: "/tmp"
   HF_HOME: "/tmp/.cache/huggingface"
   # https://github.com/outlines-dev/outlines/blob/main/outlines/caching.py#L14-L29