From bda33cf6fbb4e79a1c9e18c7a25f6cafc19dde21 Mon Sep 17 00:00:00 2001
From: "blink-so[bot]" <211532188+blink-so[bot]@users.noreply.github.com>
Date: Wed, 27 Aug 2025 18:45:58 +0000
Subject: [PATCH 1/6] Update jetbrains-gateway module references to
 coder/jetbrains

Replace all references to registry.coder.com/modules/jetbrains-gateway/coder
with registry.coder.com/modules/coder/jetbrains/coder in:
- Coder template examples
- Coder-labs template examples

Co-authored-by: AtifUpdate <U04T3LN8ASU+AtifUpdate@users.noreply.github.com>
---
 registry/coder-labs/templates/tasks-docker/main.tf       | 4 ++--
 registry/coder/templates/aws-linux/main.tf               | 6 +++---
 registry/coder/templates/azure-linux/main.tf             | 6 +++---
 registry/coder/templates/digitalocean-linux/main.tf      | 6 +++---
 registry/coder/templates/docker-devcontainer/main.tf     | 6 +++---
 registry/coder/templates/docker/main.tf                  | 6 +++---
 registry/coder/templates/gcp-devcontainer/main.tf        | 6 +++---
 registry/coder/templates/gcp-linux/main.tf               | 6 +++---
 registry/coder/templates/gcp-vm-container/main.tf        | 6 +++---
 registry/coder/templates/kubernetes-devcontainer/main.tf | 6 +++---
 registry/coder/templates/kubernetes-envbox/main.tf       | 6 +++---
 11 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/registry/coder-labs/templates/tasks-docker/main.tf b/registry/coder-labs/templates/tasks-docker/main.tf
index 35a64540a..9150c59ea 100644
--- a/registry/coder-labs/templates/tasks-docker/main.tf
+++ b/registry/coder-labs/templates/tasks-docker/main.tf
@@ -323,7 +323,7 @@ module "cursor" {
 
 module "jetbrains_gateway" {
   count  = data.coder_workspace.me.start_count
-  source = "registry.coder.com/coder/jetbrains-gateway/coder"
+  source = "registry.coder.com/modules/coder/jetbrains/coder"
 
   # JetBrains IDEs to make available for the user to select
   jetbrains_ides = ["IU", "PS", "WS", "PY", "CL", "GO", "RM", "RD", "RR"]
@@ -422,4 +422,4 @@ resource "docker_container" "workspace" {
     label = "coder.workspace_name"
     value = data.coder_workspace.me.name
   }
-}
+}
\ No newline at end of file
diff --git a/registry/coder/templates/aws-linux/main.tf b/registry/coder/templates/aws-linux/main.tf
index bf59dadc6..4364de2ef 100644
--- a/registry/coder/templates/aws-linux/main.tf
+++ b/registry/coder/templates/aws-linux/main.tf
@@ -205,10 +205,10 @@ module "code-server" {
   order    = 1
 }
 
-# See https://registry.coder.com/modules/jetbrains-gateway
+# See https://registry.coder.com/modules/coder/jetbrains
 module "jetbrains_gateway" {
   count  = data.coder_workspace.me.start_count
-  source = "registry.coder.com/modules/jetbrains-gateway/coder"
+  source = "registry.coder.com/modules/coder/jetbrains/coder"
 
   # JetBrains IDEs to make available for the user to select
   jetbrains_ides = ["IU", "PY", "WS", "PS", "RD", "CL", "GO", "RM"]
@@ -293,4 +293,4 @@ resource "coder_metadata" "workspace_info" {
 resource "aws_ec2_instance_state" "dev" {
   instance_id = aws_instance.dev.id
   state       = data.coder_workspace.me.transition == "start" ? "running" : "stopped"
-}
+}
\ No newline at end of file
diff --git a/registry/coder/templates/azure-linux/main.tf b/registry/coder/templates/azure-linux/main.tf
index 687c8cae2..591aa488c 100644
--- a/registry/coder/templates/azure-linux/main.tf
+++ b/registry/coder/templates/azure-linux/main.tf
@@ -148,10 +148,10 @@ module "code-server" {
   order    = 1
 }
 
-# See https://registry.coder.com/modules/coder/jetbrains-gateway
+# See https://registry.coder.com/modules/coder/jetbrains
 module "jetbrains_gateway" {
   count  = data.coder_workspace.me.start_count
-  source = "registry.coder.com/coder/jetbrains-gateway/coder"
+  source = "registry.coder.com/modules/coder/jetbrains/coder"
 
   # JetBrains IDEs to make available for the user to select
   jetbrains_ides = ["IU", "PY", "WS", "PS", "RD", "CL", "GO", "RM"]
@@ -322,4 +322,4 @@ resource "coder_metadata" "home_info" {
     key   = "size"
     value = "${data.coder_parameter.home_size.value} GiB"
   }
-}
+}
\ No newline at end of file
diff --git a/registry/coder/templates/digitalocean-linux/main.tf b/registry/coder/templates/digitalocean-linux/main.tf
index 4daf4b8b8..5cfe7e6f1 100644
--- a/registry/coder/templates/digitalocean-linux/main.tf
+++ b/registry/coder/templates/digitalocean-linux/main.tf
@@ -276,10 +276,10 @@ module "code-server" {
   order    = 1
 }
 
-# See https://registry.coder.com/modules/coder/jetbrains-gateway
+# See https://registry.coder.com/modules/coder/jetbrains
 module "jetbrains_gateway" {
   count  = data.coder_workspace.me.start_count
-  source = "registry.coder.com/coder/jetbrains-gateway/coder"
+  source = "registry.coder.com/modules/coder/jetbrains/coder"
 
   # JetBrains IDEs to make available for the user to select
   jetbrains_ides = ["IU", "PY", "WS", "PS", "RD", "CL", "GO", "RM"]
@@ -358,4 +358,4 @@ resource "coder_metadata" "volume-info" {
     key   = "size"
     value = "${digitalocean_volume.home_volume.size} GiB"
   }
-}
+}
\ No newline at end of file
diff --git a/registry/coder/templates/docker-devcontainer/main.tf b/registry/coder/templates/docker-devcontainer/main.tf
index 2765874f8..3e9fc6241 100644
--- a/registry/coder/templates/docker-devcontainer/main.tf
+++ b/registry/coder/templates/docker-devcontainer/main.tf
@@ -334,10 +334,10 @@ module "code-server" {
   order    = 1
 }
 
-# See https://registry.coder.com/modules/coder/jetbrains-gateway
+# See https://registry.coder.com/modules/coder/jetbrains
 module "jetbrains_gateway" {
   count  = data.coder_workspace.me.start_count
-  source = "registry.coder.com/coder/jetbrains-gateway/coder"
+  source = "registry.coder.com/modules/coder/jetbrains/coder"
 
   # JetBrains IDEs to make available for the user to select
   jetbrains_ides = ["IU", "PS", "WS", "PY", "CL", "GO", "RM", "RD", "RR"]
@@ -369,4 +369,4 @@ resource "coder_metadata" "container_info" {
     key   = "cache repo"
     value = var.cache_repo == "" ? "not enabled" : var.cache_repo
   }
-}
+}
\ No newline at end of file
diff --git a/registry/coder/templates/docker/main.tf b/registry/coder/templates/docker/main.tf
index 234c43382..f166abb08 100644
--- a/registry/coder/templates/docker/main.tf
+++ b/registry/coder/templates/docker/main.tf
@@ -133,10 +133,10 @@ module "code-server" {
   order    = 1
 }
 
-# See https://registry.coder.com/modules/coder/jetbrains-gateway
+# See https://registry.coder.com/modules/coder/jetbrains
 module "jetbrains_gateway" {
   count  = data.coder_workspace.me.start_count
-  source = "registry.coder.com/coder/jetbrains-gateway/coder"
+  source = "registry.coder.com/modules/coder/jetbrains/coder"
 
   # JetBrains IDEs to make available for the user to select
   jetbrains_ides = ["IU", "PS", "WS", "PY", "CL", "GO", "RM", "RD", "RR"]
@@ -217,4 +217,4 @@ resource "docker_container" "workspace" {
     label = "coder.workspace_name"
     value = data.coder_workspace.me.name
   }
-}
+}
\ No newline at end of file
diff --git a/registry/coder/templates/gcp-devcontainer/main.tf b/registry/coder/templates/gcp-devcontainer/main.tf
index 317a22fcc..17b8e66b1 100644
--- a/registry/coder/templates/gcp-devcontainer/main.tf
+++ b/registry/coder/templates/gcp-devcontainer/main.tf
@@ -295,10 +295,10 @@ module "code-server" {
   order    = 1
 }
 
-# See https://registry.coder.com/modules/coder/jetbrains-gateway
+# See https://registry.coder.com/modules/coder/jetbrains
 module "jetbrains_gateway" {
   count  = data.coder_workspace.me.start_count
-  source = "registry.coder.com/coder/jetbrains-gateway/coder"
+  source = "registry.coder.com/coder/jetbrains/coder"
 
   # JetBrains IDEs to make available for the user to select
   jetbrains_ides = ["IU", "PY", "WS", "PS", "RD", "CL", "GO", "RM"]
@@ -338,4 +338,4 @@ resource "coder_metadata" "home_info" {
     key   = "size"
     value = "${google_compute_disk.root.size} GiB"
   }
-}
+}
\ No newline at end of file
diff --git a/registry/coder/templates/gcp-linux/main.tf b/registry/coder/templates/gcp-linux/main.tf
index 286db4e41..dc1a5ba69 100644
--- a/registry/coder/templates/gcp-linux/main.tf
+++ b/registry/coder/templates/gcp-linux/main.tf
@@ -103,10 +103,10 @@ module "code-server" {
   order    = 1
 }
 
