diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d5d82e1..fe02e1a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -105,10 +105,15 @@ jobs:
           INFERENCE_API_KEY: ${{ secrets.INFERENCE_API_KEY_PRD }}
           MCP_BASIC_KEY: ${{ secrets.MCP_BASIC_KEY_PRD }}
           MCP_PAPERSCORE_KEY: ${{ secrets.MCP_PAPERSCORE_KEY_PRD }}
-          XTRAGPT_OPENAI_API_KEY: ${{ secrets.XTRAGPT_OPENAI_API_KEY_PRD }}
-          XTRAGPT_OPENREVIEW_BASE_URL: ${{ secrets.XTRAGPT_OPENREVIEW_BASE_URL_PRD }}
-          XTRAGPT_OPENREVIEW_USERNAME: ${{ secrets.XTRAGPT_OPENREVIEW_USERNAME_PRD }}
-          XTRAGPT_OPENREVIEW_PASSWORD: ${{ secrets.XTRAGPT_OPENREVIEW_PASSWORD_PRD }}
+          XTRAMCP_OPENAI_BASE_URL: ${{ secrets.XTRAMCP_OPENAI_BASE_URL_PRD }}
+          XTRAMCP_OPENAI_API_KEY: ${{ secrets.XTRAMCP_OPENAI_API_KEY_PRD }}
+          XTRAMCP_OPENREVIEW_BASE_URL: ${{ secrets.XTRAMCP_OPENREVIEW_BASE_URL_PRD }}
+          XTRAMCP_OPENREVIEW_USERNAME: ${{ secrets.XTRAMCP_OPENREVIEW_USERNAME_PRD }}
+          XTRAMCP_OPENREVIEW_PASSWORD: ${{ secrets.XTRAMCP_OPENREVIEW_PASSWORD_PRD }}
+          XTRAMCP_CROSSREF_EMAIL_ADDRESS: ${{ secrets.XTRAMCP_CROSSREF_EMAIL_ADDRESS_PRD }}
+          XTRAMCP_DOI_EMAIL_ADDRESS: ${{ secrets.XTRAMCP_DOI_EMAIL_ADDRESS_PRD }}
+          XTRAMCP_ARXIV_METADATA_DB_URL: ${{ secrets.XTRAMCP_ARXIV_METADATA_DB_URL_PRD }}
+          XTRAMCP_MONGO_URI: ${{ secrets.XTRAMCP_MONGO_URI_PRD }}
           MONGO_URI: ${{ secrets.MONGO_URI_PRD }}
           GHCR_DOCKER_CONFIG: ${{ secrets.GHCR_DOCKER_CONFIG_PRD }}
           CLOUDFLARE_TUNNEL_TOKEN: ${{ secrets.CLOUDFLARE_TUNNEL_TOKEN_PRD }}
