diff --git a/registry/coder/modules/jetbrains/main.test.ts b/registry/coder/modules/jetbrains/main.test.ts
index eef37c96..6be97ef1 100644
--- a/registry/coder/modules/jetbrains/main.test.ts
+++ b/registry/coder/modules/jetbrains/main.test.ts
@@ -292,7 +292,7 @@ describe("jetbrains", async () => {
       );
       const url = coder_app?.instances[0].attributes.url;
 
-      expect(url).toContain("jetbrains://gateway/com.coder.toolbox");
+      expect(url).toContain("jetbrains://gateway/coder");
       expect(url).toContain("&workspace=");
       expect(url).toContain("&owner=");
       expect(url).toContain("&folder=/custom/project/path");
@@ -300,6 +300,7 @@ describe("jetbrains", async () => {
       expect(url).toContain("&token=$SESSION_TOKEN");
       expect(url).toContain("&ide_product_code=GO");
       expect(url).toContain("&ide_build_number=");
+      expect(url).toContain("&agent_id=test-agent-123");
     });
 
     it("should include build numbers from API in URLs", async () => {
@@ -993,7 +994,7 @@ describe("jetbrains", async () => {
       for (const app of coder_apps) {
         // Should have valid URLs with build numbers
         expect(app.instances[0].attributes.url).toContain(
-          "jetbrains://gateway/com.coder.toolbox",
+          "jetbrains://gateway/coder",
         );
         expect(app.instances[0].attributes.url).toContain("ide_build_number=");
         expect(app.instances[0].attributes.url).toContain("ide_product_code=");
diff --git a/registry/coder/modules/jetbrains/main.tf b/registry/coder/modules/jetbrains/main.tf
index 39bd9dd6..fc1fc679 100644
--- a/registry/coder/modules/jetbrains/main.tf
+++ b/registry/coder/modules/jetbrains/main.tf
@@ -238,6 +238,8 @@ resource "coder_app" "jetbrains" {
     "&ide_product_code=",
     each.key,
     "&ide_build_number=",
-    local.options_metadata[each.key].build
+    local.options_metadata[each.key].build,
+    "&agent_id=",
+    var.agent_id,
   ])
 }
\ No newline at end of file