diff --git a/.github/workflows/build-docker.yaml b/.github/workflows/build-docker.yaml
index 598e8925..88e2adf2 100644
--- a/.github/workflows/build-docker.yaml
+++ b/.github/workflows/build-docker.yaml
@@ -571,7 +571,6 @@ jobs:
           build-args: |
             TARGETARCH=${{ matrix.arch }}
             GITHUB_PAT=${{ secrets.PAT }}
-            RUDDERSTACK_PAT=${{ secrets.RUDDERSTACK_PAT }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
 
@@ -779,7 +778,6 @@ jobs:
           build-args: |
             TARGETARCH=${{ matrix.arch }}
             GITHUB_PAT=${{ secrets.PAT }}
-            RUDDERSTACK_PAT=${{ secrets.RUDDERSTACK_PAT }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
 
diff --git a/Dockerfile b/Dockerfile
index 24e89953..99a209bf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,6 @@ FROM ubuntu:22.04@sha256:09506232a8004baa32c47d68f1e5c307d648fdd59f5e7eaa42aaf87
 
 # Set build arguments for version and architecture
 ARG TARGETARCH=amd64
-ARG RUDDERSTACK_PAT
 
 # Install Python, pip, git, curl, and wget
 RUN apt-get update && \
@@ -96,18 +95,18 @@ COPY src/browser/media/copilot-welcome.html /usr/lib/code-server/src/browser/med
 USER codeuser
 
 # Clone profiles-mcp as codeuser
-RUN git clone --branch v1.2.0 https://github.com/rudderlabs/profiles-mcp
+RUN git clone --branch v1.3.0 https://github.com/rudderlabs/profiles-mcp
 
 # Set up the Python script
 RUN echo '#!/usr/bin/env python3' > /home/codeuser/profiles-mcp/scripts/update_mcp_config.py
-RUN echo "RUDDERSTACK_PAT=${RUDDERSTACK_PAT}\nIS_CLOUD_BASED=true" > /home/codeuser/profiles-mcp/.env
+RUN echo "IS_CLOUD_BASED=true" > /home/codeuser/profiles-mcp/.env
 
 # Run setup as codeuser
 RUN cd /home/codeuser/profiles-mcp && bash setup.sh
 
 # Create MCP settings directory and filprofiles-qa-rudderstack-sources-manager-profiles-qa-rudderstack-sources-manager-00e
 RUN mkdir -p /home/codeuser/.local/share/code-server/User/globalStorage/saoudrizwan.claude-dev/settings/
-RUN echo '{"mcpServers":{ "Profiles": { "command": "/home/codeuser/profiles-mcp/scripts/start.sh", "args": [], "env": { "SHELL": "/bin/bash" }, "inheritEnv": ["RUDDERSTACK_PAT","RAG_ADMIN_USERNAME","RAG_ADMIN_PASSWORD","RETRIEVAL_API_URL","IS_CLOUD_BASED"], "autoApprove": ["get_existing_connections","search_profiles_docs","initialize_warehouse_connection","run_query","input_table_suggestions","describe_table","get_profiles_output_details","setup_new_profiles_project","evaluate_eligible_user_filters","validate_propensity_model_config"] }}}' > /home/codeuser/.local/share/code-server/User/globalStorage/saoudrizwan.claude-dev/settings/cline_mcp_settings.json
+RUN echo '{"mcpServers":{ "Profiles": { "command": "/home/codeuser/profiles-mcp/scripts/start.sh", "args": [], "env": { "SHELL": "/bin/bash" }, "inheritEnv": ["RAG_ADMIN_USERNAME","RAG_ADMIN_PASSWORD","RETRIEVAL_API_URL","IS_CLOUD_BASED"], "autoApprove": ["get_existing_connections","search_profiles_docs","initialize_warehouse_connection","run_query","input_table_suggestions","describe_table","get_profiles_output_details","setup_new_profiles_project","evaluate_eligible_user_filters","validate_propensity_model_config"] }}}' > /home/codeuser/.local/share/code-server/User/globalStorage/saoudrizwan.claude-dev/settings/cline_mcp_settings.json
 
 # Copy VS Code settings for sidebar layout and theme customizations
 # Set proper ownership and permissions
diff --git a/Dockerfile.optimize b/Dockerfile.optimize
index ab98fc5b..12a0bdf0 100644
--- a/Dockerfile.optimize
+++ b/Dockerfile.optimize
@@ -3,7 +3,6 @@ FROM ubuntu:22.04 AS builder
 
 # Set build arguments
 ARG TARGETARCH=amd64
-ARG RUDDERSTACK_PAT
 
 # Install build dependencies and download external resources in one layer
 RUN apt-get update && \
@@ -23,7 +22,6 @@ FROM ubuntu:22.04
 
 # Set build arguments
 ARG TARGETARCH=amd64
-ARG RUDDERSTACK_PAT
 
 # Install all system dependencies, create user, and clean up in single layer
 RUN apt-get update && \
@@ -85,8 +83,7 @@ RUN cat > /home/codeuser/custom-strings.json << 'EOF'
 EOF
 
 # Configure profiles-mcp environment
-RUN echo "RUDDERSTACK_PAT=${RUDDERSTACK_PAT}" > /home/codeuser/profiles-mcp/.env && \
-    echo "IS_CLOUD_BASED=true" >> /home/codeuser/profiles-mcp/.env && \
+RUN echo "IS_CLOUD_BASED=true" > /home/codeuser/profiles-mcp/.env && \
     echo '#!/usr/bin/env python3' > /home/codeuser/profiles-mcp/scripts/update_mcp_config.py
 
 # Set ownership and permissions