-# See https://registry.coder.com/modules/coder/jetbrains-gateway
+# See https://registry.coder.com/modules/coder/jetbrains
 module "jetbrains_gateway" {
   count  = data.coder_workspace.me.start_count
-  source = "registry.coder.com/coder/jetbrains-gateway/coder"
+  source = "registry.coder.com/modules/coder/jetbrains/coder"
 
   # JetBrains IDEs to make available for the user to select
   jetbrains_ides = ["IU", "PY", "WS", "PS", "RD", "CL", "GO", "RM"]
@@ -181,4 +181,4 @@ resource "coder_metadata" "home_info" {
     key   = "size"
     value = "${google_compute_disk.root.size} GiB"
   }
-}
+}
\ No newline at end of file
diff --git a/registry/coder/templates/gcp-vm-container/main.tf b/registry/coder/templates/gcp-vm-container/main.tf
index b259b4b22..c54fe29f7 100644
--- a/registry/coder/templates/gcp-vm-container/main.tf
+++ b/registry/coder/templates/gcp-vm-container/main.tf
@@ -56,10 +56,10 @@ module "code-server" {
   order    = 1
 }
 
-# See https://registry.coder.com/modules/coder/jetbrains-gateway
+# See https://registry.coder.com/modules/coder/jetbrains
 module "jetbrains_gateway" {
   count  = data.coder_workspace.me.start_count
-  source = "registry.coder.com/coder/jetbrains-gateway/coder"
+  source = "registry.coder.com/modules/coder/jetbrains/coder"
 
   # JetBrains IDEs to make available for the user to select
   jetbrains_ides = ["IU", "PY", "WS", "PS", "RD", "CL", "GO", "RM"]
@@ -133,4 +133,4 @@ resource "coder_metadata" "workspace_info" {
     key   = "image"
     value = module.gce-container.container.image
   }
-}
+}
\ No newline at end of file
diff --git a/registry/coder/templates/kubernetes-devcontainer/main.tf b/registry/coder/templates/kubernetes-devcontainer/main.tf
index 8fc79fa25..783fcf019 100644
--- a/registry/coder/templates/kubernetes-devcontainer/main.tf
+++ b/registry/coder/templates/kubernetes-devcontainer/main.tf
@@ -426,10 +426,10 @@ module "code-server" {
   order    = 1
 }
 
-# See https://registry.coder.com/modules/coder/jetbrains-gateway
+# See https://registry.coder.com/modules/coder/jetbrains
 module "jetbrains_gateway" {
   count  = data.coder_workspace.me.start_count
-  source = "registry.coder.com/coder/jetbrains-gateway/coder"
+  source = "registry.coder.com/modules/coder/jetbrains/coder"
 
   # JetBrains IDEs to make available for the user to select
   jetbrains_ides = ["IU", "PY", "WS", "PS", "RD", "CL", "GO", "RM"]
@@ -461,4 +461,4 @@ resource "coder_metadata" "container_info" {
     key   = "cache repo"
     value = var.cache_repo == "" ? "not enabled" : var.cache_repo
   }
-}
+}
\ No newline at end of file
diff --git a/registry/coder/templates/kubernetes-envbox/main.tf b/registry/coder/templates/kubernetes-envbox/main.tf
index 00ae9a2f1..83aaf718b 100644
--- a/registry/coder/templates/kubernetes-envbox/main.tf
+++ b/registry/coder/templates/kubernetes-envbox/main.tf
@@ -110,10 +110,10 @@ module "code-server" {
   order    = 1
 }
 
-# See https://registry.coder.com/modules/coder/jetbrains-gateway
+# See https://registry.coder.com/modules/coder/jetbrains
 module "jetbrains_gateway" {
   count  = data.coder_workspace.me.start_count
-  source = "registry.coder.com/coder/jetbrains-gateway/coder"
+  source = "registry.coder.com/modules/coder/jetbrains/coder"
 
   # JetBrains IDEs to make available for the user to select
   jetbrains_ides = ["IU", "PY", "WS", "PS", "RD", "CL", "GO", "RM"]
@@ -319,4 +319,4 @@ resource "kubernetes_pod" "main" {
       }
     }
   }
-}
+}
\ No newline at end of file

From a6b03bb402dde443dd0c3a67b661a7bcbba032cf Mon Sep 17 00:00:00 2001
From: "blink-so[bot]" <211532188+blink-so[bot]@users.noreply.github.com>
Date: Wed, 27 Aug 2025 18:53:51 +0000
Subject: [PATCH 2/6] Update jetbrains module to new simplified format

Replace jetbrains_gateway module blocks with simplified jetbrains module:
- Change module name from 'jetbrains_gateway' to 'jetbrains'
- Use simplified configuration with only required parameters
- Set version to 1.0.3
- Remove complex IDE selection and configuration options

Co-authored-by: AtifUpdate <U04T3LN8ASU+AtifUpdate@users.noreply.github.com>
---
 .../coder-labs/templates/tasks-docker/main.tf | 23 +++++--------------
 registry/coder/templates/aws-linux/main.tf    | 23 +++++--------------
 registry/coder/templates/azure-linux/main.tf  | 23 +++++--------------
 .../templates/digitalocean-linux/main.tf      | 23 +++++--------------
 .../templates/docker-devcontainer/main.tf     | 23 +++++--------------
 registry/coder/templates/docker/main.tf       | 23 +++++--------------
 .../coder/templates/gcp-devcontainer/main.tf  | 23 +++++--------------
 registry/coder/templates/gcp-linux/main.tf    | 23 +++++--------------
 .../coder/templates/gcp-vm-container/main.tf  | 23 +++++--------------
 .../templates/kubernetes-devcontainer/main.tf | 23 +++++--------------
 .../coder/templates/kubernetes-envbox/main.tf | 23 +++++--------------
 11 files changed, 66 insertions(+), 187 deletions(-)

diff --git a/registry/coder-labs/templates/tasks-docker/main.tf b/registry/coder-labs/templates/tasks-docker/main.tf
index 9150c59ea..e358addd6 100644
--- a/registry/coder-labs/templates/tasks-docker/main.tf
+++ b/registry/coder-labs/templates/tasks-docker/main.tf
@@ -321,23 +321,12 @@ module "cursor" {
   agent_id = coder_agent.main.id
 }
 
