diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3b624b7..85d3762 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -227,7 +227,7 @@ In addition to the general criteria, all README files must have the following:
     ```tf
     module "cursor" {
       count    = data.coder_workspace.me.start_count
-      source   = "registry.coder.com/modules/cursor/coder"
+      source   = "registry.coder.com/coder/cursor/coder"
       version  = "1.0.19"
       agent_id = coder_agent.example.id
     }
diff --git a/README.md b/README.md
index 1e44ad9..23746bd 100644
--- a/README.md
+++ b/README.md
@@ -37,7 +37,7 @@ In both cases, the main README contains a Terraform snippet for integrating the
 ```tf
 module "cursor" {
   count    = data.coder_workspace.me.start_count
-  source   = "registry.coder.com/modules/cursor/coder"
+  source   = "registry.coder.com/coder/cursor/coder"
   version  = "1.0.19"
   agent_id = coder_agent.example.id
 }
diff --git a/cmd/readmevalidation/testSamples/sampleReadmeBody.md b/cmd/readmevalidation/testSamples/sampleReadmeBody.md
index 958fe21..9a37076 100644
--- a/cmd/readmevalidation/testSamples/sampleReadmeBody.md
+++ b/cmd/readmevalidation/testSamples/sampleReadmeBody.md
@@ -4,7 +4,7 @@ Run the [Goose](https://block.github.io/goose/) agent in your workspace to gener
 
 ```tf
 module "goose" {
-  source        = "registry.coder.com/modules/goose/coder"
+  source        = "registry.coder.com/coder/goose/coder"
   version       = "1.0.31"
   agent_id      = coder_agent.example.id
   folder        = "/home/coder"
@@ -38,7 +38,7 @@ Your workspace must have `screen` installed to use this.
 ```tf
 module "coder-login" {
   count    = data.coder_workspace.me.start_count
-  source   = "registry.coder.com/modules/coder-login/coder"
+  source   = "registry.coder.com/coder/coder-login/coder"
   version  = "1.0.15"
   agent_id = coder_agent.example.id
 }
@@ -80,7 +80,7 @@ resource "coder_agent" "main" {
 
 module "goose" {
   count         = data.coder_workspace.me.start_count
-  source        = "registry.coder.com/modules/goose/coder"
+  source        = "registry.coder.com/coder/goose/coder"
   version       = "1.0.31"
   agent_id      = coder_agent.example.id
   folder        = "/home/coder"
@@ -108,7 +108,7 @@ Run Goose as a standalone app in your workspace. This will install Goose and run
 
 ```tf
 module "goose" {
-  source        = "registry.coder.com/modules/goose/coder"
+  source        = "registry.coder.com/coder/goose/coder"
   version       = "1.0.31"
   agent_id      = coder_agent.example.id
   folder        = "/home/coder"
diff --git a/examples/modules/README.md b/examples/modules/README.md
index edf4fc3..80d9923 100644
--- a/examples/modules/README.md
+++ b/examples/modules/README.md
@@ -14,7 +14,7 @@ tags: [helper]
 ```tf
 module "MODULE_NAME" {
   count   = data.coder_workspace.me.start_count
-  source  = "registry.coder.com/modules/MODULE_NAME/coder"
+  source  = "registry.coder.com/NAMESPACE/MODULE_NAME/coder"
   version = "1.0.2"
 }
 ```
@@ -30,7 +30,7 @@ Install the Dracula theme from [OpenVSX](https://open-vsx.org/):
 ```tf
 module "MODULE_NAME" {
   count    = data.coder_workspace.me.start_count
-  source   = "registry.coder.com/modules/MODULE_NAME/coder"
+  source   = "registry.coder.com/NAMESPACE/MODULE_NAME/coder"
   version  = "1.0.2"
   agent_id = coder_agent.example.id
   extensions = [
@@ -48,7 +48,7 @@ Configure VS Code's [settings.json](https://code.visualstudio.com/docs/getstarte
 ```tf
 module "MODULE_NAME" {
   count      = data.coder_workspace.me.start_count
-  source     = "registry.coder.com/modules/MODULE_NAME/coder"
+  source     = "registry.coder.com/NAMESPACE/MODULE_NAME/coder"
   version    = "1.0.2"
   agent_id   = coder_agent.example.id
   extensions = ["dracula-theme.theme-dracula"]
@@ -64,7 +64,7 @@ Run code-server in the background, don't fetch it from GitHub:
 
 ```tf
 module "MODULE_NAME" {
-  source   = "registry.coder.com/modules/MODULE_NAME/coder"
+  source   = "registry.coder.com/NAMESPACE/MODULE_NAME/coder"
   version  = "1.0.2"
   agent_id = coder_agent.example.id
   offline  = true
diff --git a/registry/coder/modules/amazon-dcv-windows/README.md b/registry/coder/modules/amazon-dcv-windows/README.md
index e16b244..86c6e40 100644
--- a/registry/coder/modules/amazon-dcv-windows/README.md
+++ b/registry/coder/modules/amazon-dcv-windows/README.md
@@ -18,7 +18,7 @@ Enable DCV Server and Web Client on Windows workspaces.
 ```tf
 module "dcv" {
   count    = data.coder_workspace.me.start_count
-  source   = "registry.coder.com/modules/amazon-dcv-windows/coder"
+  source   = "registry.coder.com/coder/amazon-dcv-windows/coder"
   version  = "1.0.24"
   agent_id = resource.coder_agent.main.id
 }
diff --git a/registry/coder/modules/aws-region/README.md b/registry/coder/modules/aws-region/README.md
index eb2bdb3..5656e1c 100644
--- a/registry/coder/modules/aws-region/README.md
+++ b/registry/coder/modules/aws-region/README.md
@@ -17,7 +17,7 @@ Customize the preselected parameter value:
 ```tf
 module "aws-region" {
   count   = data.coder_workspace.me.start_count
-  source  = "registry.coder.com/modules/aws-region/coder"
+  source  = "registry.coder.com/coder/aws-region/coder"
   version = "1.0.12"
   default = "us-east-1"
 }
@@ -38,7 +38,7 @@ Change the display name and icon for a region using the corresponding maps:
 ```tf
 module "aws-region" {
   count   = data.coder_workspace.me.start_count
-  source  = "registry.coder.com/modules/aws-region/coder"
+  source  = "registry.coder.com/coder/aws-region/coder"
   version = "1.0.12"
   default = "ap-south-1"
 
@@ -65,7 +65,7 @@ Hide the Asia Pacific regions Seoul and Osaka:
 ```tf
 module "aws-region" {
   count   = data.coder_workspace.me.start_count
-  source  = "registry.coder.com/modules/aws-region/coder"
+  source  = "registry.coder.com/coder/aws-region/coder"
   version = "1.0.12"
   exclude = ["ap-northeast-2", "ap-northeast-3"]
 }
diff --git a/registry/coder/modules/azure-region/README.md b/registry/coder/modules/azure-region/README.md
index 1b3d810..16c145a 100644
--- a/registry/coder/modules/azure-region/README.md
+++ b/registry/coder/modules/azure-region/README.md
@@ -14,7 +14,7 @@ This module adds a parameter with all Azure regions, allowing developers to sele
 ```tf
 module "azure_region" {
   count   = data.coder_workspace.me.start_count
-  source  = "registry.coder.com/modules/azure-region/coder"
+  source  = "registry.coder.com/coder/azure-region/coder"
   version = "1.0.12"
   default = "eastus"
 }
@@ -35,7 +35,7 @@ Change the display name and icon for a region using the corresponding maps:
 ```tf
 module "azure-region" {
   count   = data.coder_workspace.me.start_count
-  source  = "registry.coder.com/modules/azure-region/coder"
+  source  = "registry.coder.com/coder/azure-region/coder"
   version = "1.0.12"
   custom_names = {
     "australia" : "Go Australia!"
@@ -59,7 +59,7 @@ Hide all regions in Australia except australiacentral:
 ```tf
 module "azure-region" {
   count   = data.coder_workspace.me.start_count
-  source  = "registry.coder.com/modules/azure-region/coder"
+  source  = "registry.coder.com/coder/azure-region/coder"
   version = "1.0.12"
   exclude = [
     "australia",
diff --git a/registry/coder/modules/claude-code/README.md b/registry/coder/modules/claude-code/README.md
index a94b318..6ba18bf 100644
--- a/registry/coder/modules/claude-code/README.md
+++ b/registry/coder/modules/claude-code/README.md
@@ -13,7 +13,7 @@ Run the [Claude Code](https://docs.anthropic.com/en/docs/agents-and-tools/claude
 
 ```tf
 module "claude-code" {
-  source              = "registry.coder.com/modules/claude-code/coder"
+  source              = "registry.coder.com/coder/claude-code/coder"
   version             = "1.2.1"
   agent_id            = coder_agent.example.id
   folder              = "/home/coder"
@@ -54,7 +54,7 @@ variable "anthropic_api_key" {
 
 module "coder-login" {
   count    = data.coder_workspace.me.start_count
-  source   = "registry.coder.com/modules/coder-login/coder"
+  source   = "registry.coder.com/coder/coder-login/coder"
   version  = "1.0.15"
   agent_id = coder_agent.example.id
 }
@@ -82,7 +82,7 @@ resource "coder_agent" "main" {
 
 module "claude-code" {
   count               = data.coder_workspace.me.start_count
-  source              = "registry.coder.com/modules/claude-code/coder"
+  source              = "registry.coder.com/coder/claude-code/coder"
   version             = "1.1.0"
   agent_id            = coder_agent.example.id
   folder              = "/home/coder"
@@ -101,7 +101,7 @@ Run Claude Code as a standalone app in your workspace. This will install Claude
 
 ```tf
 module "claude-code" {
-  source              = "registry.coder.com/modules/claude-code/coder"
+  source              = "registry.coder.com/coder/claude-code/coder"
   version             = "1.2.1"
   agent_id            = coder_agent.example.id
   folder              = "/home/coder"
diff --git a/registry/coder/modules/code-server/README.md b/registry/coder/modules/code-server/README.md
index 9080bdd..d7d222d 100644
--- a/registry/coder/modules/code-server/README.md
+++ b/registry/coder/modules/code-server/README.md
@@ -14,7 +14,7 @@ Automatically install [code-server](https://github.com/coder/code-server) in a w
 ```tf
 module "code-server" {
   count    = data.coder_workspace.me.start_count
-  source   = "registry.coder.com/modules/code-server/coder"
+  source   = "registry.coder.com/coder/code-server/coder"
   version  = "1.1.0"
   agent_id = coder_agent.example.id
 }
@@ -29,7 +29,7 @@ module "code-server" {
 ```tf
 module "code-server" {
   count           = data.coder_workspace.me.start_count
-  source          = "registry.coder.com/modules/code-server/coder"
+  source          = "registry.coder.com/coder/code-server/coder"
   version         = "1.1.0"
   agent_id        = coder_agent.example.id
   install_version = "4.8.3"
@@ -43,7 +43,7 @@ Install the Dracula theme from [OpenVSX](https://open-vsx.org/):
 ```tf
 module "code-server" {
   count    = data.coder_workspace.me.start_count
-  source   = "registry.coder.com/modules/code-server/coder"
+  source   = "registry.coder.com/coder/code-server/coder"
   version  = "1.1.0"
   agent_id = coder_agent.example.id
   extensions = [
@@ -61,7 +61,7 @@ Configure VS Code's [settings.json](https://code.visualstudio.com/docs/getstarte
 ```tf
 module "code-server" {
   count      = data.coder_workspace.me.start_count
-  source     = "registry.coder.com/modules/code-server/coder"
+  source     = "registry.coder.com/coder/code-server/coder"
   version    = "1.1.0"
   agent_id   = coder_agent.example.id
   extensions = ["dracula-theme.theme-dracula"]
@@ -78,7 +78,7 @@ Just run code-server in the background, don't fetch it from GitHub:
 ```tf
 module "code-server" {
   count      = data.coder_workspace.me.start_count
-  source     = "registry.coder.com/modules/code-server/coder"
+  source     = "registry.coder.com/coder/code-server/coder"
   version    = "1.1.0"
   agent_id   = coder_agent.example.id
   extensions = ["dracula-theme.theme-dracula", "ms-azuretools.vscode-docker"]
@@ -94,7 +94,7 @@ Run an existing copy of code-server if found, otherwise download from GitHub:
 ```tf
 module "code-server" {
   count      = data.coder_workspace.me.start_count
-  source     = "registry.coder.com/modules/code-server/coder"
+  source     = "registry.coder.com/coder/code-server/coder"
   version    = "1.1.0"
   agent_id   = coder_agent.example.id
   use_cached = true
@@ -107,7 +107,7 @@ Just run code-server in the background, don't fetch it from GitHub:
 ```tf
 module "code-server" {
   count    = data.coder_workspace.me.start_count
-  source   = "registry.coder.com/modules/code-server/coder"
+  source   = "registry.coder.com/coder/code-server/coder"
   version  = "1.1.0"
   agent_id = coder_agent.example.id
   offline  = true
diff --git a/registry/coder/modules/coder-login/README.md b/registry/coder/modules/coder-login/README.md
index 944a43a..fc82dbf 100644
--- a/registry/coder/modules/coder-login/README.md
+++ b/registry/coder/modules/coder-login/README.md
@@ -14,7 +14,7 @@ Automatically logs the user into Coder when creating their workspace.
 ```tf
 module "coder-login" {
   count    = data.coder_workspace.me.start_count
-  source   = "registry.coder.com/modules/coder-login/coder"
+  source   = "registry.coder.com/coder/coder-login/coder"
   version  = "1.0.15"
   agent_id = coder_agent.example.id
 }
diff --git a/registry/coder/modules/cursor/README.md b/registry/coder/modules/cursor/README.md
index 22dd70d..6499d5c 100644
--- a/registry/coder/modules/cursor/README.md
+++ b/registry/coder/modules/cursor/README.md
@@ -16,7 +16,7 @@ Uses the [Coder Remote VS Code Extension](https://github.com/coder/vscode-coder)
 ```tf
 module "cursor" {
   count    = data.coder_workspace.me.start_count
-  source   = "registry.coder.com/modules/cursor/coder"
+  source   = "registry.coder.com/coder/cursor/coder"
   version  = "1.0.19"
   agent_id = coder_agent.example.id
 }
@@ -29,7 +29,7 @@ module "cursor" {
 ```tf
 module "cursor" {
   count    = data.coder_workspace.me.start_count
-  source   = "registry.coder.com/modules/cursor/coder"
+  source   = "registry.coder.com/coder/cursor/coder"
   version  = "1.0.19"
   agent_id = coder_agent.example.id
   folder   = "/home/coder/project"
diff --git a/registry/coder/modules/devcontainers-cli/README.md b/registry/coder/modules/devcontainers-cli/README.md
index ec73696..99a497a 100644
--- a/registry/coder/modules/devcontainers-cli/README.md
+++ b/registry/coder/modules/devcontainers-cli/README.md
@@ -15,7 +15,7 @@ The devcontainers-cli module provides an easy way to install [`@devcontainers/cl
 
 ```tf
 module "devcontainers-cli" {
-  source   = "registry.coder.com/modules/devcontainers-cli/coder"
+  source   = "registry.coder.com/coder/devcontainers-cli/coder"
   version  = "1.0.3"
   agent_id = coder_agent.example.id
 }
diff --git a/registry/coder/modules/dotfiles/README.md b/registry/coder/modules/dotfiles/README.md
index 15624e4..a4552e7 100644
--- a/registry/coder/modules/dotfiles/README.md
+++ b/registry/coder/modules/dotfiles/README.md
@@ -18,7 +18,7 @@ Under the hood, this module uses the [coder dotfiles](https://coder.com/docs/v2/
 ```tf
 module "dotfiles" {
   count    = data.coder_workspace.me.start_count
-  source   = "registry.coder.com/modules/dotfiles/coder"
+  source   = "registry.coder.com/coder/dotfiles/coder"
   version  = "1.0.29"
   agent_id = coder_agent.example.id
 }
@@ -31,7 +31,7 @@ module "dotfiles" {
 ```tf
 module "dotfiles" {
   count    = data.coder_workspace.me.start_count
-  source   = "registry.coder.com/modules/dotfiles/coder"
+  source   = "registry.coder.com/coder/dotfiles/coder"
   version  = "1.0.29"
   agent_id = coder_agent.example.id
 }
@@ -42,7 +42,7 @@ module "dotfiles" {
 ```tf
 module "dotfiles" {
   count    = data.coder_workspace.me.start_count
-  source   = "registry.coder.com/modules/dotfiles/coder"
+  source   = "registry.coder.com/coder/dotfiles/coder"
   version  = "1.0.29"
   agent_id = coder_agent.example.id
   user     = "root"
@@ -54,14 +54,14 @@ module "dotfiles" {
 ```tf
 module "dotfiles" {
   count    = data.coder_workspace.me.start_count
-  source   = "registry.coder.com/modules/dotfiles/coder"
+  source   = "registry.coder.com/coder/dotfiles/coder"
   version  = "1.0.29"
   agent_id = coder_agent.example.id
 }
 
 module "dotfiles-root" {
   count        = data.coder_workspace.me.start_count
-  source       = "registry.coder.com/modules/dotfiles/coder"
+  source       = "registry.coder.com/coder/dotfiles/coder"
   version      = "1.0.29"
   agent_id     = coder_agent.example.id
   user         = "root"
@@ -76,7 +76,7 @@ You can set a default dotfiles repository for all users by setting the `default_
 ```tf
 module "dotfiles" {
   count                = data.coder_workspace.me.start_count
-  source               = "registry.coder.com/modules/dotfiles/coder"
+  source               = "registry.coder.com/coder/dotfiles/coder"
   version              = "1.0.29"
   agent_id             = coder_agent.example.id
   default_dotfiles_uri = "https://github.com/coder/dotfiles"
diff --git a/registry/coder/modules/filebrowser/README.md b/registry/coder/modules/filebrowser/README.md
index 8cf1ac7..dfe9759 100644
--- a/registry/coder/modules/filebrowser/README.md
+++ b/registry/coder/modules/filebrowser/README.md
@@ -14,7 +14,7 @@ A file browser for your workspace.
 ```tf
 module "filebrowser" {
   count    = data.coder_workspace.me.start_count
-  source   = "registry.coder.com/modules/filebrowser/coder"
+  source   = "registry.coder.com/coder/filebrowser/coder"
   version  = "1.0.31"
   agent_id = coder_agent.example.id
 }
@@ -29,7 +29,7 @@ module "filebrowser" {
 ```tf
 module "filebrowser" {
   count    = data.coder_workspace.me.start_count
-  source   = "registry.coder.com/modules/filebrowser/coder"
+  source   = "registry.coder.com/coder/filebrowser/coder"
   version  = "1.0.31"
   agent_id = coder_agent.example.id
   folder   = "/home/coder/project"
@@ -41,7 +41,7 @@ module "filebrowser" {
 ```tf
 module "filebrowser" {
   count         = data.coder_workspace.me.start_count
-  source        = "registry.coder.com/modules/filebrowser/coder"
+  source        = "registry.coder.com/coder/filebrowser/coder"
   version       = "1.0.31"
   agent_id      = coder_agent.example.id
   database_path = ".config/filebrowser.db"
@@ -53,7 +53,7 @@ module "filebrowser" {
 ```tf
 module "filebrowser" {
   count      = data.coder_workspace.me.start_count
-  source     = "registry.coder.com/modules/filebrowser/coder"
+  source     = "registry.coder.com/coder/filebrowser/coder"
   version    = "1.0.31"
   agent_id   = coder_agent.example.id
   agent_name = "main"
diff --git a/registry/coder/modules/fly-region/README.md b/registry/coder/modules/fly-region/README.md
index a71c132..d51b301 100644
--- a/registry/coder/modules/fly-region/README.md
+++ b/registry/coder/modules/fly-region/README.md
@@ -16,7 +16,7 @@ We can use the simplest format here, only adding a default selection as the `atl
 ```tf
 module "fly-region" {
   count   = data.coder_workspace.me.start_count
-  source  = "registry.coder.com/modules/fly-region/coder"
+  source  = "registry.coder.com/coder/fly-region/coder"
   version = "1.0.2"
   default = "atl"
 }
@@ -33,7 +33,7 @@ The regions argument can be used to display only the desired regions in the Code
 ```tf
 module "fly-region" {
   count   = data.coder_workspace.me.start_count
-  source  = "registry.coder.com/modules/fly-region/coder"
+  source  = "registry.coder.com/coder/fly-region/coder"
   version = "1.0.2"
   default = "ams"
   regions = ["ams", "arn", "atl"]
@@ -49,7 +49,7 @@ Set custom icons and names with their respective maps.
 ```tf
 module "fly-region" {
   count   = data.coder_workspace.me.start_count
-  source  = "registry.coder.com/modules/fly-region/coder"
+  source  = "registry.coder.com/coder/fly-region/coder"
   version = "1.0.2"
   default = "ams"
 
diff --git a/registry/coder/modules/gcp-region/README.md b/registry/coder/modules/gcp-region/README.md
index ff469d4..262777e 100644
--- a/registry/coder/modules/gcp-region/README.md
+++ b/registry/coder/modules/gcp-region/README.md
@@ -14,7 +14,7 @@ This module adds Google Cloud Platform regions to your Coder template.
 ```tf
 module "gcp_region" {
   count   = data.coder_workspace.me.start_count
-  source  = "registry.coder.com/modules/gcp-region/coder"
+  source  = "registry.coder.com/coder/gcp-region/coder"
   version = "1.0.12"
   regions = ["us", "europe"]
 }
@@ -35,7 +35,7 @@ Note: setting `gpu_only = true` and using a default region without GPU support,
 ```tf
 module "gcp_region" {
   count    = data.coder_workspace.me.start_count
-  source   = "registry.coder.com/modules/gcp-region/coder"
+  source   = "registry.coder.com/coder/gcp-region/coder"
   version  = "1.0.12"
   default  = ["us-west1-a"]
   regions  = ["us-west1"]
@@ -52,7 +52,7 @@ resource "google_compute_instance" "example" {
 ```tf
 module "gcp_region" {
   count                  = data.coder_workspace.me.start_count
-  source                 = "registry.coder.com/modules/gcp-region/coder"
+  source                 = "registry.coder.com/coder/gcp-region/coder"
   version                = "1.0.12"
   regions                = ["europe-west"]
   single_zone_per_region = false
@@ -68,7 +68,7 @@ resource "google_compute_instance" "example" {
 ```tf
 module "gcp_region" {
   count                  = data.coder_workspace.me.start_count
-  source                 = "registry.coder.com/modules/gcp-region/coder"
+  source                 = "registry.coder.com/coder/gcp-region/coder"
   version                = "1.0.12"
   regions                = ["us", "europe"]
   gpu_only               = true
diff --git a/registry/coder/modules/git-clone/README.md b/registry/coder/modules/git-clone/README.md
index 1de7413..d2d3dda 100644
--- a/registry/coder/modules/git-clone/README.md
+++ b/registry/coder/modules/git-clone/README.md
@@ -14,7 +14,7 @@ This module allows you to automatically clone a repository by URL and skip if it
 ```tf
 module "git-clone" {
   count    = data.coder_workspace.me.start_count
-  source   = "registry.coder.com/modules/git-clone/coder"
+  source   = "registry.coder.com/coder/git-clone/coder"
   version  = "1.0.18"
   agent_id = coder_agent.example.id
   url      = "https://github.com/coder/coder"
@@ -28,7 +28,7 @@ module "git-clone" {
 ```tf
 module "git-clone" {
   count    = data.coder_workspace.me.start_count
-  source   = "registry.coder.com/modules/git-clone/coder"
+  source   = "registry.coder.com/coder/git-clone/coder"
   version  = "1.0.18"
   agent_id = coder_agent.example.id
   url      = "https://github.com/coder/coder"
@@ -43,7 +43,7 @@ To use with [Git Authentication](https://coder.com/docs/v2/latest/admin/git-prov
 ```tf
 module "git-clone" {
   count    = data.coder_workspace.me.start_count
-  source   = "registry.coder.com/modules/git-clone/coder"
+  source   = "registry.coder.com/coder/git-clone/coder"
   version  = "1.0.18"
   agent_id = coder_agent.example.id
   url      = "https://github.com/coder/coder"
@@ -69,7 +69,7 @@ data "coder_parameter" "git_repo" {
 # Clone the repository for branch `feat/example`
 module "git_clone" {
   count    = data.coder_workspace.me.start_count
-  source   = "registry.coder.com/modules/git-clone/coder"
+  source   = "registry.coder.com/coder/git-clone/coder"
   version  = "1.0.18"
   agent_id = coder_agent.example.id
   url      = data.coder_parameter.git_repo.value
@@ -78,7 +78,7 @@ module "git_clone" {
 # Create a code-server instance for the cloned repository
 module "code-server" {
   count    = data.coder_workspace.me.start_count
-  source   = "registry.coder.com/modules/code-server/coder"
+  source   = "registry.coder.com/coder/code-server/coder"
   version  = "1.0.18"
   agent_id = coder_agent.example.id
   order    = 1
@@ -103,7 +103,7 @@ Configuring `git-clone` for a self-hosted GitHub Enterprise Server running at `g
 ```tf
 module "git-clone" {
   count    = data.coder_workspace.me.start_count
-  source   = "registry.coder.com/modules/git-clone/coder"
+  source   = "registry.coder.com/coder/git-clone/coder"
   version  = "1.0.18"
   agent_id = coder_agent.example.id
   url      = "https://github.example.com/coder/coder/tree/feat/example"
@@ -122,7 +122,7 @@ To GitLab clone with a specific branch like `feat/example`
 ```tf
 module "git-clone" {
   count    = data.coder_workspace.me.start_count
-  source   = "registry.coder.com/modules/git-clone/coder"
+  source   = "registry.coder.com/coder/git-clone/coder"
   version  = "1.0.18"
   agent_id = coder_agent.example.id
   url      = "https://gitlab.com/coder/coder/-/tree/feat/example"
@@ -134,7 +134,7 @@ Configuring `git-clone` for a self-hosted GitLab running at `gitlab.example.com`
 ```tf
 module "git-clone" {
   count    = data.coder_workspace.me.start_count
-  source   = "registry.coder.com/modules/git-clone/coder"
+  source   = "registry.coder.com/coder/git-clone/coder"
   version  = "1.0.18"
   agent_id = coder_agent.example.id
   url      = "https://gitlab.example.com/coder/coder/-/tree/feat/example"
@@ -155,7 +155,7 @@ For example, to clone the `feat/example` branch:
 ```tf
 module "git-clone" {
   count       = data.coder_workspace.me.start_count
-  source      = "registry.coder.com/modules/git-clone/coder"
+  source      = "registry.coder.com/coder/git-clone/coder"
   version     = "1.0.18"
   agent_id    = coder_agent.example.id
   url         = "https://github.com/coder/coder"
@@ -172,7 +172,7 @@ For example, this will clone into the `~/projects/coder/coder-dev` folder:
 ```tf
 module "git-clone" {
   count       = data.coder_workspace.me.start_count
-  source      = "registry.coder.com/modules/git-clone/coder"
+  source      = "registry.coder.com/coder/git-clone/coder"
   version     = "1.0.18"
   agent_id    = coder_agent.example.id
   url         = "https://github.com/coder/coder"
diff --git a/registry/coder/modules/git-commit-signing/README.md b/registry/coder/modules/git-commit-signing/README.md
index 16d003f..60db758 100644
--- a/registry/coder/modules/git-commit-signing/README.md
+++ b/registry/coder/modules/git-commit-signing/README.md
@@ -22,7 +22,7 @@ This module has a chance of conflicting with the user's dotfiles / the personali
 ```tf
 module "git-commit-signing" {
   count    = data.coder_workspace.me.start_count
-  source   = "registry.coder.com/modules/git-commit-signing/coder"
+  source   = "registry.coder.com/coder/git-commit-signing/coder"
   version  = "1.0.11"
   agent_id = coder_agent.example.id
 }
diff --git a/registry/coder/modules/git-config/README.md b/registry/coder/modules/git-config/README.md
index 7744590..72337c9 100644
--- a/registry/coder/modules/git-config/README.md
+++ b/registry/coder/modules/git-config/README.md
@@ -14,7 +14,7 @@ Runs a script that updates git credentials in the workspace to match the user's
 ```tf
 module "git-config" {
   count    = data.coder_workspace.me.start_count
-  source   = "registry.coder.com/modules/git-config/coder"
+  source   = "registry.coder.com/coder/git-config/coder"
   version  = "1.0.15"
   agent_id = coder_agent.example.id
 }
@@ -29,7 +29,7 @@ TODO: Add screenshot
 ```tf
 module "git-config" {
   count              = data.coder_workspace.me.start_count
-  source             = "registry.coder.com/modules/git-config/coder"
+  source             = "registry.coder.com/coder/git-config/coder"
   version            = "1.0.15"
   agent_id           = coder_agent.example.id
   allow_email_change = true
@@ -43,7 +43,7 @@ TODO: Add screenshot
 ```tf
 module "git-config" {
   count                 = data.coder_workspace.me.start_count
-  source                = "registry.coder.com/modules/git-config/coder"
+  source                = "registry.coder.com/coder/git-config/coder"
   version               = "1.0.15"
   agent_id              = coder_agent.example.id
   allow_username_change = false
diff --git a/registry/coder/modules/github-upload-public-key/README.md b/registry/coder/modules/github-upload-public-key/README.md
index 779d419..d010633 100644
--- a/registry/coder/modules/github-upload-public-key/README.md
+++ b/registry/coder/modules/github-upload-public-key/README.md
@@ -14,7 +14,7 @@ Templates that utilize Github External Auth can automatically ensure that the Co
 ```tf
 module "github-upload-public-key" {
   count    = data.coder_workspace.me.start_count
-  source   = "registry.coder.com/modules/github-upload-public-key/coder"
+  source   = "registry.coder.com/coder/github-upload-public-key/coder"
   version  = "1.0.15"
   agent_id = coder_agent.example.id
 }
@@ -47,7 +47,7 @@ data "coder_external_auth" "github" {
 
 module "github-upload-public-key" {
   count            = data.coder_workspace.me.start_count
-  source           = "registry.coder.com/modules/github-upload-public-key/coder"
+  source           = "registry.coder.com/coder/github-upload-public-key/coder"
   version          = "1.0.15"
   agent_id         = coder_agent.example.id
   external_auth_id = data.coder_external_auth.github.id
diff --git a/registry/coder/modules/goose/README.md b/registry/coder/modules/goose/README.md
index 55ce4eb..fb71997 100644
--- a/registry/coder/modules/goose/README.md
+++ b/registry/coder/modules/goose/README.md
@@ -13,7 +13,7 @@ Run the [Goose](https://block.github.io/goose/) agent in your workspace to gener
 
 ```tf
 module "goose" {
-  source        = "registry.coder.com/modules/goose/coder"
+  source        = "registry.coder.com/coder/goose/coder"
   version       = "1.1.0"
   agent_id      = coder_agent.example.id
   folder        = "/home/coder"
@@ -47,7 +47,7 @@ Your workspace must have `screen` installed to use this.
 ```tf
 module "coder-login" {
   count    = data.coder_workspace.me.start_count
-  source   = "registry.coder.com/modules/coder-login/coder"
+  source   = "registry.coder.com/coder/coder-login/coder"
   version  = "1.0.15"
   agent_id = coder_agent.example.id
 }
@@ -89,7 +89,7 @@ resource "coder_agent" "main" {
 
 module "goose" {
   count         = data.coder_workspace.me.start_count
-  source        = "registry.coder.com/modules/goose/coder"
+  source        = "registry.coder.com/coder/goose/coder"
   version       = "1.1.0"
   agent_id      = coder_agent.example.id
   folder        = "/home/coder"
@@ -147,7 +147,7 @@ Run Goose as a standalone app in your workspace. This will install Goose and run
 
 ```tf
 module "goose" {
-  source        = "registry.coder.com/modules/goose/coder"
+  source        = "registry.coder.com/coder/goose/coder"
   version       = "1.1.0"
   agent_id      = coder_agent.example.id
   folder        = "/home/coder"
diff --git a/registry/coder/modules/hcp-vault-secrets/README.md b/registry/coder/modules/hcp-vault-secrets/README.md
index db29a24..e18d2fe 100644
--- a/registry/coder/modules/hcp-vault-secrets/README.md
+++ b/registry/coder/modules/hcp-vault-secrets/README.md
@@ -14,7 +14,7 @@ This module lets you fetch all or selective secrets from a [HCP Vault Secrets](h
 
 ```tf
 module "vault" {
-  source     = "registry.coder.com/modules/hcp-vault-secrets/coder"
+  source     = "registry.coder.com/coder/hcp-vault-secrets/coder"
   version    = "1.0.7"
   agent_id   = coder_agent.example.id
   app_name   = "demo-app"
@@ -40,7 +40,7 @@ To fetch all secrets from the HCP Vault Secrets app, skip the `secrets` input.
 
 ```tf
 module "vault" {
-  source     = "registry.coder.com/modules/hcp-vault-secrets/coder"
+  source     = "registry.coder.com/coder/hcp-vault-secrets/coder"
   version    = "1.0.7"
   agent_id   = coder_agent.example.id
   app_name   = "demo-app"
@@ -54,7 +54,7 @@ To fetch selective secrets from the HCP Vault Secrets app, set the `secrets` inp
 
 ```tf
 module "vault" {
-  source     = "registry.coder.com/modules/hcp-vault-secrets/coder"
+  source     = "registry.coder.com/coder/hcp-vault-secrets/coder"
   version    = "1.0.7"
   agent_id   = coder_agent.example.id
   app_name   = "demo-app"
@@ -69,7 +69,7 @@ Set `client_id` and `client_secret` as module inputs.
 
 ```tf
 module "vault" {
-  source        = "registry.coder.com/modules/hcp-vault-secrets/coder"
+  source        = "registry.coder.com/coder/hcp-vault-secrets/coder"
   version       = "1.0.7"
   agent_id      = coder_agent.example.id
   app_name      = "demo-app"
diff --git a/registry/coder/modules/jetbrains-gateway/README.md b/registry/coder/modules/jetbrains-gateway/README.md
index e38aae2..6bda234 100644
--- a/registry/coder/modules/jetbrains-gateway/README.md
+++ b/registry/coder/modules/jetbrains-gateway/README.md
@@ -17,7 +17,7 @@ Consult the [JetBrains documentation](https://www.jetbrains.com/help/idea/prereq
 ```tf
 module "jetbrains_gateway" {
   count          = data.coder_workspace.me.start_count
-  source         = "registry.coder.com/modules/jetbrains-gateway/coder"
+  source         = "registry.coder.com/coder/jetbrains-gateway/coder"
   version        = "1.1.0"
   agent_id       = coder_agent.example.id
   folder         = "/home/coder/example"
@@ -35,7 +35,7 @@ module "jetbrains_gateway" {
 ```tf
 module "jetbrains_gateway" {
   count          = data.coder_workspace.me.start_count
-  source         = "registry.coder.com/modules/jetbrains-gateway/coder"
+  source         = "registry.coder.com/coder/jetbrains-gateway/coder"
   version        = "1.1.0"
   agent_id       = coder_agent.example.id
   folder         = "/home/coder/example"
@@ -49,7 +49,7 @@ module "jetbrains_gateway" {
 ```tf
 module "jetbrains_gateway" {
   count          = data.coder_workspace.me.start_count
-  source         = "registry.coder.com/modules/jetbrains-gateway/coder"
+  source         = "registry.coder.com/coder/jetbrains-gateway/coder"
   version        = "1.1.0"
   agent_id       = coder_agent.example.id
   folder         = "/home/coder/example"
@@ -64,7 +64,7 @@ module "jetbrains_gateway" {
 ```tf
 module "jetbrains_gateway" {
   count          = data.coder_workspace.me.start_count
-  source         = "registry.coder.com/modules/jetbrains-gateway/coder"
+  source         = "registry.coder.com/coder/jetbrains-gateway/coder"
   version        = "1.1.0"
   agent_id       = coder_agent.example.id
   folder         = "/home/coder/example"
@@ -89,7 +89,7 @@ module "jetbrains_gateway" {
 ```tf
 module "jetbrains_gateway" {
   count          = data.coder_workspace.me.start_count
-  source         = "registry.coder.com/modules/jetbrains-gateway/coder"
+  source         = "registry.coder.com/coder/jetbrains-gateway/coder"
   version        = "1.1.0"
   agent_id       = coder_agent.example.id
   folder         = "/home/coder/example"
@@ -107,7 +107,7 @@ Due to the highest priority of the `ide_download_link` parameter in the `(jetbra
 ```tf
 module "jetbrains_gateway" {
   count              = data.coder_workspace.me.start_count
-  source             = "registry.coder.com/modules/jetbrains-gateway/coder"
+  source             = "registry.coder.com/coder/jetbrains-gateway/coder"
   version            = "1.1.0"
   agent_id           = coder_agent.example.id
   folder             = "/home/coder/example"
diff --git a/registry/coder/modules/jfrog-oauth/README.md b/registry/coder/modules/jfrog-oauth/README.md
index 312c4c0..e8a6a5f 100644
--- a/registry/coder/modules/jfrog-oauth/README.md
+++ b/registry/coder/modules/jfrog-oauth/README.md
@@ -17,7 +17,7 @@ Install the JF CLI and authenticate package managers with Artifactory using OAut
 ```tf
 module "jfrog" {
   count          = data.coder_workspace.me.start_count
-  source         = "registry.coder.com/modules/jfrog-oauth/coder"
+  source         = "registry.coder.com/coder/jfrog-oauth/coder"
   version        = "1.0.19"
   agent_id       = coder_agent.example.id
   jfrog_url      = "https://example.jfrog.io"
@@ -46,7 +46,7 @@ Configure the Python pip package manager to fetch packages from Artifactory whil
 ```tf
 module "jfrog" {
   count          = data.coder_workspace.me.start_count
-  source         = "registry.coder.com/modules/jfrog-oauth/coder"
+  source         = "registry.coder.com/coder/jfrog-oauth/coder"
   version        = "1.0.19"
   agent_id       = coder_agent.example.id
   jfrog_url      = "https://example.jfrog.io"
@@ -75,7 +75,7 @@ The [JFrog extension](https://open-vsx.org/extension/JFrog/jfrog-vscode-extensio
 ```tf
 module "jfrog" {
   count                 = data.coder_workspace.me.start_count
-  source                = "registry.coder.com/modules/jfrog-oauth/coder"
+  source                = "registry.coder.com/coder/jfrog-oauth/coder"
   version               = "1.0.19"
   agent_id              = coder_agent.example.id
   jfrog_url             = "https://example.jfrog.io"
diff --git a/registry/coder/modules/jfrog-token/README.md b/registry/coder/modules/jfrog-token/README.md
index 7e72aba..26d98e6 100644
--- a/registry/coder/modules/jfrog-token/README.md
+++ b/registry/coder/modules/jfrog-token/README.md
@@ -14,7 +14,7 @@ Install the JF CLI and authenticate package managers with Artifactory using Arti
 
 ```tf
 module "jfrog" {
-  source                   = "registry.coder.com/modules/jfrog-token/coder"
+  source                   = "registry.coder.com/coder/jfrog-token/coder"
   version                  = "1.0.30"
   agent_id                 = coder_agent.example.id
   jfrog_url                = "https://XXXX.jfrog.io"
@@ -41,7 +41,7 @@ For detailed instructions, please see this [guide](https://coder.com/docs/v2/lat
 
 ```tf
 module "jfrog" {
-  source                   = "registry.coder.com/modules/jfrog-token/coder"
+  source                   = "registry.coder.com/coder/jfrog-token/coder"
   version                  = "1.0.30"
   agent_id                 = coder_agent.example.id
   jfrog_url                = "https://YYYY.jfrog.io"
@@ -74,7 +74,7 @@ The [JFrog extension](https://open-vsx.org/extension/JFrog/jfrog-vscode-extensio
 
 ```tf
 module "jfrog" {
-  source                   = "registry.coder.com/modules/jfrog-token/coder"
+  source                   = "registry.coder.com/coder/jfrog-token/coder"
   version                  = "1.0.30"
   agent_id                 = coder_agent.example.id
   jfrog_url                = "https://XXXX.jfrog.io"
@@ -94,7 +94,7 @@ module "jfrog" {
 data "coder_workspace" "me" {}
 
 module "jfrog" {
-  source                   = "registry.coder.com/modules/jfrog-token/coder"
+  source                   = "registry.coder.com/coder/jfrog-token/coder"
   version                  = "1.0.30"
   agent_id                 = coder_agent.example.id
   jfrog_url                = "https://XXXX.jfrog.io"
diff --git a/registry/coder/modules/jupyter-notebook/README.md b/registry/coder/modules/jupyter-notebook/README.md
index 842eb09..105863a 100644
--- a/registry/coder/modules/jupyter-notebook/README.md
+++ b/registry/coder/modules/jupyter-notebook/README.md
@@ -16,7 +16,7 @@ A module that adds Jupyter Notebook in your Coder template.
 ```tf
 module "jupyter-notebook" {
   count    = data.coder_workspace.me.start_count
-  source   = "registry.coder.com/modules/jupyter-notebook/coder"
+  source   = "registry.coder.com/coder/jupyter-notebook/coder"
   version  = "1.0.19"
   agent_id = coder_agent.example.id
 }
diff --git a/registry/coder/modules/jupyterlab/README.md b/registry/coder/modules/jupyterlab/README.md
index c0c4011..d1bd555 100644
--- a/registry/coder/modules/jupyterlab/README.md
+++ b/registry/coder/modules/jupyterlab/README.md
@@ -16,7 +16,7 @@ A module that adds JupyterLab in your Coder template.
 ```tf
 module "jupyterlab" {
   count    = data.coder_workspace.me.start_count
-  source   = "registry.coder.com/modules/jupyterlab/coder"
+  source   = "registry.coder.com/coder/jupyterlab/coder"
   version  = "1.0.31"
   agent_id = coder_agent.example.id
 }
diff --git a/registry/coder/modules/kasmvnc/README.md b/registry/coder/modules/kasmvnc/README.md
index 8616980..df548d1 100644
--- a/registry/coder/modules/kasmvnc/README.md
+++ b/registry/coder/modules/kasmvnc/README.md
@@ -14,7 +14,7 @@ Automatically install [KasmVNC](https://kasmweb.com/kasmvnc) in a workspace, and
 ```tf
 module "kasmvnc" {
   count               = data.coder_workspace.me.start_count
-  source              = "registry.coder.com/modules/kasmvnc/coder"
+  source              = "registry.coder.com/coder/kasmvnc/coder"
   version             = "1.0.23"
   agent_id            = coder_agent.example.id
   desktop_environment = "xfce"
diff --git a/registry/coder/modules/personalize/README.md b/registry/coder/modules/personalize/README.md
index e7fc868..3a5b2cb 100644
--- a/registry/coder/modules/personalize/README.md
+++ b/registry/coder/modules/personalize/README.md
@@ -14,7 +14,7 @@ Run a script on workspace start that allows developers to run custom commands to
 ```tf
 module "personalize" {
   count    = data.coder_workspace.me.start_count
-  source   = "registry.coder.com/modules/personalize/coder"
+  source   = "registry.coder.com/coder/personalize/coder"
   version  = "1.0.2"
   agent_id = coder_agent.example.id
 }
diff --git a/registry/coder/modules/slackme/README.md b/registry/coder/modules/slackme/README.md
index bc2bf2a..d65012b 100644
--- a/registry/coder/modules/slackme/README.md
+++ b/registry/coder/modules/slackme/README.md
@@ -14,7 +14,7 @@ Add the `slackme` command to your workspace that DMs you on Slack when your comm
 ```tf
 module "slackme" {
   count            = data.coder_workspace.me.start_count
-  source           = "registry.coder.com/modules/slackme/coder"
+  source           = "registry.coder.com/coder/slackme/coder"
   version          = "1.0.2"
   agent_id         = coder_agent.example.id
   auth_provider_id = "slack"
@@ -74,7 +74,7 @@ slackme npm run long-build
 ```tf
 module "slackme" {
   count            = data.coder_workspace.me.start_count
-  source           = "registry.coder.com/modules/slackme/coder"
+  source           = "registry.coder.com/coder/slackme/coder"
   version          = "1.0.2"
   agent_id         = coder_agent.example.id
   auth_provider_id = "slack"
diff --git a/registry/coder/modules/vault-github/README.md b/registry/coder/modules/vault-github/README.md
index b04d0c2..44b7cf6 100644
--- a/registry/coder/modules/vault-github/README.md
+++ b/registry/coder/modules/vault-github/README.md
@@ -15,7 +15,7 @@ This module lets you authenticate with [Hashicorp Vault](https://www.vaultprojec
 ```tf
 module "vault" {
   count      = data.coder_workspace.me.start_count
-  source     = "registry.coder.com/modules/vault-github/coder"
+  source     = "registry.coder.com/coder/vault-github/coder"
   version    = "1.0.7"
   agent_id   = coder_agent.example.id
   vault_addr = "https://vault.example.com"
@@ -47,7 +47,7 @@ To configure the Vault module, you must set up a Vault GitHub auth method. See t
 ```tf
 module "vault" {
   count                = data.coder_workspace.me.start_count
-  source               = "registry.coder.com/modules/vault-github/coder"
+  source               = "registry.coder.com/coder/vault-github/coder"
   version              = "1.0.7"
   agent_id             = coder_agent.example.id
   vault_addr           = "https://vault.example.com"
@@ -60,7 +60,7 @@ module "vault" {
 ```tf
 module "vault" {
   count                  = data.coder_workspace.me.start_count
-  source                 = "registry.coder.com/modules/vault-github/coder"
+  source                 = "registry.coder.com/coder/vault-github/coder"
   version                = "1.0.7"
   agent_id               = coder_agent.example.id
   vault_addr             = "https://vault.example.com"
@@ -74,7 +74,7 @@ module "vault" {
 ```tf
 module "vault" {
   count             = data.coder_workspace.me.start_count
-  source            = "registry.coder.com/modules/vault-github/coder"
+  source            = "registry.coder.com/coder/vault-github/coder"
   version           = "1.0.7"
   agent_id          = coder_agent.example.id
   vault_addr        = "https://vault.example.com"
diff --git a/registry/coder/modules/vault-jwt/README.md b/registry/coder/modules/vault-jwt/README.md
index 409a835..53eb41b 100644
--- a/registry/coder/modules/vault-jwt/README.md
+++ b/registry/coder/modules/vault-jwt/README.md
@@ -15,7 +15,7 @@ This module lets you authenticate with [Hashicorp Vault](https://www.vaultprojec
 ```tf
 module "vault" {
   count           = data.coder_workspace.me.start_count
-  source          = "registry.coder.com/modules/vault-jwt/coder"
+  source          = "registry.coder.com/coder/vault-jwt/coder"
   version         = "1.1.0"
   agent_id        = coder_agent.example.id
   vault_addr      = "https://vault.example.com"
@@ -43,7 +43,7 @@ curl -H "X-Vault-Token: ${VAULT_TOKEN}" -X GET "${VAULT_ADDR}/v1/coder/secrets/d
 ```tf
 module "vault" {
   count               = data.coder_workspace.me.start_count
-  source              = "registry.coder.com/modules/vault-jwt/coder"
+  source              = "registry.coder.com/coder/vault-jwt/coder"
   version             = "1.0.31"
   agent_id            = coder_agent.example.id
   vault_addr          = "https://vault.example.com"
@@ -59,7 +59,7 @@ data "coder_workspace_owner" "me" {}
 
 module "vault" {
   count          = data.coder_workspace.me.start_count
-  source         = "registry.coder.com/modules/vault-jwt/coder"
+  source         = "registry.coder.com/coder/vault-jwt/coder"
   version        = "1.0.31"
   agent_id       = coder_agent.example.id
   vault_addr     = "https://vault.example.com"
@@ -72,7 +72,7 @@ module "vault" {
 ```tf
 module "vault" {
   count             = data.coder_workspace.me.start_count
-  source            = "registry.coder.com/modules/vault-jwt/coder"
+  source            = "registry.coder.com/coder/vault-jwt/coder"
   version           = "1.0.31"
   agent_id          = coder_agent.example.id
   vault_addr        = "https://vault.example.com"
@@ -133,7 +133,7 @@ resource "jwt_signed_token" "vault" {
 
 module "vault" {
   count           = data.coder_workspace.me.start_count
-  source          = "registry.coder.com/modules/vault-jwt/coder"
+  source          = "registry.coder.com/coder/vault-jwt/coder"
   version         = "1.1.0"
   agent_id        = coder_agent.example.id
   vault_addr      = "https://vault.example.com"
diff --git a/registry/coder/modules/vault-token/README.md b/registry/coder/modules/vault-token/README.md
index 96d32f4..fada3fe 100644
--- a/registry/coder/modules/vault-token/README.md
+++ b/registry/coder/modules/vault-token/README.md
@@ -20,7 +20,7 @@ variable "vault_token" {
 }
 
 module "vault" {
-  source      = "registry.coder.com/modules/vault-token/coder"
+  source      = "registry.coder.com/coder/vault-token/coder"
   version     = "1.0.7"
   agent_id    = coder_agent.example.id
   vault_token = var.token
@@ -73,7 +73,7 @@ variable "vault_token" {
 }
 
 module "vault" {
-  source            = "registry.coder.com/modules/vault-token/coder"
+  source            = "registry.coder.com/coder/vault-token/coder"
   version           = "1.0.7"
   agent_id          = coder_agent.example.id
   vault_addr        = "https://vault.example.com"
diff --git a/registry/coder/modules/vscode-desktop/README.md b/registry/coder/modules/vscode-desktop/README.md
index 2714153..72e399b 100644
--- a/registry/coder/modules/vscode-desktop/README.md
+++ b/registry/coder/modules/vscode-desktop/README.md
@@ -16,7 +16,7 @@ Uses the [Coder Remote VS Code Extension](https://github.com/coder/vscode-coder)
 ```tf
 module "vscode" {
   count    = data.coder_workspace.me.start_count
-  source   = "registry.coder.com/modules/vscode-desktop/coder"
+  source   = "registry.coder.com/coder/vscode-desktop/coder"
   version  = "1.0.15"
   agent_id = coder_agent.example.id
 }
@@ -29,7 +29,7 @@ module "vscode" {
 ```tf
 module "vscode" {
   count    = data.coder_workspace.me.start_count
-  source   = "registry.coder.com/modules/vscode-desktop/coder"
+  source   = "registry.coder.com/coder/vscode-desktop/coder"
   version  = "1.0.15"
   agent_id = coder_agent.example.id
   folder   = "/home/coder/project"
diff --git a/registry/coder/modules/vscode-web/README.md b/registry/coder/modules/vscode-web/README.md
index ca49d72..9658b84 100644
--- a/registry/coder/modules/vscode-web/README.md
+++ b/registry/coder/modules/vscode-web/README.md
@@ -14,7 +14,7 @@ Automatically install [Visual Studio Code Server](https://code.visualstudio.com/
 ```tf
 module "vscode-web" {
   count          = data.coder_workspace.me.start_count
-  source         = "registry.coder.com/modules/vscode-web/coder"
+  source         = "registry.coder.com/coder/vscode-web/coder"
   version        = "1.0.30"
   agent_id       = coder_agent.example.id
   accept_license = true
@@ -30,7 +30,7 @@ module "vscode-web" {
 ```tf
 module "vscode-web" {
   count          = data.coder_workspace.me.start_count
-  source         = "registry.coder.com/modules/vscode-web/coder"
+  source         = "registry.coder.com/coder/vscode-web/coder"
   version        = "1.0.30"
   agent_id       = coder_agent.example.id
   install_prefix = "/home/coder/.vscode-web"
@@ -44,7 +44,7 @@ module "vscode-web" {
 ```tf
 module "vscode-web" {
   count          = data.coder_workspace.me.start_count
-  source         = "registry.coder.com/modules/vscode-web/coder"
+  source         = "registry.coder.com/coder/vscode-web/coder"
   version        = "1.0.30"
   agent_id       = coder_agent.example.id
   extensions     = ["github.copilot", "ms-python.python", "ms-toolsai.jupyter"]
@@ -59,7 +59,7 @@ Configure VS Code's [settings.json](https://code.visualstudio.com/docs/getstarte
 ```tf
 module "vscode-web" {
   count      = data.coder_workspace.me.start_count
-  source     = "registry.coder.com/modules/vscode-web/coder"
+  source     = "registry.coder.com/coder/vscode-web/coder"
   version    = "1.0.30"
   agent_id   = coder_agent.example.id
   extensions = ["dracula-theme.theme-dracula"]
@@ -77,7 +77,7 @@ By default, this module installs the latest. To pin a specific version, retrieve
 ```tf
 module "vscode-web" {
   count          = data.coder_workspace.me.start_count
-  source         = "registry.coder.com/modules/vscode-web/coder"
+  source         = "registry.coder.com/coder/vscode-web/coder"
   version        = "1.0.30"
   agent_id       = coder_agent.example.id
   commit_id      = "e54c774e0add60467559eb0d1e229c6452cf8447"
diff --git a/registry/coder/modules/windows-rdp/README.md b/registry/coder/modules/windows-rdp/README.md
index 0d4d57b..87bd98d 100644
--- a/registry/coder/modules/windows-rdp/README.md
+++ b/registry/coder/modules/windows-rdp/README.md
@@ -15,7 +15,7 @@ Enable Remote Desktop + a web based client on Windows workspaces, powered by [de
 # AWS example. See below for examples of using this module with other providers
 module "windows_rdp" {
   count       = data.coder_workspace.me.start_count
-  source      = "registry.coder.com/modules/windows-rdp/coder"
+  source      = "registry.coder.com/coder/windows-rdp/coder"
   version     = "1.0.18"
   agent_id    = resource.coder_agent.main.id
   resource_id = resource.aws_instance.dev.id
@@ -33,7 +33,7 @@ module "windows_rdp" {
 ```tf
 module "windows_rdp" {
   count       = data.coder_workspace.me.start_count
-  source      = "registry.coder.com/modules/windows-rdp/coder"
+  source      = "registry.coder.com/coder/windows-rdp/coder"
   version     = "1.0.18"
   agent_id    = resource.coder_agent.main.id
   resource_id = resource.aws_instance.dev.id
@@ -45,7 +45,7 @@ module "windows_rdp" {
 ```tf
 module "windows_rdp" {
   count       = data.coder_workspace.me.start_count
-  source      = "registry.coder.com/modules/windows-rdp/coder"
+  source      = "registry.coder.com/coder/windows-rdp/coder"
   version     = "1.0.18"
   agent_id    = resource.coder_agent.main.id
   resource_id = resource.google_compute_instance.dev[0].id
diff --git a/registry/coder/modules/windsurf/README.md b/registry/coder/modules/windsurf/README.md
index afdb525..3fdd907 100644
--- a/registry/coder/modules/windsurf/README.md
+++ b/registry/coder/modules/windsurf/README.md
@@ -16,7 +16,7 @@ Uses the [Coder Remote VS Code Extension](https://github.com/coder/vscode-coder)
 ```tf
 module "windsurf" {
   count    = data.coder_workspace.me.start_count
-  source   = "registry.coder.com/modules/windsurf/coder"
+  source   = "registry.coder.com/coder/windsurf/coder"
   version  = "1.0.0"
   agent_id = coder_agent.example.id
 }
@@ -29,7 +29,7 @@ module "windsurf" {
 ```tf
 module "windsurf" {
   count    = data.coder_workspace.me.start_count
-  source   = "registry.coder.com/modules/windsurf/coder"
+  source   = "registry.coder.com/coder/windsurf/coder"
   version  = "1.0.0"
   agent_id = coder_agent.example.id
   folder   = "/home/coder/project"
diff --git a/registry/nataindata/modules/apache-airflow/README.md b/registry/nataindata/modules/apache-airflow/README.md
index 8592cf6..802b24d 100644
--- a/registry/nataindata/modules/apache-airflow/README.md
+++ b/registry/nataindata/modules/apache-airflow/README.md
@@ -15,7 +15,7 @@ A module that adds Apache Airflow in your Coder template.
 ```tf
 module "airflow" {
   count    = data.coder_workspace.me.start_count
-  source   = "registry.coder.com/modules/apache-airflow/coder"
+  source   = "registry.coder.com/nataindata/apache-airflow/coder"
   version  = "1.0.13"
   agent_id = coder_agent.main.id
 }
diff --git a/registry/thezoker/modules/nodejs/README.md b/registry/thezoker/modules/nodejs/README.md
index d4cc7e5..15df6da 100644
--- a/registry/thezoker/modules/nodejs/README.md
+++ b/registry/thezoker/modules/nodejs/README.md
@@ -14,7 +14,7 @@ Automatically installs [Node.js](https://github.com/nodejs/node) via [nvm](https
 ```tf
 module "nodejs" {
   count    = data.coder_workspace.me.start_count
-  source   = "registry.coder.com/modules/nodejs/coder"
+  source   = "registry.coder.com/thezoker/nodejs/coder"
   version  = "1.0.10"
   agent_id = coder_agent.example.id
 }
@@ -27,7 +27,7 @@ This installs multiple versions of Node.js:
 ```tf
 module "nodejs" {
   count    = data.coder_workspace.me.start_count
-  source   = "registry.coder.com/modules/nodejs/coder"
+  source   = "registry.coder.com/thezoker/nodejs/coder"
   version  = "1.0.10"
   agent_id = coder_agent.example.id
   node_versions = [
@@ -46,7 +46,7 @@ A example with all available options:
 ```tf
 module "nodejs" {
   count              = data.coder_workspace.me.start_count
-  source             = "registry.coder.com/modules/nodejs/coder"
+  source             = "registry.coder.com/thezoker/nodejs/coder"
   version            = "1.0.10"
   agent_id           = coder_agent.example.id
   nvm_version        = "v0.39.7"
diff --git a/registry/whizus/modules/exoscale-instance-type/README.md b/registry/whizus/modules/exoscale-instance-type/README.md
index 68e725f..664d2cf 100644
--- a/registry/whizus/modules/exoscale-instance-type/README.md
+++ b/registry/whizus/modules/exoscale-instance-type/README.md
@@ -17,7 +17,7 @@ Customize the preselected parameter value:
 ```tf
 module "exoscale-instance-type" {
   count   = data.coder_workspace.me.start_count
-  source  = "registry.coder.com/modules/exoscale-instance-type/coder"
+  source  = "registry.coder.com/whizus/exoscale-instance-type/coder"
   version = "1.0.12"
   default = "standard.medium"
 }
@@ -46,7 +46,7 @@ Change the display name a type using the corresponding maps:
 ```tf
 module "exoscale-instance-type" {
   count   = data.coder_workspace.me.start_count
-  source  = "registry.coder.com/modules/exoscale-instance-type/coder"
+  source  = "registry.coder.com/whizus/exoscale-instance-type/coder"
   version = "1.0.12"
   default = "standard.medium"
 
@@ -81,7 +81,7 @@ Show only gpu1 types
 ```tf
 module "exoscale-instance-type" {
   count         = data.coder_workspace.me.start_count
-  source        = "registry.coder.com/modules/exoscale-instance-type/coder"
+  source        = "registry.coder.com/whizus/exoscale-instance-type/coder"
   version       = "1.0.12"
   default       = "gpu.large"
   type_category = ["gpu"]
diff --git a/registry/whizus/modules/exoscale-zone/README.md b/registry/whizus/modules/exoscale-zone/README.md
index 34a3161..4df2fdf 100644
--- a/registry/whizus/modules/exoscale-zone/README.md
+++ b/registry/whizus/modules/exoscale-zone/README.md
@@ -17,7 +17,7 @@ Customize the preselected parameter value:
 ```tf
 module "exoscale-zone" {
   count   = data.coder_workspace.me.start_count
-  source  = "registry.coder.com/modules/exoscale-zone/coder"
+  source  = "registry.coder.com/whizus/exoscale-zone/coder"
   version = "1.0.12"
   default = "ch-dk-2"
 }
@@ -45,7 +45,7 @@ Change the display name and icon for a zone using the corresponding maps:
 ```tf
 module "exoscale-zone" {
   count   = data.coder_workspace.me.start_count
-  source  = "registry.coder.com/modules/exoscale-zone/coder"
+  source  = "registry.coder.com/whizus/exoscale-zone/coder"
   version = "1.0.12"
   default = "at-vie-1"
 
@@ -77,7 +77,7 @@ Hide the Switzerland zones Geneva and Zurich
 
 ```tf
 module "exoscale-zone" {
-  source  = "registry.coder.com/modules/exoscale-zone/coder"
+  source  = "registry.coder.com/whizus/exoscale-zone/coder"
   version = "1.0.12"
   exclude = ["ch-gva-2", "ch-dk-2"]
 }