diff --git a/cmd/yardstick-client/README.md b/cmd/yardstick-client/README.md
index f3ae4f3..4856724 100644
--- a/cmd/yardstick-client/README.md
+++ b/cmd/yardstick-client/README.md
@@ -31,8 +31,8 @@ The client connects to MCP servers using various transport mechanisms and allows
 ## Environment Variables
 
 Configuration can also be set via environment variables:
-- `TRANSPORT`: Override transport type
-- `ADDRESS`: Override server address  
+- `MCP_TRANSPORT`: Override transport type
+- `ADDRESS`: Override server address
 - `PORT`: Override server port
 - `COMMAND`: Override command for stdio transport
 
@@ -101,7 +101,7 @@ Call a specific tool with provided JSON arguments:
 
 ### Using environment variables
 ```bash
-export TRANSPORT=sse
+export MCP_TRANSPORT=sse
 export ADDRESS=remote.example.com
 export PORT=3000
 ./client -action=list-resources
diff --git a/cmd/yardstick-client/main.go b/cmd/yardstick-client/main.go
index 73f08f3..ef7884b 100644
--- a/cmd/yardstick-client/main.go
+++ b/cmd/yardstick-client/main.go
@@ -211,7 +211,7 @@ func parseConfig() Config {
 	}
 
 	// Use environment variables if provided
-	if t, ok := os.LookupEnv("TRANSPORT"); ok {
+	if t, ok := os.LookupEnv("MCP_TRANSPORT"); ok {
 		config.Transport = t
 	}
 	if a, ok := os.LookupEnv("ADDRESS"); ok {
diff --git a/cmd/yardstick-client/main_test.go b/cmd/yardstick-client/main_test.go
index bbcf1a1..b72641b 100644
--- a/cmd/yardstick-client/main_test.go
+++ b/cmd/yardstick-client/main_test.go
@@ -39,7 +39,7 @@ func TestConfig_ParseConfig(t *testing.T) {
 
 	// Save original env vars
 	originalEnvVars := map[string]string{}
-	envVars := []string{"TRANSPORT", "ADDRESS", "PORT", "COMMAND"}
+	envVars := []string{"MCP_TRANSPORT", "ADDRESS", "PORT", "COMMAND"}
 	for _, env := range envVars {
 		if val, exists := os.LookupEnv(env); exists {
 			originalEnvVars[env] = val
@@ -59,20 +59,20 @@ func TestConfig_ParseConfig(t *testing.T) {
 	// Test environment variable override
 	t.Run("environment variables", func(t *testing.T) {
 		// Set test env vars
-		os.Setenv("TRANSPORT", "streamable-http")
+		os.Setenv("MCP_TRANSPORT", "streamable-http")
 		os.Setenv("ADDRESS", "remote.example.com")
 		os.Setenv("PORT", "3000")
 		os.Setenv("COMMAND", "test-command")
 
 		defer func() {
-			os.Unsetenv("TRANSPORT")
+			os.Unsetenv("MCP_TRANSPORT")
 			os.Unsetenv("ADDRESS")
 			os.Unsetenv("PORT")
 			os.Unsetenv("COMMAND")
 		}()
 
 		// Test that env vars would be read (we can't call parseConfig due to flag redefinition)
-		transport, transportExists := os.LookupEnv("TRANSPORT")
+		transport, transportExists := os.LookupEnv("MCP_TRANSPORT")
 		assert.True(t, transportExists)
 		assert.Equal(t, "streamable-http", transport)
 
diff --git a/cmd/yardstick-server/README.md b/cmd/yardstick-server/README.md
index eed50d0..335e26c 100644
--- a/cmd/yardstick-server/README.md
+++ b/cmd/yardstick-server/README.md
@@ -64,12 +64,12 @@ docker run -it ghcr.io/stackloklabs/yardstick/server
 
 **SSE Transport:**
 ```bash
-docker run -p 8080:8080 -e TRANSPORT=sse -e PORT=8080 ghcr.io/stackloklabs/yardstick/server
+docker run -p 8080:8080 -e MCP_TRANSPORT=sse -e PORT=8080 ghcr.io/stackloklabs/yardstick/server
 ```
 
 **Streamable HTTP Transport:**
 ```bash
-docker run -p 8080:8080 -e TRANSPORT=streamable-http -e PORT=8080 ghcr.io/stackloklabs/yardstick/server
+docker run -p 8080:8080 -e MCP_TRANSPORT=streamable-http -e PORT=8080 ghcr.io/stackloklabs/yardstick/server
 ```
 
 ## Tools
diff --git a/cmd/yardstick-server/main.go b/cmd/yardstick-server/main.go
index 8bc3b33..d1dec0c 100644
--- a/cmd/yardstick-server/main.go
+++ b/cmd/yardstick-server/main.go
@@ -165,7 +165,7 @@ func parseConfig() {
 	flag.Parse()
 
 	// Use environment variables if provided, otherwise use flag values
-	if t, ok := os.LookupEnv("TRANSPORT"); ok {
+	if t, ok := os.LookupEnv("MCP_TRANSPORT"); ok {
 		transport = t
 	}
 	if p, ok := os.LookupEnv("PORT"); ok {