diff --git a/hack/prd.sh b/hack/prd.sh
index 4d9cb2a..13e3049 100755
--- a/hack/prd.sh
+++ b/hack/prd.sh
@@ -11,10 +11,15 @@ INFERENCE_BASE_URL=${INFERENCE_BASE_URL:-https://inference.paperdebugger.workers
 INFERENCE_API_KEY=${INFERENCE_API_KEY:-sk-dummy-OPEN-ROUTER}
 MCP_BASIC_KEY=${MCP_BASIC_KEY:-sk-dummy-MCP_BASIC_KEY}
 MCP_PAPERSCORE_KEY=${MCP_PAPERSCORE_KEY:-sk-dummy-MCP_PAPERSCORE_KEY}
-XTRAGPT_OPENAI_API_KEY=${XTRAGPT_OPENAI_API_KEY:-sk-dummy-XTRAGPT_OPENAI_API_KEY}
-XTRAGPT_OPENREVIEW_BASE_URL=${XTRAGPT_OPENREVIEW_BASE_URL:-https://api2.openreview.net}
-XTRAGPT_OPENREVIEW_USERNAME=${XTRAGPT_OPENREVIEW_USERNAME:-dummy-XTRAGPT_OPENREVIEW_USERNAME}
-XTRAGPT_OPENREVIEW_PASSWORD=${XTRAGPT_OPENREVIEW_PASSWORD:-dummy-XTRAGPT_OPENREVIEW_PASSWORD}
+XTRAMCP_OPENAI_BASE_URL=${XTRAMCP_OPENAI_BASE_URL:-https://api.openai.com/v1}
+XTRAMCP_OPENAI_API_KEY=${XTRAMCP_OPENAI_API_KEY:-sk-dummy-XTRAMCP_OPENAI_API_KEY}
+XTRAMCP_OPENREVIEW_BASE_URL=${XTRAMCP_OPENREVIEW_BASE_URL:-https://api2.openreview.net}
+XTRAMCP_OPENREVIEW_USERNAME=${XTRAMCP_OPENREVIEW_USERNAME:-dummy-XTRAMCP_OPENREVIEW_USERNAME}
+XTRAMCP_OPENREVIEW_PASSWORD=${XTRAMCP_OPENREVIEW_PASSWORD:-dummy-XTRAMCP_OPENREVIEW_PASSWORD}
+XTRAMCP_CROSSREF_EMAIL_ADDRESS=${XTRAMCP_CROSSREF_EMAIL_ADDRESS:-dummy-crossref-email-address}
+XTRAMCP_DOI_EMAIL_ADDRESS=${XTRAMCP_DOI_EMAIL_ADDRESS:-dummy-doi-email-address}
+XTRAMCP_ARXIV_METADATA_DB_URL=${XTRAMCP_ARXIV_METADATA_DB_URL:-postgresql://dummy-arxiv-metadata-db-url}
+XTRAMCP_MONGO_URI=${XTRAMCP_MONGO_URI:-mongodb://dummy-mongo-uri}
 PAPERDEBUGGER_IMAGE=${PAPERDEBUGGER_IMAGE:-ghcr.io/paperdebugger/sharelatex-paperdebugger:latest}
 MONGO_URI=${MONGO_URI:-}
 GHCR_DOCKER_CONFIG=${GHCR_DOCKER_CONFIG:-dummy-ghcr-docker-config}
@@ -30,10 +35,15 @@ helm template $ROOT_DIR/helm-chart \
     --set-string inference_api_key=$INFERENCE_API_KEY \
     --set-string mcp_basic_key=$MCP_BASIC_KEY \
     --set-string mcp_paperscore_key=$MCP_PAPERSCORE_KEY \
-    --set-string xtragpt_openai_api_key=$XTRAGPT_OPENAI_API_KEY \
-    --set-string xtragpt_openreview_base_url=$XTRAGPT_OPENREVIEW_BASE_URL \
-    --set-string xtragpt_openreview_username=$XTRAGPT_OPENREVIEW_USERNAME \
-    --set-string xtragpt_openreview_password=$XTRAGPT_OPENREVIEW_PASSWORD \
+    --set-string xtramcp_openai_base_url=$XTRAMCP_OPENAI_BASE_URL \
+    --set-string xtramcp_openai_api_key=$XTRAMCP_OPENAI_API_KEY \
+    --set-string xtramcp_openreview_base_url=$XTRAMCP_OPENREVIEW_BASE_URL \
+    --set-string xtramcp_openreview_username=$XTRAMCP_OPENREVIEW_USERNAME \
+    --set-string xtramcp_openreview_password=$XTRAMCP_OPENREVIEW_PASSWORD \
+    --set-string xtramcp_crossref_email_address=$XTRAMCP_CROSSREF_EMAIL_ADDRESS \
+    --set-string xtramcp_doi_email_address=$XTRAMCP_DOI_EMAIL_ADDRESS \
+    --set-string xtramcp_arxiv_metadata_db_url=$XTRAMCP_ARXIV_METADATA_DB_URL \
+    --set-string xtramcp_mongo_uri=$XTRAMCP_MONGO_URI \
     --set-string paperdebugger.image=$PAPERDEBUGGER_IMAGE \
     --set-string mongo.uri=$MONGO_URI \
     --set-string ghcr_docker_config=$GHCR_DOCKER_CONFIG \
diff --git a/helm-chart/templates/paperdebugger-xtramcp-server.yaml b/helm-chart/templates/paperdebugger-xtramcp-server.yaml
index 4b88b35..2b97dbd 100644
--- a/helm-chart/templates/paperdebugger-xtramcp-server.yaml
+++ b/helm-chart/templates/paperdebugger-xtramcp-server.yaml
@@ -48,7 +48,15 @@ metadata:
   name: paperdebugger-xtramcp-server
   namespace: {{ .Values.namespace }}
 data:
-  OPENAI_API_KEY: "{{ .Values.xtragpt_openai_api_key }}"
-  OPENREVIEW_BASE_URL: "{{ .Values.xtragpt_openreview_base_url }}"
-  OPENREVIEW_USERNAME: "{{ .Values.xtragpt_openreview_username }}"
-  OPENREVIEW_PASSWORD: "{{ .Values.xtragpt_openreview_password }}"
+  OPENAI_BASE_URL: "{{ .Values.xtramcp_openai_base_url }}"
+  OPENAI_API_KEY: "{{ .Values.xtramcp_openai_api_key }}"
+  OPENAI_MAX_RETRIES: "2"
+  OPENAI_TIMEOUT: "90"
+  OPENREVIEW_BASE_URL: "{{ .Values.xtramcp_openreview_base_url }}"
+  OPENREVIEW_USERNAME: "{{ .Values.xtramcp_openreview_username }}"
+  OPENREVIEW_PASSWORD: "{{ .Values.xtramcp_openreview_password }}"
+  DOI_EMAIL_ADDRESS: "{{ .Values.xtramcp_doi_email_address }}"
+  CROSSREF_EMAIL_ADDRESS: "{{ .Values.xtramcp_crossref_email_address }}"
+  MONGODB_CONNECTION_STRING: "{{ .Values.xtramcp_mongo_uri }}"
+  MONGODB_DATABASE: "paperdebugger"
+  ARXIV_METADATA_DB_URL: "{{ .Values.xtramcp_arxiv_metadata_db_url }}"
diff --git a/helm-chart/values.yaml b/helm-chart/values.yaml
index e0e961c..fd2e779 100644
--- a/helm-chart/values.yaml
+++ b/helm-chart/values.yaml
@@ -14,7 +14,7 @@ paperdebuggerMcpServer:
   image: ghcr.io/paperdebugger/paperdebugger-mcp-server:main-14409c5
 
 paperdebuggerXtraMcpServer:
-  image: ghcr.io/paperdebugger/xtragpt-mcp-server:sha-9b46a6e
+  image: ghcr.io/paperdebugger/xtragpt-mcp-server:sha-2f1404c
 
 mongo:
   in_cluster: true