diff --git a/apps/guide/package.json b/apps/guide/package.json
index 5eb6ab5c1..cf5ddfacc 100644
--- a/apps/guide/package.json
+++ b/apps/guide/package.json
@@ -37,7 +37,8 @@
 	],
 	"repository": {
 		"type": "git",
-		"url": "https://github.com/discordjs/discord.js.git"
+		"url": "https://github.com/discordjs/discord.js.git",
+		"directory": "apps/guide"
 	},
 	"bugs": {
 		"url": "https://github.com/discordjs/discord.js/issues"
diff --git a/apps/website/package.json b/apps/website/package.json
index 633cdc99f..c9ffb0c31 100644
--- a/apps/website/package.json
+++ b/apps/website/package.json
@@ -38,7 +38,8 @@
 	],
 	"repository": {
 		"type": "git",
-		"url": "https://github.com/discordjs/discord.js.git"
+		"url": "https://github.com/discordjs/discord.js.git",
+		"directory": "apps/website"
 	},
 	"bugs": {
 		"url": "https://github.com/discordjs/discord.js/issues"
diff --git a/packages/actions/package.json b/packages/actions/package.json
index 65a7b6dbb..cc2a37730 100644
--- a/packages/actions/package.json
+++ b/packages/actions/package.json
@@ -32,7 +32,8 @@
 	],
 	"repository": {
 		"type": "git",
-		"url": "https://github.com/discordjs/discord.js.git"
+		"url": "https://github.com/discordjs/discord.js.git",
+		"directory": "packages/actions"
 	},
 	"bugs": {
 		"url": "https://github.com/discordjs/discord.js/issues"
diff --git a/packages/api-extractor-utils/package.json b/packages/api-extractor-utils/package.json
index 82271a67a..1737f12c1 100644
--- a/packages/api-extractor-utils/package.json
+++ b/packages/api-extractor-utils/package.json
@@ -24,7 +24,8 @@
 	"license": "Apache-2.0",
 	"repository": {
 		"type": "git",
-		"url": "git+https://github.com/discordjs/discord.js.git"
+		"url": "https://github.com/discordjs/discord.js.git",
+		"directory": "packages/api-extractor-utils"
 	},
 	"bugs": {
 		"url": "https://github.com/discordjs/discord.js/issues"
diff --git a/packages/brokers/package.json b/packages/brokers/package.json
index d43dc37ce..9e8abbf6d 100644
--- a/packages/brokers/package.json
+++ b/packages/brokers/package.json
@@ -50,7 +50,8 @@
 	],
 	"repository": {
 		"type": "git",
-		"url": "git+https://github.com/discordjs/discord.js.git"
+		"url": "https://github.com/discordjs/discord.js.git",
+		"directory": "packages/brokers"
 	},
 	"bugs": {
 		"url": "https://github.com/discordjs/discord.js/issues"
diff --git a/packages/builders/package.json b/packages/builders/package.json
index 6395a431d..6b6cd4299 100644
--- a/packages/builders/package.json
+++ b/packages/builders/package.json
@@ -48,7 +48,8 @@
 	],
 	"repository": {
 		"type": "git",
-		"url": "https://github.com/discordjs/discord.js.git"
+		"url": "https://github.com/discordjs/discord.js.git",
+		"directory": "packages/builders"
 	},
 	"bugs": {
 		"url": "https://github.com/discordjs/discord.js/issues"
diff --git a/packages/collection/package.json b/packages/collection/package.json
index a4d2bbb2e..4b490e4a6 100644
--- a/packages/collection/package.json
+++ b/packages/collection/package.json
@@ -44,7 +44,8 @@
 	],
 	"repository": {
 		"type": "git",
-		"url": "git+https://github.com/discordjs/discord.js.git"
+		"url": "https://github.com/discordjs/discord.js.git",
+		"directory": "packages/collection"
 	},
 	"bugs": {
 		"url": "https://github.com/discordjs/discord.js/issues"
diff --git a/packages/core/package.json b/packages/core/package.json
index 8f57253dd..75dbadc4b 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -46,7 +46,8 @@
 	"keywords": [],
 	"repository": {
 		"type": "git",
-		"url": "git+https://github.com/discordjs/discord.js.git"
+		"url": "https://github.com/discordjs/discord.js.git",
+		"directory": "packages/core"
 	},
 	"bugs": {
 		"url": "https://github.com/discordjs/discord.js/issues"
diff --git a/packages/discord.js/package.json b/packages/discord.js/package.json
index 05f9c7b32..6def7b2d1 100644
--- a/packages/discord.js/package.json
+++ b/packages/discord.js/package.json
@@ -42,7 +42,8 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/discordjs/discord.js.git"
+    "url": "https://github.com/discordjs/discord.js.git",
+    "directory": "packages/discord.js"
   },
   "bugs": {
     "url": "https://github.com/discordjs/discord.js/issues"
diff --git a/packages/docgen/package.json b/packages/docgen/package.json
index fafbeec0c..cf327794d 100644
--- a/packages/docgen/package.json
+++ b/packages/docgen/package.json
@@ -33,7 +33,8 @@
 	],
 	"repository": {
 		"type": "git",
-		"url": "https://github.com/discordjs/discord.js.git"
+		"url": "https://github.com/discordjs/discord.js.git",
+		"directory": "packages/docgen"
 	},
 	"bugs": {
 		"url": "https://github.com/discordjs/discord.js/issues"
diff --git a/packages/formatters/package.json b/packages/formatters/package.json
index c59203e24..a4be767d1 100644
--- a/packages/formatters/package.json
+++ b/packages/formatters/package.json
@@ -38,7 +38,8 @@
 	"keywords": [],
 	"repository": {
 		"type": "git",
-		"url": "git+https://github.com/discordjs/discord.js.git"
+		"url": "https://github.com/discordjs/discord.js.git",
+		"directory": "packages/formatters"
 	},
 	"bugs": {
 		"url": "https://github.com/discordjs/discord.js/issues"
diff --git a/packages/next/package.json b/packages/next/package.json
index c114b40a1..8f2eb7c7e 100644
--- a/packages/next/package.json
+++ b/packages/next/package.json
@@ -45,7 +45,8 @@
 	"keywords": [],
 	"repository": {
 		"type": "git",
-		"url": "git+https://github.com/discordjs/discord.js.git"
+		"url": "https://github.com/discordjs/discord.js.git",
+		"directory": "packages/next"
 	},
 	"bugs": {
 		"url": "https://github.com/discordjs/discord.js/issues"
diff --git a/packages/proxy-container/package.json b/packages/proxy-container/package.json
index 0077cfa90..22ba16ea7 100644
--- a/packages/proxy-container/package.json
+++ b/packages/proxy-container/package.json
@@ -36,7 +36,8 @@
 	],
 	"repository": {
 		"type": "git",
-		"url": "git+https://github.com/discordjs/discord.js.git"
+		"url": "https://github.com/discordjs/discord.js.git",
+		"directory": "packages/proxy-container"
 	},
 	"bugs": {
 		"url": "https://github.com/discordjs/discord.js/issues"
diff --git a/packages/proxy/package.json b/packages/proxy/package.json
index 9acee08db..d209d810d 100644
--- a/packages/proxy/package.json
+++ b/packages/proxy/package.json
@@ -48,7 +48,8 @@
 	],
 	"repository": {
 		"type": "git",
-		"url": "git+https://github.com/discordjs/discord.js.git"
+		"url": "https://github.com/discordjs/discord.js.git",
+		"directory": "packages/proxy"
 	},
 	"bugs": {
 		"url": "https://github.com/discordjs/discord.js/issues"
diff --git a/packages/rest/package.json b/packages/rest/package.json
index 7471ef16e..23e22fe8a 100644
--- a/packages/rest/package.json
+++ b/packages/rest/package.json
@@ -46,7 +46,8 @@
 	],
 	"repository": {
 		"type": "git",
-		"url": "git+https://github.com/discordjs/discord.js.git"
+		"url": "https://github.com/discordjs/discord.js.git",
+		"directory": "packages/rest"
 	},
 	"bugs": {
 		"url": "https://github.com/discordjs/discord.js/issues"
diff --git a/packages/scripts/package.json b/packages/scripts/package.json
index f809fdfa4..4a7cf3d22 100644
--- a/packages/scripts/package.json
+++ b/packages/scripts/package.json
@@ -36,7 +36,8 @@
 	],
 	"repository": {
 		"type": "git",
-		"url": "https://github.com/discordjs/discord.js.git"
+		"url": "https://github.com/discordjs/discord.js.git",
+		"directory": "packages/scripts"
 	},
 	"bugs": {
 		"url": "https://github.com/discordjs/discord.js/issues"
diff --git a/packages/scripts/src/createPackage.ts b/packages/scripts/src/createPackage.ts
index f0a3d4897..b40670ee8 100644
--- a/packages/scripts/src/createPackage.ts
+++ b/packages/scripts/src/createPackage.ts
@@ -46,6 +46,9 @@ export async function createPackage(packageName: string, packageDescription?: st
 	// Edit changelog script
 	packageJSON.scripts.changelog = packageJSON.scripts.changelog.replace('{name}', packageName);
 
+	// Edit repository directory
+	packageJSON.repository.directory = packageJSON.repository.directory.replace('{name}', packageName);
+
 	// Create package.json
 	await writeFile(`package.json`, JSON.stringify(packageJSON, null, 2));
 
diff --git a/packages/scripts/src/template/template.package.json b/packages/scripts/src/template/template.package.json
index 40d4685e4..c39c5f441 100644
--- a/packages/scripts/src/template/template.package.json
+++ b/packages/scripts/src/template/template.package.json
@@ -36,7 +36,8 @@
 	"keywords": [],
 	"repository": {
 		"type": "git",
-		"url": "git+https://github.com/discordjs/discord.js.git"
+		"url": "https://github.com/discordjs/discord.js.git",
+		"directory": "packages/{name}"
 	},
 	"bugs": {
 		"url": "https://github.com/discordjs/discord.js/issues"
diff --git a/packages/ui/package.json b/packages/ui/package.json
index f61901fe4..780050eab 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -38,7 +38,8 @@
 	"keywords": [],
 	"repository": {
 		"type": "git",
-		"url": "git+https://github.com/discordjs/discord.js.git"
+		"url": "https://github.com/discordjs/discord.js.git",
+		"directory": "packages/ui"
 	},
 	"bugs": {
 		"url": "https://github.com/discordjs/discord.js/issues"
diff --git a/packages/util/package.json b/packages/util/package.json
index bdb928876..79cc7b589 100644
--- a/packages/util/package.json
+++ b/packages/util/package.json
@@ -45,7 +45,8 @@
 	],
 	"repository": {
 		"type": "git",
-		"url": "https://github.com/discordjs/discord.js.git"
+		"url": "https://github.com/discordjs/discord.js.git",
+		"directory": "packages/util"
 	},
 	"bugs": {
 		"url": "https://github.com/discordjs/discord.js/issues"
diff --git a/packages/voice/package.json b/packages/voice/package.json
index 9a200f5d6..a77947060 100644
--- a/packages/voice/package.json
+++ b/packages/voice/package.json
@@ -46,7 +46,8 @@
 	],
 	"repository": {
 		"type": "git",
-		"url": "git+https://github.com/discordjs/discord.js.git"
+		"url": "https://github.com/discordjs/discord.js.git",
+		"directory": "packages/voice"
 	},
 	"bugs": {
 		"url": "https://github.com/discordjs/discord.js/issues"
diff --git a/packages/ws/package.json b/packages/ws/package.json
index 9d1812fe3..9c883a30c 100644
--- a/packages/ws/package.json
+++ b/packages/ws/package.json
@@ -52,7 +52,8 @@
 	],
 	"repository": {
 		"type": "git",
-		"url": "git+https://github.com/discordjs/discord.js.git"
+		"url": "https://github.com/discordjs/discord.js.git",
+		"directory": "packages/ws"
 	},
 	"bugs": {
 		"url": "https://github.com/discordjs/discord.js/issues"