diff --git a/base/main.tf b/base/main.tf
index 8893db1..6e1c309 100644
--- a/base/main.tf
+++ b/base/main.tf
@@ -138,19 +138,16 @@ module "code-server" {
   settings   = var.vscode_settings
 }
 
-module "jetbrains_gateway" {
-  count  = var.enable_jetbrains_gateway ? data.coder_workspace.me.start_count : 0
-  source = "registry.coder.com/modules/jetbrains-gateway/coder"
+module "jetbrains" {
+  count    = var.enable_jetbrains_gateway ? data.coder_workspace.me.start_count : 0
+  source   = "registry.coder.com/coder/jetbrains/coder"
 
-  jetbrains_ides = var.jetbrains_ides
-  default        = var.jetbrains_default
-  folder         = "/home/coder"
-  version        = ">= 1.0.0"
-  latest         = true
+  version  = ">= 1.0.0"
+  agent_id = coder_agent.main.id
+  folder   = "/home/coder"
 
-  agent_id   = coder_agent.main.id
-  agent_name = "main"
-  order      = 2
+  default  = var.jetbrains_default
+  options  = var.jetbrains_ides
 }
 
 module "filebrowser" {
diff --git a/base/variables.tf b/base/variables.tf
index 5abc632..08e179b 100644
--- a/base/variables.tf
+++ b/base/variables.tf
@@ -29,8 +29,8 @@ variable "jetbrains_ides" {
 
 variable "jetbrains_default" {
   description = "Default JetBrains IDE to launch"
-  type        = string
-  default     = ""
+  type        = set(string)
+  default     = []
 }
 
 variable "docker_socket" {
diff --git a/templates/basic/main.tf b/templates/basic/main.tf
index 8bb15fe..551d815 100644
--- a/templates/basic/main.tf
+++ b/templates/basic/main.tf
@@ -9,7 +9,7 @@ terraform {
   }
 }
 
-module "no_lang_workspace" {
+module "basic_workspace" {
   source = "git::https://git.bobert.me/anthorob/coder-templates.git//base?ref=main"
 
   docker_image = "registry.bobert.me/anthorob/coder-base:latest"