diff --git a/.sample/README.md b/.sample/README.md
index 6e9a553..f50a101 100644
--- a/.sample/README.md
+++ b/.sample/README.md
@@ -13,7 +13,7 @@ tags: [helper]
 
 ```hcl
 module "MODULE_NAME" {
-  source = "registry.coder.com/modules/MODULE_NAME"
+  source = "registry.coder.com/modules/MODULE_NAME/coder"
   version = "1.0.0"
 }
 ```
@@ -28,7 +28,7 @@ Install the Dracula theme from [OpenVSX](https://open-vsx.org/):
 
 ```hcl
 module "MODULE_NAME" {
-  source = "registry.coder.com/modules/MODULE_NAME"
+  source = "registry.coder.com/modules/MODULE_NAME/coder"
   version = "1.0.0"
   agent_id = coder_agent.example.id
   extensions = [
@@ -45,7 +45,7 @@ Configure VS Code's [settings.json](https://code.visualstudio.com/docs/getstarte
 
 ```hcl
 module "MODULE_NAME" {
-  source = "registry.coder.com/modules/MODULE_NAME"
+  source = "registry.coder.com/modules/MODULE_NAME/coder"
   version = "1.0.0"
   agent_id = coder_agent.example.id
   extensions = [ "dracula-theme.theme-dracula" ]
@@ -61,7 +61,7 @@ Run code-server in the background, don't fetch it from GitHub:
 
 ```hcl
 module "MODULE_NAME" {
-  source = "registry.coder.com/modules/MODULE_NAME"
+  source = "registry.coder.com/modules/MODULE_NAME/coder"
   version = "1.0.0"
   agent_id = coder_agent.example.id
   offline = true
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a94e99c..b45c1f3 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -22,7 +22,6 @@ You can test a module locally by updating the source as follows
 ```hcl
 module "example" {
   source = "git::https://github.com/<USERNAME>/<REPO>.git//<MODULE-NAME>?ref=<BRANCH-NAME>"
-  version = "1.0.0"
 }
 ```
 
diff --git a/README.md b/README.md
index 04bb31f..522477b 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ e.g.
 
 ```hcl
 module "code-server" {
-  source = "registry.coder.com/modules/code-server"
+  source = "registry.coder.com/modules/code-server/coder"
   version = "1.0.0"
   agent_id = coder_agent.main.id
 }
diff --git a/aws-region/README.md b/aws-region/README.md
index a295ef4..824d7d9 100644
--- a/aws-region/README.md
+++ b/aws-region/README.md
@@ -16,7 +16,7 @@ Customize the preselected parameter value:
 
 ```hcl
 module "aws-region" {
-  source = "registry.coder.com/modules/aws-region"
+  source = "registry.coder.com/modules/aws-region/coder"
   version = "1.0.0"
   default = "us-east-1"
 }
@@ -36,7 +36,7 @@ Change the display name and icon for a region using the corresponding maps:
 
 ```hcl
 module "aws-region" {
-  source = "registry.coder.com/modules/aws-region"
+  source = "registry.coder.com/modules/aws-region/coder"
   version = "1.0.0"
   default = "ap-south-1"
   custom_names = {
@@ -60,7 +60,7 @@ Hide the Asia Pacific regions Seoul and Osaka:
 
 ```hcl
 module "aws-region" {
-  source = "registry.coder.com/modules/aws-region"
+  source = "registry.coder.com/modules/aws-region/coder"
   version = "1.0.0"
   exclude = [ "ap-northeast-2", "ap-northeast-3" ]
 }
diff --git a/azure-region/README.md b/azure-region/README.md
index 60e9af8..b22dedf 100644
--- a/azure-region/README.md
+++ b/azure-region/README.md
@@ -13,7 +13,7 @@ This module adds a parameter with all Azure regions, allowing developers to sele
 
 ```hcl
 module "azure_region" {
-  source = "registry.coder.com/modules/azure-region"
+  source = "registry.coder.com/modules/azure-region/coder"
   version = "1.0.0"
   default = "eastus"
 }
@@ -33,7 +33,7 @@ Change the display name and icon for a region using the corresponding maps:
 
 ```hcl
 module "azure-region" {
-  source = "registry.coder.com/modules/azure-region"
+  source = "registry.coder.com/modules/azure-region/coder"
   version = "1.0.0"
   custom_names = {
     "australia": "Go Australia!"
@@ -56,7 +56,7 @@ Hide all regions in Australia except australiacentral:
 
 ```hcl
 module "azure-region" {
-  source = "registry.coder.com/modules/azure-region"
+  source = "registry.coder.com/modules/azure-region/coder"
   version = "1.0.0"
   exclude = [
     "australia",
diff --git a/code-server/README.md b/code-server/README.md
index 73b4a19..c700c96 100644
--- a/code-server/README.md
+++ b/code-server/README.md
@@ -13,7 +13,7 @@ Automatically install [code-server](https://github.com/coder/code-server) in a w
 
 ```hcl
 module "code-server" {
-  source = "registry.coder.com/modules/code-server"
+  source = "registry.coder.com/modules/code-server/coder"
   version = "1.0.0"
   agent_id = coder_agent.example.id
 }
@@ -39,7 +39,7 @@ Install the Dracula theme from [OpenVSX](https://open-vsx.org/):
 
 ```hcl
 module "code-server" {
-  source = "registry.coder.com/modules/code-server"
+  source = "registry.coder.com/modules/code-server/coder"
   version = "1.0.0"
   agent_id = coder_agent.example.id
   extensions = [
@@ -56,7 +56,7 @@ Configure VS Code's [settings.json](https://code.visualstudio.com/docs/getstarte
 
 ```hcl
 module "settings" {
-  source = "registry.coder.com/modules/code-server"
+  source = "registry.coder.com/modules/code-server/coder"
   version = "1.0.0"
   agent_id = coder_agent.example.id
   extensions = [ "dracula-theme.theme-dracula" ]
@@ -72,7 +72,7 @@ Just run code-server in the background, don't fetch it from GitHub:
 
 ```hcl
 module "settings" {
-  source = "registry.coder.com/modules/code-server"
+  source = "registry.coder.com/modules/code-server/coder"
   version = "1.0.0"
   agent_id = coder_agent.example.id
   extensions = [ "dracula-theme.theme-dracula", "ms-azuretools.vscode-docker" ]
@@ -85,7 +85,7 @@ Just run code-server in the background, don't fetch it from GitHub:
 
 ```hcl
 module "settings" {
-  source = "registry.coder.com/modules/code-server"
+  source = "registry.coder.com/modules/code-server/coder"
   version = "1.0.0"
   agent_id = coder_agent.example.id
   offline = true
diff --git a/dotfiles/README.md b/dotfiles/README.md
index 406b903..1383c09 100644
--- a/dotfiles/README.md
+++ b/dotfiles/README.md
@@ -13,7 +13,7 @@ Allow developers to optionally bring their own [dotfiles repository](https://dot
 
 ```hcl
 module "dotfiles" {
-  source = "registry.coder.com/modules/dotfiles"
+  source = "registry.coder.com/modules/dotfiles/coder"
   version = "1.0.0"
   agent_id = coder_agent.example.id
 }
diff --git a/exoscale-instance-type/README.md b/exoscale-instance-type/README.md
index 0ef884c..f1a6586 100644
--- a/exoscale-instance-type/README.md
+++ b/exoscale-instance-type/README.md
@@ -16,7 +16,7 @@ Customize the preselected parameter value:
 
 ```hcl
 module "exoscale-instance-type" {
-  source = "registry.coder.com/modules/exoscale-instance-type"
+  source = "registry.coder.com/modules/exoscale-instance-type/coder"
   version = "1.0.0"
   default = "standard.medium"
 }
@@ -44,7 +44,7 @@ Change the display name a type using the corresponding maps:
 
 ```hcl
 module "exoscale-instance-type" {
-  source = "registry.coder.com/modules/exoscale-instance-type"
+  source = "registry.coder.com/modules/exoscale-instance-type/coder"
   version = "1.0.0"
   default = "standard.medium"
   custom_names = {
diff --git a/exoscale-zone/README.md b/exoscale-zone/README.md
index 56bf884..360c54b 100644
--- a/exoscale-zone/README.md
+++ b/exoscale-zone/README.md
@@ -16,7 +16,7 @@ Customize the preselected parameter value:
 
 ```hcl
 module "exoscale-zone" {
-  source = "registry.coder.com/modules/exoscale-zone"
+  source = "registry.coder.com/modules/exoscale-zone/coder"
   version = "1.0.0"
   default = "ch-dk-2"
 }
@@ -43,7 +43,7 @@ Change the display name and icon for a zone using the corresponding maps:
 
 ```hcl
 module "exoscale-zone" {
-  source = "registry.coder.com/modules/exoscale-zone"
+  source = "registry.coder.com/modules/exoscale-zone/coder"
   version = "1.0.0"
   default = "at-vie-1"
   custom_names = {
@@ -73,7 +73,7 @@ Hide the Switzerland zones Geneva and Zurich
 
 ```hcl
 module "exoscale-zone" {
-  source = "registry.coder.com/modules/exoscale-zone"
+  source = "registry.coder.com/modules/exoscale-zone/coder"
   version = "1.0.0"
   exclude = [ "ch-gva-2", "ch-dk-2" ]
 }
diff --git a/filebrowser/README.md b/filebrowser/README.md
index 961eac6..bde76f6 100644
--- a/filebrowser/README.md
+++ b/filebrowser/README.md
@@ -13,7 +13,7 @@ A file browser for your workspace.
 
 ```hcl
 module "filebrowser" {
-  source = "registry.coder.com/modules/filebrowser"
+  source = "registry.coder.com/modules/filebrowser/coder"
   version = "1.0.0"
   agent_id = coder_agent.example.id
 }
@@ -27,7 +27,7 @@ module "filebrowser" {
 
 ```hcl
 module "filebrowser" {
-  source = "registry.coder.com/modules/filebrowser"
+  source = "registry.coder.com/modules/filebrowser/coder"
   version = "1.0.0"
   agent_id = coder_agent.example.id
   folder = "/home/coder/project"
@@ -38,7 +38,7 @@ module "filebrowser" {
 
 ```hcl
 module "filebrowser" {
-  source = "registry.coder.com/modules/filebrowser"
+  source = "registry.coder.com/modules/filebrowser/coder"
   version = "1.0.0"
   agent_id = coder_agent.example.id
   database_path = ".config/filebrowser.db"
diff --git a/fly-region/README.md b/fly-region/README.md
index 3cdff38..7e5040f 100644
--- a/fly-region/README.md
+++ b/fly-region/README.md
@@ -15,7 +15,7 @@ We can use the simplest format here, only adding a default selection as the `atl
 
 ```hcl
 module "fly-region" {
-  source = "registry.coder.com/modules/fly-region"
+  source = "registry.coder.com/modules/fly-region/coder"
   version = "1.0.0"
   default = "atl"
 }
@@ -31,7 +31,7 @@ The regions argument can be used to display only the desired regions in the Code
 
 ```hcl
 module "fly-region" {
-  source = "registry.coder.com/modules/fly-region"
+  source = "registry.coder.com/modules/fly-region/coder"
   version = "1.0.0"
   default = "ams"
   regions = ["ams", "arn", "atl"]
@@ -46,7 +46,7 @@ Set custom icons and names with their respective maps.
 
 ```hcl
 module "fly-region" {
-  source = "registry.coder.com/modules/fly-region"
+  source = "registry.coder.com/modules/fly-region/coder"
   version = "1.0.0"
   default = "ams"
   custom_icons = {
diff --git a/git-commit-signing/README.md b/git-commit-signing/README.md
index 36bec57..c13e1f8 100644
--- a/git-commit-signing/README.md
+++ b/git-commit-signing/README.md
@@ -18,7 +18,7 @@ This module has a chance of conflicting with the user's dotfiles / the personali
 
 ```hcl
 module "git-commit-signing" {
-  source = "registry.coder.com/modules/git-commit-signing"
+  source = "registry.coder.com/modules/git-commit-signing/coder"
   version = "1.0.0"
   agent_id = coder_agent.example.id
 }
diff --git a/git-config/README.md b/git-config/README.md
index 1ef9b9f..6c9d696 100644
--- a/git-config/README.md
+++ b/git-config/README.md
@@ -13,7 +13,7 @@ Runs a script that updates git credentials in the workspace to match the user's
 
 ```hcl
 module "git-config" {
-  source = "registry.coder.com/modules/git-config"
+  source = "registry.coder.com/modules/git-config/coder"
   version = "1.0.0"
   agent_id = coder_agent.example.id
 }
@@ -27,7 +27,7 @@ TODO: Add screenshot
 
 ```hcl
 module "git-config" {
-  source = "registry.coder.com/modules/git-config"
+  source = "registry.coder.com/modules/git-config/coder"
   version = "1.0.0"
   agent_id = coder_agent.example.id
   allow_email_change = true
@@ -40,7 +40,7 @@ TODO: Add screenshot
 
 ```hcl
 module "git-config" {
-  source = "registry.coder.com/modules/git-config"
+  source = "registry.coder.com/modules/git-config/coder"
   version = "1.0.0"
   agent_id = coder_agent.example.id
   allow_username_change = false
diff --git a/jfrog-oauth/README.md b/jfrog-oauth/README.md
index 409ecbc..f81d837 100644
--- a/jfrog-oauth/README.md
+++ b/jfrog-oauth/README.md
@@ -18,7 +18,7 @@ Install the JF CLI and authenticate package managers with Artifactory using OAut
 
 ```hcl
 module "jfrog" {
-  source = "registry.coder.com/modules/jfrog-oauth"
+  source = "registry.coder.com/modules/jfrog-oauth/coder"
   version = "1.0.0"
   agent_id = coder_agent.example.id
   jfrog_url = "https://jfrog.example.com"
@@ -86,7 +86,7 @@ Configure the Python pip package manager to fetch packages from Artifactory whil
 
 ```hcl
 module "jfrog" {
-  source = "registry.coder.com/modules/jfrog-oauth"
+  source = "registry.coder.com/modules/jfrog-oauth/coder"
   version = "1.0.0"
   agent_id = coder_agent.example.id
   jfrog_url = "https://jfrog.example.com"
@@ -114,7 +114,7 @@ The [JFrog extension](https://open-vsx.org/extension/JFrog/jfrog-vscode-extensio
 
 ```hcl
 module "jfrog" {
-  source = "registry.coder.com/modules/jfrog-oauth"
+  source = "registry.coder.com/modules/jfrog-oauth/coder"
   version = "1.0.0"
   agent_id = coder_agent.example.id
   jfrog_url = "https://jfrog.example.com"
diff --git a/jfrog-token/README.md b/jfrog-token/README.md
index 9565650..2cba7ad 100644
--- a/jfrog-token/README.md
+++ b/jfrog-token/README.md
@@ -14,7 +14,7 @@ Install the JF CLI and authenticate package managers with Artifactory using Arti
 
 ```hcl
 module "jfrog" {
-  source = "registry.coder.com/modules/jfrog-token"
+  source = "registry.coder.com/modules/jfrog-token/coder"
   version = "1.0.0"
   agent_id = coder_agent.example.id
   jfrog_url = "https://XXXX.jfrog.io"
@@ -47,7 +47,7 @@ variable "artifactory_access_token" {
 
 ```hcl
 module "jfrog" {
-  source = "registry.coder.com/modules/jfrog-token"
+  source = "registry.coder.com/modules/jfrog-token/coder"
   version = "1.0.0"
   agent_id = coder_agent.example.id
   jfrog_url = "https://YYYY.jfrog.io"
@@ -80,7 +80,7 @@ The [JFrog extension](https://open-vsx.org/extension/JFrog/jfrog-vscode-extensio
 
 ```hcl
 module "jfrog" {
-  source = "registry.coder.com/modules/jfrog-token"
+  source = "registry.coder.com/modules/jfrog-token/coder"
   version = "1.0.0"
   agent_id = coder_agent.example.id
   jfrog_url = "https://XXXX.jfrog.io"
diff --git a/jupyter-notebook/README.md b/jupyter-notebook/README.md
index 741b5ef..69b6176 100644
--- a/jupyter-notebook/README.md
+++ b/jupyter-notebook/README.md
@@ -15,7 +15,7 @@ A module that adds Jupyter Notebook in your Coder template.
 
 ```hcl
 module "jupyter-notebook" {
-  source = "registry.coder.com/modules/jupyter-notebook"
+  source = "registry.coder.com/modules/jupyter-notebook/coder"
   version = "1.0.0"
   agent_id = coder_agent.example.id
 }
diff --git a/jupyterlab/README.md b/jupyterlab/README.md
index 24592c2..8984da2 100644
--- a/jupyterlab/README.md
+++ b/jupyterlab/README.md
@@ -15,7 +15,7 @@ A module that adds JupyterLab in your Coder template.
 
 ```hcl
 module "jupyterlab" {
-  source = "registry.coder.com/modules/jupyterlab"
+  source = "registry.coder.com/modules/jupyterlab/coder"
   version = "1.0.0"
   agent_id = coder_agent.example.id
 }
diff --git a/personalize/README.md b/personalize/README.md
index bec04af..4ddb036 100644
--- a/personalize/README.md
+++ b/personalize/README.md
@@ -13,7 +13,7 @@ Run a script on workspace start that allows developers to run custom commands to
 
 ```hcl
 module "personalize" {
-  source = "registry.coder.com/modules/personalize"
+  source = "registry.coder.com/modules/personalize/coder"
   version = "1.0.0"
   agent_id = coder_agent.example.id
 }
diff --git a/slackme/README.md b/slackme/README.md
index 57a5de2..2bd17e8 100644
--- a/slackme/README.md
+++ b/slackme/README.md
@@ -56,7 +56,7 @@ slackme npm run long-build
 
    ```hcl
    module "slackme" {
-     source = "registry.coder.com/modules/slackme"
+  source = "registry.coder.com/modules/slackme/coder"
      version = "1.0.0"
      agent_id = coder_agent.example.id
      auth_provider_id = "slack"
@@ -72,7 +72,7 @@ slackme npm run long-build
 
 ```hcl
 module "slackme" {
-  source = "registry.coder.com/modules/slackme"
+  source = "registry.coder.com/modules/slackme/coder"
   version = "1.0.0"
   agent_id = coder_agent.example.id
   auth_provider_id = "slack"
diff --git a/vscode-desktop/README.md b/vscode-desktop/README.md
index ab9becc..f3d05f7 100644
--- a/vscode-desktop/README.md
+++ b/vscode-desktop/README.md
@@ -15,7 +15,7 @@ Uses the [Coder Remote VS Code Extension](https://github.com/coder/vscode-coder)
 
 ```hcl
 module "vscode" {
-  source = "registry.coder.com/modules/vscode-desktop"
+  source = "registry.coder.com/modules/vscode-desktop/coder"
   version = "1.0.0"
   agent_id = coder_agent.example.id
 }
@@ -27,7 +27,7 @@ module "vscode" {
 
 ```hcl
 module "vscode" {
-  source = "registry.coder.com/modules/vscode-desktop"
+  source = "registry.coder.com/modules/vscode-desktop/coder"
   version = "1.0.0"
   agent_id = coder_agent.example.id
   folder = "/home/coder/project"