diff --git a/FaqGen/benchmark/performance/helm_charts/templates/configmap.yaml b/FaqGen/benchmark/performance/helm_charts/templates/configmap.yaml
index 4bc78fe313..113e96501a 100644
--- a/FaqGen/benchmark/performance/helm_charts/templates/configmap.yaml
+++ b/FaqGen/benchmark/performance/helm_charts/templates/configmap.yaml
@@ -4,12 +4,12 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: faq-config
+  name: {{ .Values.config.CONFIG_MAP_NAME }}
   namespace: default
 data:
   HUGGINGFACEHUB_API_TOKEN: {{ .Values.HUGGINGFACEHUB_API_TOKEN }}
   LLM_MODEL_ID: {{ .Values.config.LLM_MODEL_ID }}
-  NODE_SELECTOR: faq-opea
+  NODE_SELECTOR: {{ .Values.config.NODE_SELECTOR }}
   TGI_LLM_ENDPOINT: http://faq-tgi-svc.default.svc.cluster.local:8010
   LLM_SERVICE_HOST_IP: faq-micro-svc
   MEGA_SERVICE_HOST_IP: faq-mega-server-svc