-module "jetbrains_gateway" {
-  count  = data.coder_workspace.me.start_count
-  source = "registry.coder.com/modules/coder/jetbrains/coder"
-
-  # JetBrains IDEs to make available for the user to select
-  jetbrains_ides = ["IU", "PS", "WS", "PY", "CL", "GO", "RM", "RD", "RR"]
-  default        = "IU"
-
-  # Default folder to open when starting a JetBrains IDE
-  folder = "/home/coder/projects"
-
-  # 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      = 2
+module "jetbrains" {
+  count    = data.coder_workspace.me.start_count
+  source   = "registry.coder.com/modules/coder/jetbrains/coder"
+  version  = "1.0.3"
+  agent_id = coder_agent.main.id
+  folder   = "/home/coder"
 }
 
 resource "docker_volume" "home_volume" {
diff --git a/registry/coder/templates/aws-linux/main.tf b/registry/coder/templates/aws-linux/main.tf
index 4364de2ef..303336d7d 100644
--- a/registry/coder/templates/aws-linux/main.tf
+++ b/registry/coder/templates/aws-linux/main.tf
@@ -206,23 +206,12 @@ module "code-server" {
 }
 
 # See https://registry.coder.com/modules/coder/jetbrains
-module "jetbrains_gateway" {
-  count  = data.coder_workspace.me.start_count
-  source = "registry.coder.com/modules/coder/jetbrains/coder"
-
-  # JetBrains IDEs to make available for the user to select
-  jetbrains_ides = ["IU", "PY", "WS", "PS", "RD", "CL", "GO", "RM"]
-  default        = "IU"
-
-  # Default folder to open when starting a JetBrains IDE
-  folder = "/home/coder"
-
-  # 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.dev[0].id
-  agent_name = "dev"
-  order      = 2
+module "jetbrains" {
+  count    = data.coder_workspace.me.start_count
+  source   = "registry.coder.com/modules/coder/jetbrains/coder"
+  version  = "1.0.3"
+  agent_id = coder_agent.dev[0].id
+  folder   = "/home/coder"
 }
 
 locals {
diff --git a/registry/coder/templates/azure-linux/main.tf b/registry/coder/templates/azure-linux/main.tf
index 591aa488c..465ffe91f 100644
--- a/registry/coder/templates/azure-linux/main.tf
+++ b/registry/coder/templates/azure-linux/main.tf
@@ -149,23 +149,12 @@ module "code-server" {
 }
 
 # See https://registry.coder.com/modules/coder/jetbrains
-module "jetbrains_gateway" {
-  count  = data.coder_workspace.me.start_count
-  source = "registry.coder.com/modules/coder/jetbrains/coder"
-
-  # JetBrains IDEs to make available for the user to select
-  jetbrains_ides = ["IU", "PY", "WS", "PS", "RD", "CL", "GO", "RM"]
-  default        = "IU"
-
-  # Default folder to open when starting a JetBrains IDE
-  folder = "/home/coder"
-
-  # 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      = 2
+module "jetbrains" {
+  count    = data.coder_workspace.me.start_count
+  source   = "registry.coder.com/modules/coder/jetbrains/coder"
+  version  = "1.0.3"
+  agent_id = coder_agent.main.id
+  folder   = "/home/coder"
 }
 
 locals {
diff --git a/registry/coder/templates/digitalocean-linux/main.tf b/registry/coder/templates/digitalocean-linux/main.tf
index 5cfe7e6f1..c4395a775 100644
--- a/registry/coder/templates/digitalocean-linux/main.tf
+++ b/registry/coder/templates/digitalocean-linux/main.tf
@@ -277,23 +277,12 @@ module "code-server" {
 }
 
 # See https://registry.coder.com/modules/coder/jetbrains
-module "jetbrains_gateway" {
-  count  = data.coder_workspace.me.start_count
-  source = "registry.coder.com/modules/coder/jetbrains/coder"
-
-  # JetBrains IDEs to make available for the user to select
-  jetbrains_ides = ["IU", "PY", "WS", "PS", "RD", "CL", "GO", "RM"]
-  default        = "IU"
-
-  # Default folder to open when starting a JetBrains IDE
-  folder = "/home/coder"
-
-  # 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      = 2
+module "jetbrains" {
+  count    = data.coder_workspace.me.start_count
+  source   = "registry.coder.com/modules/coder/jetbrains/coder"
+  version  = "1.0.3"
+  agent_id = coder_agent.main.id
+  folder   = "/home/coder"
 }
 
 resource "digitalocean_volume" "home_volume" {
diff --git a/registry/coder/templates/docker-devcontainer/main.tf b/registry/coder/templates/docker-devcontainer/main.tf
index 3e9fc6241..307fac450 100644
--- a/registry/coder/templates/docker-devcontainer/main.tf
+++ b/registry/coder/templates/docker-devcontainer/main.tf
@@ -335,23 +335,12 @@ module "code-server" {
 }
 
 # See https://registry.coder.com/modules/coder/jetbrains
-module "jetbrains_gateway" {
-  count  = data.coder_workspace.me.start_count
-  source = "registry.coder.com/modules/coder/jetbrains/coder"
-
-  # JetBrains IDEs to make available for the user to select
-  jetbrains_ides = ["IU", "PS", "WS", "PY", "CL", "GO", "RM", "RD", "RR"]
-  default        = "IU"
-
-  # Default folder to open when starting a JetBrains IDE
-  folder = "/workspaces"
-
-  # 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      = 2
+module "jetbrains" {
+  count    = data.coder_workspace.me.start_count
+  source   = "registry.coder.com/modules/coder/jetbrains/coder"
+  version  = "1.0.3"
+  agent_id = coder_agent.main.id
+  folder   = "/home/coder"
 }
 
 resource "coder_metadata" "container_info" {
diff --git a/registry/coder/templates/docker/main.tf b/registry/coder/templates/docker/main.tf
index f166abb08..1fa78fd51 100644
--- a/registry/coder/templates/docker/main.tf
+++ b/registry/coder/templates/docker/main.tf
@@ -134,23 +134,12 @@ module "code-server" {
 }
 
 # See https://registry.coder.com/modules/coder/jetbrains
-module "jetbrains_gateway" {
-  count  = data.coder_workspace.me.start_count
-  source = "registry.coder.com/modules/coder/jetbrains/coder"
-
-  # JetBrains IDEs to make available for the user to select
-  jetbrains_ides = ["IU", "PS", "WS", "PY", "CL", "GO", "RM", "RD", "RR"]
-  default        = "IU"
-
-  # Default folder to open when starting a JetBrains IDE
-  folder = "/home/coder"
-
-  # 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      = 2
+module "jetbrains" {
+  count    = data.coder_workspace.me.start_count
+  source   = "registry.coder.com/modules/coder/jetbrains/coder"
+  version  = "1.0.3"
+  agent_id = coder_agent.main.id
+  folder   = "/home/coder"
 }
 
 resource "docker_volume" "home_volume" {
diff --git a/registry/coder/templates/gcp-devcontainer/main.tf b/registry/coder/templates/gcp-devcontainer/main.tf
index 17b8e66b1..cbe2c9988 100644
--- a/registry/coder/templates/gcp-devcontainer/main.tf
+++ b/registry/coder/templates/gcp-devcontainer/main.tf
@@ -296,23 +296,12 @@ module "code-server" {
 }
 
 # See https://registry.coder.com/modules/coder/jetbrains
-module "jetbrains_gateway" {
-  count  = data.coder_workspace.me.start_count
-  source = "registry.coder.com/coder/jetbrains/coder"
-
-  # JetBrains IDEs to make available for the user to select
-  jetbrains_ides = ["IU", "PY", "WS", "PS", "RD", "CL", "GO", "RM"]
-  default        = "IU"
-
-  # Default folder to open when starting a JetBrains IDE
-  folder = "/workspaces"
-
-  # 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      = 2
+module "jetbrains" {
+  count    = data.coder_workspace.me.start_count
+  source   = "registry.coder.com/modules/coder/jetbrains/coder"
+  version  = "1.0.3"
+  agent_id = coder_agent.main.id
+  folder   = "/home/coder"
 }
 
 # Create metadata for the workspace and home disk.
diff --git a/registry/coder/templates/gcp-linux/main.tf b/registry/coder/templates/gcp-linux/main.tf
index dc1a5ba69..a42b82524 100644
--- a/registry/coder/templates/gcp-linux/main.tf
+++ b/registry/coder/templates/gcp-linux/main.tf
@@ -104,23 +104,12 @@ module "code-server" {
 }
 
 # See https://registry.coder.com/modules/coder/jetbrains
-module "jetbrains_gateway" {
-  count  = data.coder_workspace.me.start_count
-  source = "registry.coder.com/modules/coder/jetbrains/coder"
-
-  # JetBrains IDEs to make available for the user to select
-  jetbrains_ides = ["IU", "PY", "WS", "PS", "RD", "CL", "GO", "RM"]
-  default        = "IU"
-
-  # Default folder to open when starting a JetBrains IDE
-  folder = "/home/coder"
-
-  # 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      = 2
+module "jetbrains" {
+  count    = data.coder_workspace.me.start_count
+  source   = "registry.coder.com/modules/coder/jetbrains/coder"
+  version  = "1.0.3"
+  agent_id = coder_agent.main.id
+  folder   = "/home/coder"
 }
 
 resource "google_compute_instance" "dev" {
diff --git a/registry/coder/templates/gcp-vm-container/main.tf b/registry/coder/templates/gcp-vm-container/main.tf
index c54fe29f7..ec4e381f5 100644
--- a/registry/coder/templates/gcp-vm-container/main.tf
+++ b/registry/coder/templates/gcp-vm-container/main.tf
@@ -57,23 +57,12 @@ module "code-server" {
 }
 
 # See https://registry.coder.com/modules/coder/jetbrains
-module "jetbrains_gateway" {
-  count  = data.coder_workspace.me.start_count
-  source = "registry.coder.com/modules/coder/jetbrains/coder"
-
-  # JetBrains IDEs to make available for the user to select
-  jetbrains_ides = ["IU", "PY", "WS", "PS", "RD", "CL", "GO", "RM"]
-  default        = "IU"
-
-  # Default folder to open when starting a JetBrains IDE
-  folder = "/home/coder"
-
-  # 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      = 2
+module "jetbrains" {
+  count    = data.coder_workspace.me.start_count
+  source   = "registry.coder.com/modules/coder/jetbrains/coder"
+  version  = "1.0.3"
+  agent_id = coder_agent.main.id
+  folder   = "/home/coder"
 }
 
 # See https://registry.terraform.io/modules/terraform-google-modules/container-vm
diff --git a/registry/coder/templates/kubernetes-devcontainer/main.tf b/registry/coder/templates/kubernetes-devcontainer/main.tf
index 783fcf019..02975e7db 100644
--- a/registry/coder/templates/kubernetes-devcontainer/main.tf
+++ b/registry/coder/templates/kubernetes-devcontainer/main.tf
@@ -427,23 +427,12 @@ module "code-server" {
 }
 
 # See https://registry.coder.com/modules/coder/jetbrains
-module "jetbrains_gateway" {
-  count  = data.coder_workspace.me.start_count
-  source = "registry.coder.com/modules/coder/jetbrains/coder"
-
-  # JetBrains IDEs to make available for the user to select
-  jetbrains_ides = ["IU", "PY", "WS", "PS", "RD", "CL", "GO", "RM"]
-  default        = "IU"
-
-  # Default folder to open when starting a JetBrains IDE
-  folder = "/home/coder"
-
-  # 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      = 2
+module "jetbrains" {
+  count    = data.coder_workspace.me.start_count
+  source   = "registry.coder.com/modules/coder/jetbrains/coder"
+  version  = "1.0.3"
+  agent_id = coder_agent.main.id
+  folder   = "/home/coder"
 }
 
 resource "coder_metadata" "container_info" {
diff --git a/registry/coder/templates/kubernetes-envbox/main.tf b/registry/coder/templates/kubernetes-envbox/main.tf
index 83aaf718b..650d1c96a 100644
--- a/registry/coder/templates/kubernetes-envbox/main.tf
+++ b/registry/coder/templates/kubernetes-envbox/main.tf
@@ -111,23 +111,12 @@ module "code-server" {
 }
 
 # See https://registry.coder.com/modules/coder/jetbrains
-module "jetbrains_gateway" {
-  count  = data.coder_workspace.me.start_count
-  source = "registry.coder.com/modules/coder/jetbrains/coder"
-
-  # JetBrains IDEs to make available for the user to select
-  jetbrains_ides = ["IU", "PY", "WS", "PS", "RD", "CL", "GO", "RM"]
-  default        = "IU"
-
-  # Default folder to open when starting a JetBrains IDE
-  folder = "/home/coder"
-
-  # 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      = 2
+module "jetbrains" {
+  count    = data.coder_workspace.me.start_count
+  source   = "registry.coder.com/modules/coder/jetbrains/coder"
+  version  = "1.0.3"
+  agent_id = coder_agent.main.id
+  folder   = "/home/coder"
 }
 
 resource "kubernetes_persistent_volume_claim" "home" {

From 13b2e0624f821c733444b233dc3a6798967bada4 Mon Sep 17 00:00:00 2001
From: "blink-so[bot]" <211532188+blink-so[bot]@users.noreply.github.com>
Date: Wed, 27 Aug 2025 18:56:08 +0000
Subject: [PATCH 3/6] Fix folder paths to match original values

- Restore /workspaces for devcontainer templates
- Restore /home/coder/projects for coder-labs tasks-docker
- Keep /home/coder for other templates

Co-authored-by: AtifUpdate <U04T3LN8ASU+AtifUpdate@users.noreply.github.com>
---
 registry/coder-labs/templates/tasks-docker/main.tf   | 2 +-
 registry/coder/templates/docker-devcontainer/main.tf | 2 +-
 registry/coder/templates/gcp-devcontainer/main.tf    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/registry/coder-labs/templates/tasks-docker/main.tf b/registry/coder-labs/templates/tasks-docker/main.tf
index e358addd6..e801300a6 100644
--- a/registry/coder-labs/templates/tasks-docker/main.tf
+++ b/registry/coder-labs/templates/tasks-docker/main.tf
@@ -326,7 +326,7 @@ module "jetbrains" {
   source   = "registry.coder.com/modules/coder/jetbrains/coder"
   version  = "1.0.3"
   agent_id = coder_agent.main.id
-  folder   = "/home/coder"
+  folder   = "/home/coder/projects"
 }
 
 resource "docker_volume" "home_volume" {
diff --git a/registry/coder/templates/docker-devcontainer/main.tf b/registry/coder/templates/docker-devcontainer/main.tf
index 307fac450..ce529aa9f 100644
--- a/registry/coder/templates/docker-devcontainer/main.tf
+++ b/registry/coder/templates/docker-devcontainer/main.tf
@@ -340,7 +340,7 @@ module "jetbrains" {
   source   = "registry.coder.com/modules/coder/jetbrains/coder"
   version  = "1.0.3"
   agent_id = coder_agent.main.id
-  folder   = "/home/coder"
+  folder   = "/workspaces"
 }
 
 resource "coder_metadata" "container_info" {
diff --git a/registry/coder/templates/gcp-devcontainer/main.tf b/registry/coder/templates/gcp-devcontainer/main.tf
index cbe2c9988..27bce1eef 100644
--- a/registry/coder/templates/gcp-devcontainer/main.tf
+++ b/registry/coder/templates/gcp-devcontainer/main.tf
@@ -301,7 +301,7 @@ module "jetbrains" {
   source   = "registry.coder.com/modules/coder/jetbrains/coder"
   version  = "1.0.3"
   agent_id = coder_agent.main.id
-  folder   = "/home/coder"
+  folder   = "/workspaces"
 }
 
 # Create metadata for the workspace and home disk.

From 5cbc5454789810f6f60d7711330b95117c205f11 Mon Sep 17 00:00:00 2001
From: "blink-so[bot]" <211532188+blink-so[bot]@users.noreply.github.com>
Date: Wed, 27 Aug 2025 18:58:47 +0000
Subject: [PATCH 4/6] Update jetbrains module version to ~> 1.0

---
 registry/coder-labs/templates/tasks-docker/main.tf       | 2 +-
 registry/coder/templates/aws-linux/main.tf               | 2 +-
 registry/coder/templates/azure-linux/main.tf             | 2 +-
 registry/coder/templates/digitalocean-linux/main.tf      | 2 +-
 registry/coder/templates/docker-devcontainer/main.tf     | 2 +-
 registry/coder/templates/docker/main.tf                  | 2 +-
 registry/coder/templates/gcp-devcontainer/main.tf        | 2 +-
 registry/coder/templates/gcp-linux/main.tf               | 2 +-
 registry/coder/templates/gcp-vm-container/main.tf        | 2 +-
 registry/coder/templates/kubernetes-devcontainer/main.tf | 2 +-
 registry/coder/templates/kubernetes-envbox/main.tf       | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/registry/coder-labs/templates/tasks-docker/main.tf b/registry/coder-labs/templates/tasks-docker/main.tf
index e801300a6..157923e78 100644
--- a/registry/coder-labs/templates/tasks-docker/main.tf
+++ b/registry/coder-labs/templates/tasks-docker/main.tf
@@ -324,7 +324,7 @@ module "cursor" {
 module "jetbrains" {
   count    = data.coder_workspace.me.start_count
   source   = "registry.coder.com/modules/coder/jetbrains/coder"
-  version  = "1.0.3"
+  version  = "~> 1.0"
   agent_id = coder_agent.main.id
   folder   = "/home/coder/projects"
 }
diff --git a/registry/coder/templates/aws-linux/main.tf b/registry/coder/templates/aws-linux/main.tf
index 303336d7d..d6e8ce442 100644
--- a/registry/coder/templates/aws-linux/main.tf
+++ b/registry/coder/templates/aws-linux/main.tf
@@ -209,7 +209,7 @@ module "code-server" {
 module "jetbrains" {
   count    = data.coder_workspace.me.start_count
   source   = "registry.coder.com/modules/coder/jetbrains/coder"
-  version  = "1.0.3"
+  version  = "~> 1.0"
   agent_id = coder_agent.dev[0].id
   folder   = "/home/coder"
 }
diff --git a/registry/coder/templates/azure-linux/main.tf b/registry/coder/templates/azure-linux/main.tf
index 465ffe91f..4f0eb7288 100644
--- a/registry/coder/templates/azure-linux/main.tf
+++ b/registry/coder/templates/azure-linux/main.tf
@@ -152,7 +152,7 @@ module "code-server" {
 module "jetbrains" {
   count    = data.coder_workspace.me.start_count
   source   = "registry.coder.com/modules/coder/jetbrains/coder"
-  version  = "1.0.3"
+  version  = "~> 1.0"
   agent_id = coder_agent.main.id
   folder   = "/home/coder"
 }
diff --git a/registry/coder/templates/digitalocean-linux/main.tf b/registry/coder/templates/digitalocean-linux/main.tf
index c4395a775..d79f5085f 100644
--- a/registry/coder/templates/digitalocean-linux/main.tf
+++ b/registry/coder/templates/digitalocean-linux/main.tf
@@ -280,7 +280,7 @@ module "code-server" {
 module "jetbrains" {
   count    = data.coder_workspace.me.start_count
   source   = "registry.coder.com/modules/coder/jetbrains/coder"
-  version  = "1.0.3"
+  version  = "~> 1.0"
   agent_id = coder_agent.main.id
   folder   = "/home/coder"
 }
diff --git a/registry/coder/templates/docker-devcontainer/main.tf b/registry/coder/templates/docker-devcontainer/main.tf
index ce529aa9f..b3e44d5a0 100644
--- a/registry/coder/templates/docker-devcontainer/main.tf
+++ b/registry/coder/templates/docker-devcontainer/main.tf
@@ -338,7 +338,7 @@ module "code-server" {
 module "jetbrains" {
   count    = data.coder_workspace.me.start_count
   source   = "registry.coder.com/modules/coder/jetbrains/coder"
-  version  = "1.0.3"
+  version  = "~> 1.0"
   agent_id = coder_agent.main.id
   folder   = "/workspaces"
 }
diff --git a/registry/coder/templates/docker/main.tf b/registry/coder/templates/docker/main.tf
index 1fa78fd51..6f1c84d79 100644
--- a/registry/coder/templates/docker/main.tf
+++ b/registry/coder/templates/docker/main.tf
@@ -137,7 +137,7 @@ module "code-server" {
 module "jetbrains" {
   count    = data.coder_workspace.me.start_count
   source   = "registry.coder.com/modules/coder/jetbrains/coder"
-  version  = "1.0.3"
+  version  = "~> 1.0"
   agent_id = coder_agent.main.id
   folder   = "/home/coder"
 }
diff --git a/registry/coder/templates/gcp-devcontainer/main.tf b/registry/coder/templates/gcp-devcontainer/main.tf
index 27bce1eef..f41391cf2 100644
--- a/registry/coder/templates/gcp-devcontainer/main.tf
+++ b/registry/coder/templates/gcp-devcontainer/main.tf
@@ -299,7 +299,7 @@ module "code-server" {
 module "jetbrains" {
   count    = data.coder_workspace.me.start_count
   source   = "registry.coder.com/modules/coder/jetbrains/coder"
-  version  = "1.0.3"
+  version  = "~> 1.0"
   agent_id = coder_agent.main.id
   folder   = "/workspaces"
 }
diff --git a/registry/coder/templates/gcp-linux/main.tf b/registry/coder/templates/gcp-linux/main.tf
index a42b82524..95be03ddc 100644
--- a/registry/coder/templates/gcp-linux/main.tf
+++ b/registry/coder/templates/gcp-linux/main.tf
@@ -107,7 +107,7 @@ module "code-server" {
 module "jetbrains" {
   count    = data.coder_workspace.me.start_count
   source   = "registry.coder.com/modules/coder/jetbrains/coder"
-  version  = "1.0.3"
+  version  = "~> 1.0"
   agent_id = coder_agent.main.id
   folder   = "/home/coder"
 }
diff --git a/registry/coder/templates/gcp-vm-container/main.tf b/registry/coder/templates/gcp-vm-container/main.tf
index ec4e381f5..c436b8881 100644
--- a/registry/coder/templates/gcp-vm-container/main.tf
+++ b/registry/coder/templates/gcp-vm-container/main.tf
@@ -60,7 +60,7 @@ module "code-server" {
 module "jetbrains" {
   count    = data.coder_workspace.me.start_count
   source   = "registry.coder.com/modules/coder/jetbrains/coder"
-  version  = "1.0.3"
+  version  = "~> 1.0"
   agent_id = coder_agent.main.id
   folder   = "/home/coder"
 }
diff --git a/registry/coder/templates/kubernetes-devcontainer/main.tf b/registry/coder/templates/kubernetes-devcontainer/main.tf
index 02975e7db..cd6dc1f30 100644
--- a/registry/coder/templates/kubernetes-devcontainer/main.tf
+++ b/registry/coder/templates/kubernetes-devcontainer/main.tf
@@ -430,7 +430,7 @@ module "code-server" {
 module "jetbrains" {
   count    = data.coder_workspace.me.start_count
   source   = "registry.coder.com/modules/coder/jetbrains/coder"
-  version  = "1.0.3"
+  version  = "~> 1.0"
   agent_id = coder_agent.main.id
   folder   = "/home/coder"
 }
diff --git a/registry/coder/templates/kubernetes-envbox/main.tf b/registry/coder/templates/kubernetes-envbox/main.tf
index 650d1c96a..66cb31761 100644
--- a/registry/coder/templates/kubernetes-envbox/main.tf
+++ b/registry/coder/templates/kubernetes-envbox/main.tf
@@ -114,7 +114,7 @@ module "code-server" {
 module "jetbrains" {
   count    = data.coder_workspace.me.start_count
   source   = "registry.coder.com/modules/coder/jetbrains/coder"
-  version  = "1.0.3"
+  version  = "~> 1.0"
   agent_id = coder_agent.main.id
   folder   = "/home/coder"
 }

From 0a7052e16519f86db259719fd5d8555e34c0a04b Mon Sep 17 00:00:00 2001
From: "blink-so[bot]" <211532188+blink-so[bot]@users.noreply.github.com>
Date: Wed, 27 Aug 2025 19:06:18 +0000
Subject: [PATCH 5/6] Add agent_name parameter to jetbrains modules

Restore agent_name parameter that existed in original jetbrains_gateway modules:
- "dev" for aws-linux template
- "main" for all other templates

Co-authored-by: AtifUpdate <U04T3LN8ASU+AtifUpdate@users.noreply.github.com>
---
 registry/coder-labs/templates/tasks-docker/main.tf    | 11 +++++++++++
 registry/coder/templates/aws-devcontainer/main.tf     |  1 +
 registry/coder/templates/aws-linux/main.tf            |  2 ++
 registry/coder/templates/azure-linux/main.tf          |  2 ++
 registry/coder/templates/azure-windows/main.tf        |  1 +
 registry/coder/templates/digitalocean-linux/main.tf   |  2 ++
 registry/coder/templates/docker-devcontainer/main.tf  |  2 ++
 registry/coder/templates/docker/main.tf               |  2 ++
 registry/coder/templates/gcp-devcontainer/main.tf     |  2 ++
 registry/coder/templates/gcp-linux/main.tf            |  2 ++
 registry/coder/templates/gcp-vm-container/main.tf     |  3 +++
 .../coder/templates/kubernetes-devcontainer/main.tf   |  2 ++
 registry/coder/templates/kubernetes-envbox/main.tf    |  2 ++
 registry/coder/templates/kubernetes/main.tf           |  1 +
 registry/coder/templates/nomad-docker/main.tf         |  1 +
 registry/coder/templates/scratch/main.tf              |  3 +++
 16 files changed, 39 insertions(+)

diff --git a/registry/coder-labs/templates/tasks-docker/main.tf b/registry/coder-labs/templates/tasks-docker/main.tf
index 157923e78..5a829902a 100644
--- a/registry/coder-labs/templates/tasks-docker/main.tf
+++ b/registry/coder-labs/templates/tasks-docker/main.tf
@@ -24,6 +24,7 @@ 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,6 +46,7 @@ variable "anthropic_api_key" {
 }
 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
 }
@@ -175,16 +177,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
 }
 resource "coder_env" "app_status_slug" {
   agent_id = coder_agent.main.id
+  agent_name = "main"
   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
 }
@@ -297,6 +302,7 @@ module "code-server" {
   version = "~> 1.0"
 
   agent_id = coder_agent.main.id
+  agent_name = "main"
   order    = 1
 }
 
@@ -305,6 +311,7 @@ module "vscode" {
   source   = "registry.coder.com/coder/vscode-desktop/coder"
   version  = "1.1.0"
   agent_id = coder_agent.main.id
+  agent_name = "main"
 }
 
 module "windsurf" {
@@ -312,6 +319,7 @@ module "windsurf" {
   source   = "registry.coder.com/coder/windsurf/coder"
   version  = "1.1.0"
   agent_id = coder_agent.main.id
+  agent_name = "main"
 }
 
 module "cursor" {
@@ -319,6 +327,7 @@ module "cursor" {
   source   = "registry.coder.com/coder/cursor/coder"
   version  = "1.2.0"
   agent_id = coder_agent.main.id
+  agent_name = "main"
 }
 
 module "jetbrains" {
@@ -326,6 +335,7 @@ module "jetbrains" {
   source   = "registry.coder.com/modules/coder/jetbrains/coder"
   version  = "~> 1.0"
   agent_id = coder_agent.main.id
+  agent_name = "main"
   folder   = "/home/coder/projects"
 }
 
@@ -358,6 +368,7 @@ 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"
diff --git a/registry/coder/templates/aws-devcontainer/main.tf b/registry/coder/templates/aws-devcontainer/main.tf
index b23b9a65a..dd15dcfe7 100644
--- a/registry/coder/templates/aws-devcontainer/main.tf
+++ b/registry/coder/templates/aws-devcontainer/main.tf
@@ -328,4 +328,5 @@ 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.dev[0].id
+  agent_name = "dev"
 }
diff --git a/registry/coder/templates/aws-linux/main.tf b/registry/coder/templates/aws-linux/main.tf
index d6e8ce442..d7fa392af 100644
--- a/registry/coder/templates/aws-linux/main.tf
+++ b/registry/coder/templates/aws-linux/main.tf
@@ -202,6 +202,7 @@ module "code-server" {
   version = "~> 1.0"
 
   agent_id = coder_agent.dev[0].id
+  agent_name = "dev"
   order    = 1
 }
 
@@ -211,6 +212,7 @@ module "jetbrains" {
   source   = "registry.coder.com/modules/coder/jetbrains/coder"
   version  = "~> 1.0"
   agent_id = coder_agent.dev[0].id
+  agent_name = "dev"
   folder   = "/home/coder"
 }
 
diff --git a/registry/coder/templates/azure-linux/main.tf b/registry/coder/templates/azure-linux/main.tf
index 4f0eb7288..d490e2065 100644
--- a/registry/coder/templates/azure-linux/main.tf
+++ b/registry/coder/templates/azure-linux/main.tf
@@ -145,6 +145,7 @@ module "code-server" {
   version = "~> 1.0"
 
   agent_id = coder_agent.main.id
+  agent_name = "main"
   order    = 1
 }
 
@@ -154,6 +155,7 @@ module "jetbrains" {
   source   = "registry.coder.com/modules/coder/jetbrains/coder"
   version  = "~> 1.0"
   agent_id = coder_agent.main.id
+  agent_name = "main"
   folder   = "/home/coder"
 }
 
diff --git a/registry/coder/templates/azure-windows/main.tf b/registry/coder/templates/azure-windows/main.tf
index 65447a777..7b4c06fba 100644
--- a/registry/coder/templates/azure-windows/main.tf
+++ b/registry/coder/templates/azure-windows/main.tf
@@ -37,6 +37,7 @@ module "windows_rdp" {
   admin_password = random_password.admin_password.result
 
   agent_id    = resource.coder_agent.main.id
+  agent_name = "main"
   resource_id = null # Unused, to be removed in a future version
 }
 
diff --git a/registry/coder/templates/digitalocean-linux/main.tf b/registry/coder/templates/digitalocean-linux/main.tf
index d79f5085f..381003c1b 100644
--- a/registry/coder/templates/digitalocean-linux/main.tf
+++ b/registry/coder/templates/digitalocean-linux/main.tf
@@ -273,6 +273,7 @@ module "code-server" {
   version = "~> 1.0"
 
   agent_id = coder_agent.main.id
+  agent_name = "main"
   order    = 1
 }
 
@@ -282,6 +283,7 @@ module "jetbrains" {
   source   = "registry.coder.com/modules/coder/jetbrains/coder"
   version  = "~> 1.0"
   agent_id = coder_agent.main.id
+  agent_name = "main"
   folder   = "/home/coder"
 }
 
diff --git a/registry/coder/templates/docker-devcontainer/main.tf b/registry/coder/templates/docker-devcontainer/main.tf
index b3e44d5a0..e8ebad1f6 100644
--- a/registry/coder/templates/docker-devcontainer/main.tf
+++ b/registry/coder/templates/docker-devcontainer/main.tf
@@ -331,6 +331,7 @@ module "code-server" {
   version = "~> 1.0"
 
   agent_id = coder_agent.main.id
+  agent_name = "main"
   order    = 1
 }
 
@@ -340,6 +341,7 @@ module "jetbrains" {
   source   = "registry.coder.com/modules/coder/jetbrains/coder"
   version  = "~> 1.0"
   agent_id = coder_agent.main.id
+  agent_name = "main"
   folder   = "/workspaces"
 }
 
diff --git a/registry/coder/templates/docker/main.tf b/registry/coder/templates/docker/main.tf
index 6f1c84d79..c45f590e6 100644
--- a/registry/coder/templates/docker/main.tf
+++ b/registry/coder/templates/docker/main.tf
@@ -130,6 +130,7 @@ module "code-server" {
   version = "~> 1.0"
 
   agent_id = coder_agent.main.id
+  agent_name = "main"
   order    = 1
 }
 
@@ -139,6 +140,7 @@ module "jetbrains" {
   source   = "registry.coder.com/modules/coder/jetbrains/coder"
   version  = "~> 1.0"
   agent_id = coder_agent.main.id
+  agent_name = "main"
   folder   = "/home/coder"
 }
 
diff --git a/registry/coder/templates/gcp-devcontainer/main.tf b/registry/coder/templates/gcp-devcontainer/main.tf
index f41391cf2..6e20a3f5d 100644
--- a/registry/coder/templates/gcp-devcontainer/main.tf
+++ b/registry/coder/templates/gcp-devcontainer/main.tf
@@ -292,6 +292,7 @@ module "code-server" {
   version = "~> 1.0"
 
   agent_id = coder_agent.main.id
+  agent_name = "main"
   order    = 1
 }
 
@@ -301,6 +302,7 @@ module "jetbrains" {
   source   = "registry.coder.com/modules/coder/jetbrains/coder"
   version  = "~> 1.0"
   agent_id = coder_agent.main.id
+  agent_name = "main"
   folder   = "/workspaces"
 }
 
diff --git a/registry/coder/templates/gcp-linux/main.tf b/registry/coder/templates/gcp-linux/main.tf
index 95be03ddc..8006bd2c4 100644
--- a/registry/coder/templates/gcp-linux/main.tf
+++ b/registry/coder/templates/gcp-linux/main.tf
@@ -100,6 +100,7 @@ module "code-server" {
   version = "~> 1.0"
 
   agent_id = coder_agent.main.id
+  agent_name = "main"
   order    = 1
 }
 
@@ -109,6 +110,7 @@ module "jetbrains" {
   source   = "registry.coder.com/modules/coder/jetbrains/coder"
   version  = "~> 1.0"
   agent_id = coder_agent.main.id
+  agent_name = "main"
   folder   = "/home/coder"
 }
 
diff --git a/registry/coder/templates/gcp-vm-container/main.tf b/registry/coder/templates/gcp-vm-container/main.tf
index c436b8881..04aa2547d 100644
--- a/registry/coder/templates/gcp-vm-container/main.tf
+++ b/registry/coder/templates/gcp-vm-container/main.tf
@@ -53,6 +53,7 @@ module "code-server" {
   version = "~> 1.0"
 
   agent_id = coder_agent.main.id
+  agent_name = "main"
   order    = 1
 }
 
@@ -62,6 +63,7 @@ module "jetbrains" {
   source   = "registry.coder.com/modules/coder/jetbrains/coder"
   version  = "~> 1.0"
   agent_id = coder_agent.main.id
+  agent_name = "main"
   folder   = "/home/coder"
 }
 
@@ -111,6 +113,7 @@ resource "google_compute_instance" "dev" {
 resource "coder_agent_instance" "dev" {
   count       = data.coder_workspace.me.start_count
   agent_id    = coder_agent.main.id
+  agent_name = "main"
   instance_id = google_compute_instance.dev[0].instance_id
 }
 
diff --git a/registry/coder/templates/kubernetes-devcontainer/main.tf b/registry/coder/templates/kubernetes-devcontainer/main.tf
index cd6dc1f30..7e528fed6 100644
--- a/registry/coder/templates/kubernetes-devcontainer/main.tf
+++ b/registry/coder/templates/kubernetes-devcontainer/main.tf
@@ -423,6 +423,7 @@ module "code-server" {
   version = "~> 1.0"
 
   agent_id = coder_agent.main.id
+  agent_name = "main"
   order    = 1
 }
 
@@ -432,6 +433,7 @@ module "jetbrains" {
   source   = "registry.coder.com/modules/coder/jetbrains/coder"
   version  = "~> 1.0"
   agent_id = coder_agent.main.id
+  agent_name = "main"
   folder   = "/home/coder"
 }
 
diff --git a/registry/coder/templates/kubernetes-envbox/main.tf b/registry/coder/templates/kubernetes-envbox/main.tf
index 66cb31761..08a8c0755 100644
--- a/registry/coder/templates/kubernetes-envbox/main.tf
+++ b/registry/coder/templates/kubernetes-envbox/main.tf
@@ -107,6 +107,7 @@ module "code-server" {
   version = "~> 1.0"
 
   agent_id = coder_agent.main.id
+  agent_name = "main"
   order    = 1
 }
 
@@ -116,6 +117,7 @@ module "jetbrains" {
   source   = "registry.coder.com/modules/coder/jetbrains/coder"
   version  = "~> 1.0"
   agent_id = coder_agent.main.id
+  agent_name = "main"
   folder   = "/home/coder"
 }
 
diff --git a/registry/coder/templates/kubernetes/main.tf b/registry/coder/templates/kubernetes/main.tf
index e1fdb12cb..d7b9d7dc8 100644
--- a/registry/coder/templates/kubernetes/main.tf
+++ b/registry/coder/templates/kubernetes/main.tf
@@ -177,6 +177,7 @@ resource "coder_agent" "main" {
 # code-server
 resource "coder_app" "code-server" {
   agent_id     = coder_agent.main.id
+  agent_name = "main"
   slug         = "code-server"
   display_name = "code-server"
   icon         = "/icon/code.svg"
diff --git a/registry/coder/templates/nomad-docker/main.tf b/registry/coder/templates/nomad-docker/main.tf
index 9fc508930..b1b36d119 100644
--- a/registry/coder/templates/nomad-docker/main.tf
+++ b/registry/coder/templates/nomad-docker/main.tf
@@ -119,6 +119,7 @@ module "code-server" {
   version = "~> 1.0"
 
   agent_id = coder_agent.main.id
+  agent_name = "main"
   order    = 1
 }
 
diff --git a/registry/coder/templates/scratch/main.tf b/registry/coder/templates/scratch/main.tf
index 4f5654720..112b8d71f 100644
--- a/registry/coder/templates/scratch/main.tf
+++ b/registry/coder/templates/scratch/main.tf
@@ -35,6 +35,7 @@ resource "coder_agent" "main" {
 # details: https://registry.terraform.io/providers/coder/coder/latest/docs/resources/env
 resource "coder_env" "welcome_message" {
   agent_id = coder_agent.main.id
+  agent_name = "main"
   name     = "WELCOME_MESSAGE"
   value    = "Welcome to your Coder workspace!"
 }
@@ -49,12 +50,14 @@ module "code-server" {
   version = "~> 1.0"
 
   agent_id = coder_agent.main.id
+  agent_name = "main"
 }
 
 # Runs a script at workspace start/stop or on a cron schedule
 # details: https://registry.terraform.io/providers/coder/coder/latest/docs/resources/script
 resource "coder_script" "startup_script" {
   agent_id           = coder_agent.main.id
+  agent_name = "main"
   display_name       = "Startup Script"
   script             = <<-EOF
     #!/bin/sh

From 08de97d4db6d88798033ca09de5454f0a74e713c Mon Sep 17 00:00:00 2001
From: "blink-so[bot]" <211532188+blink-so[bot]@users.noreply.github.com>
Date: Fri, 29 Aug 2025 12:32:19 +0000
Subject: [PATCH 6/6] Fix Terraform formatting

Run terraform fmt -recursive to fix alignment and formatting issues
identified by CI formatting validation.

Co-authored-by: AtifUpdate <U04T3LN8ASU+AtifUpdate@users.noreply.github.com>
---
 .../coder-labs/templates/tasks-docker/main.tf | 66 +++++++++----------
 .../coder/templates/aws-devcontainer/main.tf  |  4 +-
 registry/coder/templates/aws-linux/main.tf    | 14 ++--
 registry/coder/templates/azure-linux/main.tf  | 14 ++--
 .../coder/templates/azure-windows/main.tf     |  2 +-
 .../templates/digitalocean-linux/main.tf      | 14 ++--
 .../templates/docker-devcontainer/main.tf     | 14 ++--
 registry/coder/templates/docker/main.tf       | 14 ++--
 .../coder/templates/gcp-devcontainer/main.tf  | 14 ++--
 registry/coder/templates/gcp-linux/main.tf    | 14 ++--
 .../coder/templates/gcp-vm-container/main.tf  | 16 ++---
 .../templates/kubernetes-devcontainer/main.tf | 14 ++--
 .../coder/templates/kubernetes-envbox/main.tf | 14 ++--
 registry/coder/templates/kubernetes/main.tf   |  2 +-
 registry/coder/templates/nomad-docker/main.tf |  4 +-
 registry/coder/templates/scratch/main.tf      | 10 +--
 16 files changed, 115 insertions(+), 115 deletions(-)

diff --git a/registry/coder-labs/templates/tasks-docker/main.tf b/registry/coder-labs/templates/tasks-docker/main.tf
index 5a829902a..4d3c7136d 100644
--- a/registry/coder-labs/templates/tasks-docker/main.tf
+++ b/registry/coder-labs/templates/tasks-docker/main.tf
@@ -24,7 +24,7 @@ module "claude-code" {
   source              = "registry.coder.com/coder/claude-code/coder"
   version             = "2.0.0"
   agent_id            = coder_agent.main.id
-  agent_name = "main"
+  agent_name          = "main"
   folder              = "/home/coder/projects"
   install_claude_code = true
   claude_code_version = "latest"
@@ -45,10 +45,10 @@ variable "anthropic_api_key" {
   sensitive   = true
 }
 resource "coder_env" "anthropic_api_key" {
-  agent_id = coder_agent.main.id
+  agent_id   = coder_agent.main.id
   agent_name = "main"
-  name     = "CODER_MCP_CLAUDE_API_KEY"
-  value    = var.anthropic_api_key
+  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 +176,22 @@ data "coder_parameter" "preview_port" {
 
 # Other variables for Claude Code
 resource "coder_env" "claude_task_prompt" {
-  agent_id = coder_agent.main.id
+  agent_id   = coder_agent.main.id
   agent_name = "main"
-  name     = "CODER_MCP_CLAUDE_TASK_PROMPT"
-  value    = data.coder_parameter.ai_prompt.value
+  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_id   = coder_agent.main.id
   agent_name = "main"
-  name     = "CODER_MCP_APP_STATUS_SLUG"
-  value    = "ccw"
+  name       = "CODER_MCP_APP_STATUS_SLUG"
+  value      = "ccw"
 }
 resource "coder_env" "claude_system_prompt" {
-  agent_id = coder_agent.main.id
+  agent_id   = coder_agent.main.id
   agent_name = "main"
-  name     = "CODER_MCP_CLAUDE_SYSTEM_PROMPT"
-  value    = data.coder_parameter.system_prompt.value
+  name       = "CODER_MCP_CLAUDE_SYSTEM_PROMPT"
+  value      = data.coder_parameter.system_prompt.value
 }
 
 data "coder_provisioner" "me" {}
@@ -301,42 +301,42 @@ 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_id   = coder_agent.main.id
   agent_name = "main"
-  order    = 1
+  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
+  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"
 }
 
 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
+  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"
 }
 
 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
+  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"
 }
 
 module "jetbrains" {
-  count    = data.coder_workspace.me.start_count
-  source   = "registry.coder.com/modules/coder/jetbrains/coder"
-  version  = "~> 1.0"
-  agent_id = coder_agent.main.id
+  count      = data.coder_workspace.me.start_count
+  source     = "registry.coder.com/modules/coder/jetbrains/coder"
+  version    = "~> 1.0"
+  agent_id   = coder_agent.main.id
   agent_name = "main"
-  folder   = "/home/coder/projects"
+  folder     = "/home/coder/projects"
 }
 
 resource "docker_volume" "home_volume" {
@@ -368,7 +368,7 @@ resource "docker_volume" "home_volume" {
 
 resource "coder_app" "preview" {
   agent_id     = coder_agent.main.id
-  agent_name = "main"
+  agent_name   = "main"
   slug         = "preview"
   display_name = "Preview your app"
   icon         = "${data.coder_workspace.me.access_url}/emojis/1f50e.png"
diff --git a/registry/coder/templates/aws-devcontainer/main.tf b/registry/coder/templates/aws-devcontainer/main.tf
index dd15dcfe7..6d42ff25a 100644
--- a/registry/coder/templates/aws-devcontainer/main.tf
+++ b/registry/coder/templates/aws-devcontainer/main.tf
@@ -326,7 +326,7 @@ module "code-server" {
   count  = data.coder_workspace.me.start_count
   source = "registry.coder.com/coder/code-server/coder"
   # 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.dev[0].id
+  version    = "~> 1.0"
+  agent_id   = coder_agent.dev[0].id
   agent_name = "dev"
 }
diff --git a/registry/coder/templates/aws-linux/main.tf b/registry/coder/templates/aws-linux/main.tf
index d7fa392af..407a4a44f 100644
--- a/registry/coder/templates/aws-linux/main.tf
+++ b/registry/coder/templates/aws-linux/main.tf
@@ -201,19 +201,19 @@ 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.dev[0].id
+  agent_id   = coder_agent.dev[0].id
   agent_name = "dev"
-  order    = 1
+  order      = 1
 }
 
 # See https://registry.coder.com/modules/coder/jetbrains
 module "jetbrains" {
-  count    = data.coder_workspace.me.start_count
-  source   = "registry.coder.com/modules/coder/jetbrains/coder"
-  version  = "~> 1.0"
-  agent_id = coder_agent.dev[0].id
+  count      = data.coder_workspace.me.start_count
+  source     = "registry.coder.com/modules/coder/jetbrains/coder"
+  version    = "~> 1.0"
+  agent_id   = coder_agent.dev[0].id
   agent_name = "dev"
-  folder   = "/home/coder"
+  folder     = "/home/coder"
 }
 
 locals {
diff --git a/registry/coder/templates/azure-linux/main.tf b/registry/coder/templates/azure-linux/main.tf
index d490e2065..bfe6d21b2 100644
--- a/registry/coder/templates/azure-linux/main.tf
+++ b/registry/coder/templates/azure-linux/main.tf
@@ -144,19 +144,19 @@ 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_id   = coder_agent.main.id
   agent_name = "main"
-  order    = 1
+  order      = 1
 }
 
 # See https://registry.coder.com/modules/coder/jetbrains
 module "jetbrains" {
-  count    = data.coder_workspace.me.start_count
-  source   = "registry.coder.com/modules/coder/jetbrains/coder"
-  version  = "~> 1.0"
-  agent_id = coder_agent.main.id
+  count      = data.coder_workspace.me.start_count
+  source     = "registry.coder.com/modules/coder/jetbrains/coder"
+  version    = "~> 1.0"
+  agent_id   = coder_agent.main.id
   agent_name = "main"
-  folder   = "/home/coder"
+  folder     = "/home/coder"
 }
 
 locals {
diff --git a/registry/coder/templates/azure-windows/main.tf b/registry/coder/templates/azure-windows/main.tf
index 7b4c06fba..b7623be5a 100644
--- a/registry/coder/templates/azure-windows/main.tf
+++ b/registry/coder/templates/azure-windows/main.tf
@@ -37,7 +37,7 @@ module "windows_rdp" {
   admin_password = random_password.admin_password.result
 
   agent_id    = resource.coder_agent.main.id
-  agent_name = "main"
+  agent_name  = "main"
   resource_id = null # Unused, to be removed in a future version
 }
 
diff --git a/registry/coder/templates/digitalocean-linux/main.tf b/registry/coder/templates/digitalocean-linux/main.tf
index 381003c1b..4bca6c2f1 100644
--- a/registry/coder/templates/digitalocean-linux/main.tf
+++ b/registry/coder/templates/digitalocean-linux/main.tf
@@ -272,19 +272,19 @@ 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_id   = coder_agent.main.id
   agent_name = "main"
-  order    = 1
+  order      = 1
 }
 
 # See https://registry.coder.com/modules/coder/jetbrains
 module "jetbrains" {
-  count    = data.coder_workspace.me.start_count
-  source   = "registry.coder.com/modules/coder/jetbrains/coder"
-  version  = "~> 1.0"
-  agent_id = coder_agent.main.id
+  count      = data.coder_workspace.me.start_count
+  source     = "registry.coder.com/modules/coder/jetbrains/coder"
+  version    = "~> 1.0"
+  agent_id   = coder_agent.main.id
   agent_name = "main"
-  folder   = "/home/coder"
+  folder     = "/home/coder"
 }
 
 resource "digitalocean_volume" "home_volume" {
diff --git a/registry/coder/templates/docker-devcontainer/main.tf b/registry/coder/templates/docker-devcontainer/main.tf
index e8ebad1f6..bb932cfd0 100644
--- a/registry/coder/templates/docker-devcontainer/main.tf
+++ b/registry/coder/templates/docker-devcontainer/main.tf
@@ -330,19 +330,19 @@ 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_id   = coder_agent.main.id
   agent_name = "main"
-  order    = 1
+  order      = 1
 }
 
 # See https://registry.coder.com/modules/coder/jetbrains
 module "jetbrains" {
-  count    = data.coder_workspace.me.start_count
-  source   = "registry.coder.com/modules/coder/jetbrains/coder"
-  version  = "~> 1.0"
-  agent_id = coder_agent.main.id
+  count      = data.coder_workspace.me.start_count
+  source     = "registry.coder.com/modules/coder/jetbrains/coder"
+  version    = "~> 1.0"
+  agent_id   = coder_agent.main.id
   agent_name = "main"
-  folder   = "/workspaces"
+  folder     = "/workspaces"
 }
 
 resource "coder_metadata" "container_info" {
diff --git a/registry/coder/templates/docker/main.tf b/registry/coder/templates/docker/main.tf
index c45f590e6..b7d0ef159 100644
--- a/registry/coder/templates/docker/main.tf
+++ b/registry/coder/templates/docker/main.tf
@@ -129,19 +129,19 @@ 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_id   = coder_agent.main.id
   agent_name = "main"
-  order    = 1
+  order      = 1
 }
 
 # See https://registry.coder.com/modules/coder/jetbrains
 module "jetbrains" {
-  count    = data.coder_workspace.me.start_count
-  source   = "registry.coder.com/modules/coder/jetbrains/coder"
-  version  = "~> 1.0"
-  agent_id = coder_agent.main.id
+  count      = data.coder_workspace.me.start_count
+  source     = "registry.coder.com/modules/coder/jetbrains/coder"
+  version    = "~> 1.0"
+  agent_id   = coder_agent.main.id
   agent_name = "main"
-  folder   = "/home/coder"
+  folder     = "/home/coder"
 }
 
 resource "docker_volume" "home_volume" {
diff --git a/registry/coder/templates/gcp-devcontainer/main.tf b/registry/coder/templates/gcp-devcontainer/main.tf
index 6e20a3f5d..87fa8b7a7 100644
--- a/registry/coder/templates/gcp-devcontainer/main.tf
+++ b/registry/coder/templates/gcp-devcontainer/main.tf
@@ -291,19 +291,19 @@ 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_id   = coder_agent.main.id
   agent_name = "main"
-  order    = 1
+  order      = 1
 }
 
 # See https://registry.coder.com/modules/coder/jetbrains
 module "jetbrains" {
-  count    = data.coder_workspace.me.start_count
-  source   = "registry.coder.com/modules/coder/jetbrains/coder"
-  version  = "~> 1.0"
-  agent_id = coder_agent.main.id
+  count      = data.coder_workspace.me.start_count
+  source     = "registry.coder.com/modules/coder/jetbrains/coder"
+  version    = "~> 1.0"
+  agent_id   = coder_agent.main.id
   agent_name = "main"
-  folder   = "/workspaces"
+  folder     = "/workspaces"
 }
 
 # Create metadata for the workspace and home disk.
diff --git a/registry/coder/templates/gcp-linux/main.tf b/registry/coder/templates/gcp-linux/main.tf
index 8006bd2c4..60fb34478 100644
--- a/registry/coder/templates/gcp-linux/main.tf
+++ b/registry/coder/templates/gcp-linux/main.tf
@@ -99,19 +99,19 @@ 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_id   = coder_agent.main.id
   agent_name = "main"
-  order    = 1
+  order      = 1
 }
 
 # See https://registry.coder.com/modules/coder/jetbrains
 module "jetbrains" {
-  count    = data.coder_workspace.me.start_count
-  source   = "registry.coder.com/modules/coder/jetbrains/coder"
-  version  = "~> 1.0"
-  agent_id = coder_agent.main.id
+  count      = data.coder_workspace.me.start_count
+  source     = "registry.coder.com/modules/coder/jetbrains/coder"
+  version    = "~> 1.0"
+  agent_id   = coder_agent.main.id
   agent_name = "main"
-  folder   = "/home/coder"
+  folder     = "/home/coder"
 }
 
 resource "google_compute_instance" "dev" {
diff --git a/registry/coder/templates/gcp-vm-container/main.tf b/registry/coder/templates/gcp-vm-container/main.tf
index 04aa2547d..b5a7aa23e 100644
--- a/registry/coder/templates/gcp-vm-container/main.tf
+++ b/registry/coder/templates/gcp-vm-container/main.tf
@@ -52,19 +52,19 @@ 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_id   = coder_agent.main.id
   agent_name = "main"
-  order    = 1
+  order      = 1
 }
 
 # See https://registry.coder.com/modules/coder/jetbrains
 module "jetbrains" {
-  count    = data.coder_workspace.me.start_count
-  source   = "registry.coder.com/modules/coder/jetbrains/coder"
-  version  = "~> 1.0"
-  agent_id = coder_agent.main.id
+  count      = data.coder_workspace.me.start_count
+  source     = "registry.coder.com/modules/coder/jetbrains/coder"
+  version    = "~> 1.0"
+  agent_id   = coder_agent.main.id
   agent_name = "main"
-  folder   = "/home/coder"
+  folder     = "/home/coder"
 }
 
 # See https://registry.terraform.io/modules/terraform-google-modules/container-vm
@@ -113,7 +113,7 @@ resource "google_compute_instance" "dev" {
 resource "coder_agent_instance" "dev" {
   count       = data.coder_workspace.me.start_count
   agent_id    = coder_agent.main.id
-  agent_name = "main"
+  agent_name  = "main"
   instance_id = google_compute_instance.dev[0].instance_id
 }
 
diff --git a/registry/coder/templates/kubernetes-devcontainer/main.tf b/registry/coder/templates/kubernetes-devcontainer/main.tf
index 7e528fed6..85d2e0c55 100644
--- a/registry/coder/templates/kubernetes-devcontainer/main.tf
+++ b/registry/coder/templates/kubernetes-devcontainer/main.tf
@@ -422,19 +422,19 @@ 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_id   = coder_agent.main.id
   agent_name = "main"
-  order    = 1
+  order      = 1
 }
 
 # See https://registry.coder.com/modules/coder/jetbrains
 module "jetbrains" {
-  count    = data.coder_workspace.me.start_count
-  source   = "registry.coder.com/modules/coder/jetbrains/coder"
-  version  = "~> 1.0"
-  agent_id = coder_agent.main.id
+  count      = data.coder_workspace.me.start_count
+  source     = "registry.coder.com/modules/coder/jetbrains/coder"
+  version    = "~> 1.0"
+  agent_id   = coder_agent.main.id
   agent_name = "main"
-  folder   = "/home/coder"
+  folder     = "/home/coder"
 }
 
 resource "coder_metadata" "container_info" {
diff --git a/registry/coder/templates/kubernetes-envbox/main.tf b/registry/coder/templates/kubernetes-envbox/main.tf
index 08a8c0755..e70ad2a39 100644
--- a/registry/coder/templates/kubernetes-envbox/main.tf
+++ b/registry/coder/templates/kubernetes-envbox/main.tf
@@ -106,19 +106,19 @@ 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_id   = coder_agent.main.id
   agent_name = "main"
-  order    = 1
+  order      = 1
 }
 
 # See https://registry.coder.com/modules/coder/jetbrains
 module "jetbrains" {
-  count    = data.coder_workspace.me.start_count
-  source   = "registry.coder.com/modules/coder/jetbrains/coder"
-  version  = "~> 1.0"
-  agent_id = coder_agent.main.id
+  count      = data.coder_workspace.me.start_count
+  source     = "registry.coder.com/modules/coder/jetbrains/coder"
+  version    = "~> 1.0"
+  agent_id   = coder_agent.main.id
   agent_name = "main"
-  folder   = "/home/coder"
+  folder     = "/home/coder"
 }
 
 resource "kubernetes_persistent_volume_claim" "home" {
diff --git a/registry/coder/templates/kubernetes/main.tf b/registry/coder/templates/kubernetes/main.tf
index d7b9d7dc8..c72316ff2 100644
--- a/registry/coder/templates/kubernetes/main.tf
+++ b/registry/coder/templates/kubernetes/main.tf
@@ -177,7 +177,7 @@ resource "coder_agent" "main" {
 # code-server
 resource "coder_app" "code-server" {
   agent_id     = coder_agent.main.id
-  agent_name = "main"
+  agent_name   = "main"
   slug         = "code-server"
   display_name = "code-server"
   icon         = "/icon/code.svg"
diff --git a/registry/coder/templates/nomad-docker/main.tf b/registry/coder/templates/nomad-docker/main.tf
index b1b36d119..9c30b7bef 100644
--- a/registry/coder/templates/nomad-docker/main.tf
+++ b/registry/coder/templates/nomad-docker/main.tf
@@ -118,9 +118,9 @@ 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_id   = coder_agent.main.id
   agent_name = "main"
-  order    = 1
+  order      = 1
 }
 
 locals {
diff --git a/registry/coder/templates/scratch/main.tf b/registry/coder/templates/scratch/main.tf
index 112b8d71f..f55ee0c3e 100644
--- a/registry/coder/templates/scratch/main.tf
+++ b/registry/coder/templates/scratch/main.tf
@@ -34,10 +34,10 @@ resource "coder_agent" "main" {
 # Use this to set environment variables in your workspace
 # details: https://registry.terraform.io/providers/coder/coder/latest/docs/resources/env
 resource "coder_env" "welcome_message" {
-  agent_id = coder_agent.main.id
+  agent_id   = coder_agent.main.id
   agent_name = "main"
-  name     = "WELCOME_MESSAGE"
-  value    = "Welcome to your Coder workspace!"
+  name       = "WELCOME_MESSAGE"
+  value      = "Welcome to your Coder workspace!"
 }
 
 # Adds code-server
@@ -49,7 +49,7 @@ 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_id   = coder_agent.main.id
   agent_name = "main"
 }
 
@@ -57,7 +57,7 @@ module "code-server" {
 # details: https://registry.terraform.io/providers/coder/coder/latest/docs/resources/script
 resource "coder_script" "startup_script" {
   agent_id           = coder_agent.main.id
-  agent_name = "main"
+  agent_name         = "main"
   display_name       = "Startup Script"
   script             = <<-EOF
     #!/bin/sh