diff --git a/registry/coder-labs/templates/tasks-docker/main.tf b/registry/coder-labs/templates/tasks-docker/main.tf
index 4d3c7136d..c966a9778 100644
--- a/registry/coder-labs/templates/tasks-docker/main.tf
+++ b/registry/coder-labs/templates/tasks-docker/main.tf
@@ -24,7 +24,6 @@ module "claude-code" {
   source              = "registry.coder.com/coder/claude-code/coder"
   version             = "2.0.0"
   agent_id            = coder_agent.main.id
-  agent_name          = "main"
   folder              = "/home/coder/projects"
   install_claude_code = true
   claude_code_version = "latest"
@@ -45,10 +44,9 @@ variable "anthropic_api_key" {
   sensitive   = true
 }
 resource "coder_env" "anthropic_api_key" {
-  agent_id   = coder_agent.main.id
-  agent_name = "main"
-  name       = "CODER_MCP_CLAUDE_API_KEY"
-  value      = var.anthropic_api_key
+  agent_id = coder_agent.main.id
+  name     = "CODER_MCP_CLAUDE_API_KEY"
+  value    = var.anthropic_api_key
 }
 
 # We are using presets to set the prompts, image, and set up instructions
@@ -176,22 +174,19 @@ data "coder_parameter" "preview_port" {
 
 # Other variables for Claude Code
 resource "coder_env" "claude_task_prompt" {
-  agent_id   = coder_agent.main.id
-  agent_name = "main"
-  name       = "CODER_MCP_CLAUDE_TASK_PROMPT"
-  value      = data.coder_parameter.ai_prompt.value
+  agent_id = coder_agent.main.id
+  name     = "CODER_MCP_CLAUDE_TASK_PROMPT"
+  value    = data.coder_parameter.ai_prompt.value
 }
 resource "coder_env" "app_status_slug" {
-  agent_id   = coder_agent.main.id
-  agent_name = "main"
-  name       = "CODER_MCP_APP_STATUS_SLUG"
-  value      = "ccw"
+  agent_id = coder_agent.main.id
+  name     = "CODER_MCP_APP_STATUS_SLUG"
+  value    = "ccw"
 }
 resource "coder_env" "claude_system_prompt" {
-  agent_id   = coder_agent.main.id
-  agent_name = "main"
-  name       = "CODER_MCP_CLAUDE_SYSTEM_PROMPT"
-  value      = data.coder_parameter.system_prompt.value
+  agent_id = coder_agent.main.id
+  name     = "CODER_MCP_CLAUDE_SYSTEM_PROMPT"
+  value    = data.coder_parameter.system_prompt.value
 }
 
 data "coder_provisioner" "me" {}
@@ -301,38 +296,27 @@ module "code-server" {
   # This ensures that the latest non-breaking version of the module gets downloaded, you can also pin the module version to prevent breaking changes in production.
   version = "~> 1.0"
 
-  agent_id   = coder_agent.main.id
-  agent_name = "main"
-  order      = 1
-}
-
-module "vscode" {
-  count      = data.coder_workspace.me.start_count
-  source     = "registry.coder.com/coder/vscode-desktop/coder"
-  version    = "1.1.0"
-  agent_id   = coder_agent.main.id
-  agent_name = "main"
+  agent_id = coder_agent.main.id
+  order    = 1
 }
 
 module "windsurf" {
-  count      = data.coder_workspace.me.start_count
-  source     = "registry.coder.com/coder/windsurf/coder"
-  version    = "1.1.0"
-  agent_id   = coder_agent.main.id
-  agent_name = "main"
+  count    = data.coder_workspace.me.start_count
+  source   = "registry.coder.com/coder/windsurf/coder"
+  version  = "1.1.0"
+  agent_id = coder_agent.main.id
 }
 
 module "cursor" {
-  count      = data.coder_workspace.me.start_count
-  source     = "registry.coder.com/coder/cursor/coder"
-  version    = "1.2.0"
-  agent_id   = coder_agent.main.id
-  agent_name = "main"
+  count    = data.coder_workspace.me.start_count
+  source   = "registry.coder.com/coder/cursor/coder"
+  version  = "1.2.0"
+  agent_id = coder_agent.main.id
 }
 
 module "jetbrains" {
   count      = data.coder_workspace.me.start_count
-  source     = "registry.coder.com/modules/coder/jetbrains/coder"
+  source     = "registry.coder.com/coder/jetbrains/coder"
   version    = "~> 1.0"
   agent_id   = coder_agent.main.id
   agent_name = "main"
@@ -368,7 +352,6 @@ resource "docker_volume" "home_volume" {
 
 resource "coder_app" "preview" {
   agent_id     = coder_agent.main.id
-  agent_name   = "main"
   slug         = "preview"
   display_name = "Preview your app"
   icon         = "${data.coder_workspace.me.access_url}/emojis/1f50e.png"