diff --git a/cli/azd/cmd/auto_install_integration_test.go b/cli/azd/cmd/auto_install_integration_test.go
index 55f8b758d29..4f106582249 100644
--- a/cli/azd/cmd/auto_install_integration_test.go
+++ b/cli/azd/cmd/auto_install_integration_test.go
@@ -204,6 +204,13 @@ func TestAgentDetectionIntegration(t *testing.T) {
 			expectedNoPrompt: true,
 			description:      "When running under GitHub Copilot CLI, --no-prompt should be auto-enabled",
 		},
+		{
+			name:             "GitHub Copilot CLI via COPILOT_CLI enables no-prompt automatically",
+			args:             []string{"deploy"},
+			envVars:          map[string]string{"COPILOT_CLI": "true"},
+			expectedNoPrompt: true,
+			description:      "When running under GitHub Copilot CLI (COPILOT_CLI), --no-prompt should be auto-enabled",
+		},
 		{
 			name:             "Gemini agent enables no-prompt automatically",
 			args:             []string{"init"},
@@ -297,7 +304,7 @@ func clearAgentEnvVarsForTest(t *testing.T) {
 		// Claude Code
 		"CLAUDE_CODE", "CLAUDE_CODE_ENTRYPOINT",
 		// GitHub Copilot CLI
-		"GITHUB_COPILOT_CLI", "GH_COPILOT",
+		"GITHUB_COPILOT_CLI", "GH_COPILOT", "COPILOT_CLI",
 		// Gemini CLI
 		"GEMINI_CLI", "GEMINI_CLI_NO_RELAUNCH",
 		// OpenCode
diff --git a/cli/azd/cmd/auto_install_test.go b/cli/azd/cmd/auto_install_test.go
index 11f5ebb6451..1c2db5a91e5 100644
--- a/cli/azd/cmd/auto_install_test.go
+++ b/cli/azd/cmd/auto_install_test.go
@@ -387,6 +387,12 @@ func TestParseGlobalFlags_AgentDetection(t *testing.T) {
 			envVars:          map[string]string{"GITHUB_COPILOT_CLI": "true"},
 			expectedNoPrompt: true,
 		},
+		{
+			name:             "GitHub Copilot CLI agent detected via COPILOT_CLI",
+			args:             []string{"deploy"},
+			envVars:          map[string]string{"COPILOT_CLI": "true"},
+			expectedNoPrompt: true,
+		},
 		{
 			name:             "OpenCode agent detected",
 			args:             []string{"provision"},
diff --git a/cli/azd/internal/runcontext/agentdetect/detect_env.go b/cli/azd/internal/runcontext/agentdetect/detect_env.go
index 45331f0cb78..6730be37ac6 100644
--- a/cli/azd/internal/runcontext/agentdetect/detect_env.go
+++ b/cli/azd/internal/runcontext/agentdetect/detect_env.go
@@ -26,6 +26,7 @@ var knownEnvVarPatterns = []envVarPattern{
 	// GitHub Copilot CLI
 	{envVar: "GITHUB_COPILOT_CLI", agentType: AgentTypeGitHubCopilotCLI},
 	{envVar: "GH_COPILOT", agentType: AgentTypeGitHubCopilotCLI},
+	{envVar: "COPILOT_CLI", agentType: AgentTypeGitHubCopilotCLI},
 
 	// Google Gemini CLI
 	{envVar: "GEMINI_CLI", agentType: AgentTypeGemini},
diff --git a/cli/azd/internal/runcontext/agentdetect/detect_test.go b/cli/azd/internal/runcontext/agentdetect/detect_test.go
index 60194ea4278..3dd5d2b9ff7 100644
--- a/cli/azd/internal/runcontext/agentdetect/detect_test.go
+++ b/cli/azd/internal/runcontext/agentdetect/detect_test.go
@@ -77,6 +77,12 @@ func TestDetectFromEnvVars(t *testing.T) {
 			expectedAgent: AgentTypeGitHubCopilotCLI,
 			detected:      true,
 		},
+		{
+			name:          "GitHub Copilot CLI via COPILOT_CLI",
+			envVars:       map[string]string{"COPILOT_CLI": "1"},
+			expectedAgent: AgentTypeGitHubCopilotCLI,
+			detected:      true,
+		},
 		{
 			name:          "Gemini CLI via GEMINI_CLI",
 			envVars:       map[string]string{"GEMINI_CLI": "1"},
@@ -324,7 +330,7 @@ func clearAgentEnvVars(t *testing.T) {
 		// Claude Code
 		"CLAUDE_CODE", "CLAUDE_CODE_ENTRYPOINT",
 		// GitHub Copilot CLI
-		"GITHUB_COPILOT_CLI", "GH_COPILOT",
+		"GITHUB_COPILOT_CLI", "GH_COPILOT", "COPILOT_CLI",
 		// Gemini CLI
 		"GEMINI_CLI", "GEMINI_CLI_NO_RELAUNCH",
 		// OpenCode
diff --git a/cli/azd/internal/terminal/terminal_test.go b/cli/azd/internal/terminal/terminal_test.go
index 6dcb98603bd..c83fd2375fe 100644
--- a/cli/azd/internal/terminal/terminal_test.go
+++ b/cli/azd/internal/terminal/terminal_test.go
@@ -40,6 +40,11 @@ func TestIsTerminal_AgentDetection(t *testing.T) {
 			envVars:  map[string]string{"GITHUB_COPILOT_CLI": "true"},
 			expected: false,
 		},
+		{
+			name:     "GitHub Copilot CLI via COPILOT_CLI disables TTY",
+			envVars:  map[string]string{"COPILOT_CLI": "true"},
+			expected: false,
+		},
 		{
 			name:     "Gemini CLI disables TTY",
 			envVars:  map[string]string{"GEMINI_CLI": "1"},
@@ -88,7 +93,7 @@ func clearTestEnvVars(t *testing.T) {
 		"AZD_FORCE_TTY",
 		// Agent env vars
 		"CLAUDE_CODE", "CLAUDE_CODE_ENTRYPOINT",
-		"GITHUB_COPILOT_CLI", "GH_COPILOT",
+		"GITHUB_COPILOT_CLI", "GH_COPILOT", "COPILOT_CLI",
 		"GEMINI_CLI", "GEMINI_CLI_NO_RELAUNCH",
 		"OPENCODE",
 		// CI env vars