diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
index f838773fb..7d2fa3e7e 100644
--- a/.github/ISSUE_TEMPLATE/bug.yml
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -8,7 +8,7 @@ body:
     attributes:
       label: Pre-flight checklist
       options:
-        - label: I have read the [contribution documentation](https://github.com/electron-userland/electron-forge/blob/main/CONTRIBUTING.md) for this project.
+        - label: I have read the [contribution documentation](https://github.com/electron/forge/blob/main/CONTRIBUTING.md) for this project.
           required: true
         - label: I agree to follow the [code of conduct](https://github.com/electron/electron/blob/main/CODE_OF_CONDUCT.md) that this project uses.
           required: true
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index 242504460..226f85e21 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -8,7 +8,7 @@ body:
     attributes:
       label: Pre-flight checklist
       options:
-        - label: I have read the [contribution documentation](https://github.com/electron-userland/electron-forge/blob/main/CONTRIBUTING.md) for this project.
+        - label: I have read the [contribution documentation](https://github.com/electron/forge/blob/main/CONTRIBUTING.md) for this project.
           required: true
         - label: I agree to follow the [code of conduct](https://github.com/electron/electron/blob/main/CODE_OF_CONDUCT.md) that this project uses.
           required: true
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 46706a848..3a7ca8359 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -3,7 +3,7 @@ Thanks for filing a pull request!
 Please check off all of the steps as they are completed by replacing [ ] with [x].
 -->
 
-- [ ] I have read the [contribution documentation](https://github.com/electron-userland/electron-forge/blob/main/CONTRIBUTING.md) for this project.
+- [ ] I have read the [contribution documentation](https://github.com/electron/forge/blob/main/CONTRIBUTING.md) for this project.
 - [ ] I agree to follow the [code of conduct](https://github.com/electron/electron/blob/main/CODE_OF_CONDUCT.md) that this project follows, as appropriate.
 - [ ] The changes are appropriately documented (if applicable).
 - [ ] The changes have sufficient test coverage (if applicable).
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e8adeadbd..0d85a61d5 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -27,11 +27,11 @@ sites](https://github.com/electron/electron#community).
 ### Debugging
 
 Troubleshooting suggestions can be found in the [support
-documentation](https://github.com/electron-userland/electron-forge/blob/main/SUPPORT.md#troubleshooting).
+documentation](https://github.com/electron/forge/blob/main/SUPPORT.md#troubleshooting).
 
 ## Contribution suggestions
 
-We use the label [`help wanted`](https://github.com/electron-userland/electron-forge/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22)
+We use the label [`help wanted`](https://github.com/electron/forge/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22)
 in the issue tracker to denote fairly-well-scoped-out bugs or feature requests that the community
 can pick up and work on. If any of those labeled issues do not have enough information, please feel
 free to ask constructive questions. (This applies to any open issue.)
@@ -57,7 +57,7 @@ Getting the code base running locally requires the `bolt` command installed glob
 
 ```bash
 npm i -g bolt
-git clone https://github.com/electron-userland/electron-forge
+git clone https://github.com/electron/forge
 cd electron-forge
 # Installs all dependencies, don't run "yarn" or "npm install" yourself
 bolt
diff --git a/README.md b/README.md
index 2ac487acc..b57b00280 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
 ## Electron Forge
 
-[![Build Status](https://github.com/electron-userland/electron-forge/workflows/CI/badge.svg)](https://github.com/electron-userland/electron-forge/actions?query=workflow:CI)
+[![Build Status](https://github.com/electron/forge/workflows/CI/badge.svg)](https://github.com/electron/forge/actions?query=workflow:CI)
 [![Discord](https://img.shields.io/discord/745037351163527189?color=blueviolet&logo=discord)](https://discord.com/invite/APGC3k5yaH)
 [![npm version](https://img.shields.io/npm/v/@electron-forge/cli)](https://npm.im/@electron-forge/cli)
-[![license](https://img.shields.io/github/license/electron-userland/electron-forge.svg)](https://github.com/electron-userland/electron-forge/blob/main/LICENSE)
+[![license](https://img.shields.io/github/license/electron/forge.svg)](https://github.com/electron/forge/blob/main/LICENSE)
 ![status](https://img.shields.io/badge/Status-%20Ready%20for%20Awesome-red.svg)
 
 A complete tool for building modern Electron applications.
@@ -19,7 +19,7 @@ jump right in to Electron development.
 :building_construction:
 
 The `main` branch is a rewrite of Electron Forge that will eventually be the 6.x series. If you
-are looking for the 5.x series (the version currently published to NPM under `electron-forge`), please view the [5.x branch](https://github.com/electron-userland/electron-forge/tree/5.x).
+are looking for the 5.x series (the version currently published to NPM under `electron-forge`), please view the [5.x branch](https://github.com/electron/forge/tree/5.x).
 
 ---
 
@@ -27,9 +27,9 @@ are looking for the 5.x series (the version currently published to NPM under `el
 [Goals](#project-goals) |
 [Docs and Usage](#docs-and-usage) |
 [Configuration](https://www.electronforge.io/configuration) |
-[Support](https://github.com/electron-userland/electron-forge/blob/main/SUPPORT.md) |
-[Contributing](https://github.com/electron-userland/electron-forge/blob/main/CONTRIBUTING.md) |
-[Changelog](https://github.com/electron-userland/electron-forge/blob/main/CHANGELOG.md)
+[Support](https://github.com/electron/forge/blob/main/SUPPORT.md) |
+[Contributing](https://github.com/electron/forge/blob/main/CONTRIBUTING.md) |
+[Changelog](https://github.com/electron/forge/blob/main/CHANGELOG.md)
 
 # Getting Started
 
diff --git a/ci/fix-changelog.js b/ci/fix-changelog.js
index 9eb7af975..39391b3d9 100644
--- a/ci/fix-changelog.js
+++ b/ci/fix-changelog.js
@@ -8,10 +8,10 @@ const changelogPath = path.resolve(__dirname, '..', 'CHANGELOG.md');
 const changelog = fs.readFileSync(changelogPath, 'utf8');
 
 const fixedChangelog = changelog
-  .replace(/\(([A-Za-z0-9]{8})\)/g, (match, commitID) => `([${commitID}](https://github.com/electron-userland/electron-forge/commit/${commitID}))`)
+  .replace(/\(([A-Za-z0-9]{8})\)/g, (match, commitID) => `([${commitID}](https://github.com/electron/forge/commit/${commitID}))`)
   .replace(
     /# ([0-9]+\.[0-9]+\.[0-9]+(?:-[a-z]+.[0-9]+)?) /g,
-    (match, version) => `# [${version}](https://github.com/electron-userland/electron-forge/releases/tag/v${version}) `
+    (match, version) => `# [${version}](https://github.com/electron/forge/releases/tag/v${version}) `
   );
 
 fs.writeFileSync(
diff --git a/packages/api/cli/package.json b/packages/api/cli/package.json
index e4614ac0d..4d84cd4e4 100644
--- a/packages/api/cli/package.json
+++ b/packages/api/cli/package.json
@@ -2,7 +2,7 @@
   "name": "@electron-forge/cli",
   "version": "6.0.0-beta.68",
   "description": "A complete tool for building modern Electron applications",
-  "repository": "https://github.com/electron-userland/electron-forge",
+  "repository": "https://github.com/electron/forge",
   "author": "Samuel Attard",
   "license": "MIT",
   "bin": {
diff --git a/packages/api/core/package.json b/packages/api/core/package.json
index d2d5ec05a..9bb26d54a 100644
--- a/packages/api/core/package.json
+++ b/packages/api/core/package.json
@@ -2,7 +2,7 @@
   "name": "@electron-forge/core",
   "version": "6.0.0-beta.68",
   "description": "A complete tool for building modern Electron applications",
-  "repository": "https://github.com/electron-userland/electron-forge",
+  "repository": "https://github.com/electron/forge",
   "main": "dist/api/index.js",
   "typings": "dist/api/index.d.ts",
   "author": "Samuel Attard",
diff --git a/packages/api/core/src/api/start.ts b/packages/api/core/src/api/start.ts
index 2ad0b4b89..3884f8494 100644
--- a/packages/api/core/src/api/start.ts
+++ b/packages/api/core/src/api/start.ts
@@ -31,7 +31,7 @@ export default async ({
   // Since the `start` command is meant to be long-living (i.e. run forever,
   // until interrupted) we should enable this to keep stdin flowing after ora
   // completes. For more context:
-  // https://github.com/electron-userland/electron-forge/issues/2319
+  // https://github.com/electron/forge/issues/2319
   asyncOra.keepStdinFlowing = true;
 
   await asyncOra('Locating Application', async () => {
diff --git a/packages/api/core/test/slow/api_spec_slow.ts b/packages/api/core/test/slow/api_spec_slow.ts
index f29abf661..a8fa85048 100644
--- a/packages/api/core/test/slow/api_spec_slow.ts
+++ b/packages/api/core/test/slow/api_spec_slow.ts
@@ -292,7 +292,7 @@ describe('Electron Forge API', () => {
 
     // FIXME(erickzhao): This test hangs on the electron-rebuild step
     // with Electron 19. It was tested to work on Electron 18.
-    // see https://github.com/electron-userland/electron-forge/pull/2869
+    // see https://github.com/electron/forge/pull/2869
     describe.skip('with prebuilt native module deps installed', () => {
       before(async () => {
         await installDeps(dir, ['ref-napi']);
diff --git a/packages/maker/appx/package.json b/packages/maker/appx/package.json
index 629816015..994695dbb 100644
--- a/packages/maker/appx/package.json
+++ b/packages/maker/appx/package.json
@@ -2,7 +2,7 @@
   "name": "@electron-forge/maker-appx",
   "version": "6.0.0-beta.68",
   "description": "AppX maker for Electron Forge",
-  "repository": "https://github.com/electron-userland/electron-forge",
+  "repository": "https://github.com/electron/forge",
   "author": "Samuel Attard",
   "license": "MIT",
   "main": "dist/MakerAppX.js",
diff --git a/packages/maker/base/package.json b/packages/maker/base/package.json
index a58d068be..b8534154b 100644
--- a/packages/maker/base/package.json
+++ b/packages/maker/base/package.json
@@ -2,7 +2,7 @@
   "name": "@electron-forge/maker-base",
   "version": "6.0.0-beta.68",
   "description": "Base maker for Electron Forge",
-  "repository": "https://github.com/electron-userland/electron-forge",
+  "repository": "https://github.com/electron/forge",
   "author": "Samuel Attard",
   "license": "MIT",
   "main": "dist/Maker.js",
diff --git a/packages/maker/deb/package.json b/packages/maker/deb/package.json
index 3ed3eb672..0dc6825f6 100644
--- a/packages/maker/deb/package.json
+++ b/packages/maker/deb/package.json
@@ -2,7 +2,7 @@
   "name": "@electron-forge/maker-deb",
   "version": "6.0.0-beta.68",
   "description": "Deb maker for Electron Forge",
-  "repository": "https://github.com/electron-userland/electron-forge",
+  "repository": "https://github.com/electron/forge",
   "author": "Samuel Attard",
   "license": "MIT",
   "main": "dist/MakerDeb.js",
diff --git a/packages/maker/dmg/package.json b/packages/maker/dmg/package.json
index 775c17d38..f05335443 100644
--- a/packages/maker/dmg/package.json
+++ b/packages/maker/dmg/package.json
@@ -2,7 +2,7 @@
   "name": "@electron-forge/maker-dmg",
   "version": "6.0.0-beta.68",
   "description": "DMG maker for Electron Forge",
-  "repository": "https://github.com/electron-userland/electron-forge",
+  "repository": "https://github.com/electron/forge",
   "author": "Samuel Attard",
   "license": "MIT",
   "main": "dist/MakerDMG.js",
diff --git a/packages/maker/flatpak/package.json b/packages/maker/flatpak/package.json
index 8b2c1499b..f5e7cabdc 100644
--- a/packages/maker/flatpak/package.json
+++ b/packages/maker/flatpak/package.json
@@ -2,7 +2,7 @@
   "name": "@electron-forge/maker-flatpak",
   "version": "6.0.0-beta.68",
   "description": "Flatpak maker for Electron Forge",
-  "repository": "https://github.com/electron-userland/electron-forge",
+  "repository": "https://github.com/electron/forge",
   "author": "Samuel Attard",
   "license": "MIT",
   "main": "dist/MakerFlatpak.js",
diff --git a/packages/maker/pkg/package.json b/packages/maker/pkg/package.json
index ff579def5..98cb7b54e 100644
--- a/packages/maker/pkg/package.json
+++ b/packages/maker/pkg/package.json
@@ -2,8 +2,7 @@
   "name": "@electron-forge/maker-pkg",
   "version": "6.0.0-beta.68",
   "description": "PKG maker for Electron Forge",
-  "repository": "https://github.com/electron-userland/electron-forge",
-  "author": "Samuel Attard",
+  "repository": "https://github.com/electron/forge",
   "license": "MIT",
   "main": "dist/MakerPKG.js",
   "typings": "dist/MakerPKG.d.ts",
diff --git a/packages/maker/rpm/package.json b/packages/maker/rpm/package.json
index a5c1ed184..4bd377293 100644
--- a/packages/maker/rpm/package.json
+++ b/packages/maker/rpm/package.json
@@ -2,7 +2,7 @@
   "name": "@electron-forge/maker-rpm",
   "version": "6.0.0-beta.68",
   "description": "Rpm maker for Electron Forge",
-  "repository": "https://github.com/electron-userland/electron-forge",
+  "repository": "https://github.com/electron/forge",
   "author": "Samuel Attard",
   "license": "MIT",
   "main": "dist/MakerRpm.js",
diff --git a/packages/maker/snap/package.json b/packages/maker/snap/package.json
index 33f2923dd..f6cd103e9 100644
--- a/packages/maker/snap/package.json
+++ b/packages/maker/snap/package.json
@@ -2,8 +2,7 @@
   "name": "@electron-forge/maker-snap",
   "version": "6.0.0-beta.68",
   "description": "Snap maker for Electron Forge",
-  "repository": "https://github.com/electron-userland/electron-forge",
-  "author": "Samuel Attard",
+  "repository": "https://github.com/electron/forge",
   "license": "MIT",
   "main": "dist/MakerSnap.js",
   "typings": "dist/MakerSnap.d.ts",
diff --git a/packages/maker/squirrel/package.json b/packages/maker/squirrel/package.json
index 475ced1a5..5d8ccb4ac 100644
--- a/packages/maker/squirrel/package.json
+++ b/packages/maker/squirrel/package.json
@@ -2,7 +2,7 @@
   "name": "@electron-forge/maker-squirrel",
   "version": "6.0.0-beta.68",
   "description": "Squirrel maker for Electron Forge",
-  "repository": "https://github.com/electron-userland/electron-forge",
+  "repository": "https://github.com/electron/forge",
   "author": "Samuel Attard",
   "license": "MIT",
   "main": "dist/MakerSquirrel.js",
diff --git a/packages/maker/wix/package.json b/packages/maker/wix/package.json
index 424500321..7ce531707 100644
--- a/packages/maker/wix/package.json
+++ b/packages/maker/wix/package.json
@@ -2,7 +2,7 @@
   "name": "@electron-forge/maker-wix",
   "version": "6.0.0-beta.68",
   "description": "Wix maker for Electron Forge",
-  "repository": "https://github.com/electron-userland/electron-forge",
+  "repository": "https://github.com/electron/forge",
   "author": "Samuel Attard",
   "license": "MIT",
   "main": "dist/MakerWix.js",
diff --git a/packages/maker/zip/package.json b/packages/maker/zip/package.json
index 1929266f7..17b9fe5cf 100644
--- a/packages/maker/zip/package.json
+++ b/packages/maker/zip/package.json
@@ -2,7 +2,7 @@
   "name": "@electron-forge/maker-zip",
   "version": "6.0.0-beta.68",
   "description": "ZIP maker for Electron Forge",
-  "repository": "https://github.com/electron-userland/electron-forge",
+  "repository": "https://github.com/electron/forge",
   "author": "Samuel Attard",
   "license": "MIT",
   "main": "dist/MakerZIP.js",
diff --git a/packages/plugin/auto-unpack-natives/package.json b/packages/plugin/auto-unpack-natives/package.json
index f7990b82d..7fcc80dcf 100644
--- a/packages/plugin/auto-unpack-natives/package.json
+++ b/packages/plugin/auto-unpack-natives/package.json
@@ -2,7 +2,7 @@
   "name": "@electron-forge/plugin-auto-unpack-natives",
   "version": "6.0.0-beta.68",
   "description": "Auto Unpack Natives plugin for Electron Forge, automatically adds native node modules to asar.unpacked",
-  "repository": "https://github.com/electron-userland/electron-forge",
+  "repository": "https://github.com/electron/forge",
   "author": "Samuel Attard",
   "license": "MIT",
   "main": "dist/AutoUnpackNativesPlugin.js",
diff --git a/packages/plugin/base/package.json b/packages/plugin/base/package.json
index d3b14b3cc..7dd3289da 100644
--- a/packages/plugin/base/package.json
+++ b/packages/plugin/base/package.json
@@ -2,7 +2,7 @@
   "name": "@electron-forge/plugin-base",
   "version": "6.0.0-beta.68",
   "description": "Base plugin for Electron Forge",
-  "repository": "https://github.com/electron-userland/electron-forge",
+  "repository": "https://github.com/electron/forge",
   "author": "Samuel Attard",
   "license": "MIT",
   "main": "dist/Plugin.js",
diff --git a/packages/plugin/compile/package.json b/packages/plugin/compile/package.json
index c40e49241..5028b08e2 100644
--- a/packages/plugin/compile/package.json
+++ b/packages/plugin/compile/package.json
@@ -2,7 +2,7 @@
   "name": "@electron-forge/plugin-compile",
   "version": "6.0.0-beta.68",
   "description": "Electron Compile plugin for Electron Forge",
-  "repository": "https://github.com/electron-userland/electron-forge",
+  "repository": "https://github.com/electron/forge",
   "author": "Samuel Attard",
   "license": "MIT",
   "main": "dist/CompilePlugin.js",
diff --git a/packages/plugin/electronegativity/package.json b/packages/plugin/electronegativity/package.json
index 7823bd14b..6e0fdeb36 100644
--- a/packages/plugin/electronegativity/package.json
+++ b/packages/plugin/electronegativity/package.json
@@ -4,7 +4,7 @@
   "description": "Integrate Electronegativity into the Electron Forge workflow",
   "repository": {
     "type": "git",
-    "url": "https://github.com/electron-userland/electron-forge",
+    "url": "https://github.com/electron/forge",
     "directory": "packages/plugin/electronegativity"
   },
   "author": "Mark Lee",
diff --git a/packages/plugin/local-electron/package.json b/packages/plugin/local-electron/package.json
index b770038ba..cf061f120 100644
--- a/packages/plugin/local-electron/package.json
+++ b/packages/plugin/local-electron/package.json
@@ -2,7 +2,7 @@
   "name": "@electron-forge/plugin-local-electron",
   "version": "6.0.0-beta.68",
   "description": "Local Electron plugin for Electron Forge, let's you use a local build of Electron",
-  "repository": "https://github.com/electron-userland/electron-forge",
+  "repository": "https://github.com/electron/forge",
   "author": "Samuel Attard",
   "license": "MIT",
   "main": "dist/LocalElectronPlugin.js",
diff --git a/packages/plugin/webpack/package.json b/packages/plugin/webpack/package.json
index fca0821e1..7b33083d7 100644
--- a/packages/plugin/webpack/package.json
+++ b/packages/plugin/webpack/package.json
@@ -2,7 +2,7 @@
   "name": "@electron-forge/plugin-webpack",
   "version": "6.0.0-beta.68",
   "description": "Webpack plugin for Electron Forge, lets you use Webpack directly in your tooling",
-  "repository": "https://github.com/electron-userland/electron-forge",
+  "repository": "https://github.com/electron/forge",
   "author": "Samuel Attard",
   "license": "MIT",
   "main": "dist/WebpackPlugin.js",
diff --git a/packages/publisher/base/package.json b/packages/publisher/base/package.json
index efea2085b..e308afe75 100644
--- a/packages/publisher/base/package.json
+++ b/packages/publisher/base/package.json
@@ -2,7 +2,7 @@
   "name": "@electron-forge/publisher-base",
   "version": "6.0.0-beta.68",
   "description": "Base publisher for Electron Forge",
-  "repository": "https://github.com/electron-userland/electron-forge",
+  "repository": "https://github.com/electron/forge",
   "author": "Samuel Attard",
   "license": "MIT",
   "main": "dist/Publisher.js",
diff --git a/packages/publisher/bitbucket/package.json b/packages/publisher/bitbucket/package.json
index 149645639..3ecd314c2 100644
--- a/packages/publisher/bitbucket/package.json
+++ b/packages/publisher/bitbucket/package.json
@@ -2,7 +2,7 @@
   "name": "@electron-forge/publisher-bitbucket",
   "version": "6.0.0-beta.68",
   "description": "Bitbucket publisher for Electron Forge",
-  "repository": "https://github.com/electron-userland/electron-forge",
+  "repository": "https://github.com/electron/forge",
   "author": "Luke Batchelor",
   "license": "MIT",
   "main": "dist/PublisherBitbucket.js",
diff --git a/packages/publisher/electron-release-server/package.json b/packages/publisher/electron-release-server/package.json
index 8f4819de7..79fd72d38 100644
--- a/packages/publisher/electron-release-server/package.json
+++ b/packages/publisher/electron-release-server/package.json
@@ -2,7 +2,7 @@
   "name": "@electron-forge/publisher-electron-release-server",
   "version": "6.0.0-beta.68",
   "description": "Electron release server publisher for Electron Forge",
-  "repository": "https://github.com/electron-userland/electron-forge",
+  "repository": "https://github.com/electron/forge",
   "author": "Samuel Attard",
   "license": "MIT",
   "main": "dist/PublisherERS.js",
diff --git a/packages/publisher/github/package.json b/packages/publisher/github/package.json
index 0d3d924b0..ef440805a 100644
--- a/packages/publisher/github/package.json
+++ b/packages/publisher/github/package.json
@@ -2,7 +2,7 @@
   "name": "@electron-forge/publisher-github",
   "version": "6.0.0-beta.68",
   "description": "Github publisher for Electron Forge",
-  "repository": "https://github.com/electron-userland/electron-forge",
+  "repository": "https://github.com/electron/forge",
   "author": "Samuel Attard",
   "license": "MIT",
   "main": "dist/PublisherGithub.js",
diff --git a/packages/publisher/nucleus/package.json b/packages/publisher/nucleus/package.json
index 76b06284e..7d39973be 100644
--- a/packages/publisher/nucleus/package.json
+++ b/packages/publisher/nucleus/package.json
@@ -2,7 +2,7 @@
   "name": "@electron-forge/publisher-nucleus",
   "version": "6.0.0-beta.68",
   "description": "Nucleus publisher for Electron Forge",
-  "repository": "https://github.com/electron-userland/electron-forge",
+  "repository": "https://github.com/electron/forge",
   "author": "Samuel Attard",
   "license": "MIT",
   "main": "dist/PublisherNucleus.js",
diff --git a/packages/publisher/s3/package.json b/packages/publisher/s3/package.json
index 0196bf84d..8b693919f 100644
--- a/packages/publisher/s3/package.json
+++ b/packages/publisher/s3/package.json
@@ -2,7 +2,7 @@
   "name": "@electron-forge/publisher-s3",
   "version": "6.0.0-beta.68",
   "description": "S3 publisher for Electron Forge",
-  "repository": "https://github.com/electron-userland/electron-forge",
+  "repository": "https://github.com/electron/forge",
   "author": "Samuel Attard",
   "license": "MIT",
   "main": "dist/PublisherS3.js",
diff --git a/packages/publisher/snapcraft/package.json b/packages/publisher/snapcraft/package.json
index a8b5ef65b..0583edef1 100644
--- a/packages/publisher/snapcraft/package.json
+++ b/packages/publisher/snapcraft/package.json
@@ -2,7 +2,7 @@
   "name": "@electron-forge/publisher-snapcraft",
   "version": "6.0.0-beta.68",
   "description": "Snapcraft publisher for Electron Forge",
-  "repository": "https://github.com/electron-userland/electron-forge",
+  "repository": "https://github.com/electron/forge",
   "author": "Samuel Attard",
   "license": "MIT",
   "main": "dist/PublisherSnapcraft.js",
diff --git a/packages/template/base/package.json b/packages/template/base/package.json
index 061aa12a2..b7b70a496 100644
--- a/packages/template/base/package.json
+++ b/packages/template/base/package.json
@@ -2,7 +2,7 @@
   "name": "@electron-forge/template-base",
   "version": "6.0.0-beta.68",
   "description": "Base template for Electron Forge",
-  "repository": "https://github.com/electron-userland/electron-forge",
+  "repository": "https://github.com/electron/forge",
   "author": "Samuel Attard",
   "license": "MIT",
   "main": "dist/BaseTemplate.js",
diff --git a/packages/template/typescript-webpack/package.json b/packages/template/typescript-webpack/package.json
index 268fd8ecf..132db2853 100644
--- a/packages/template/typescript-webpack/package.json
+++ b/packages/template/typescript-webpack/package.json
@@ -2,7 +2,7 @@
   "name": "@electron-forge/template-typescript-webpack",
   "version": "6.0.0-beta.68",
   "description": "Typescript-Webpack template for Electron Forge",
-  "repository": "https://github.com/electron-userland/electron-forge",
+  "repository": "https://github.com/electron/forge",
   "author": "Shelley Vohr <shelley.vohr@gmail.com>",
   "license": "MIT",
   "main": "dist/TypeScriptWebpackTemplate.js",
diff --git a/packages/template/webpack/package.json b/packages/template/webpack/package.json
index c9f2a112c..68aaecbcd 100644
--- a/packages/template/webpack/package.json
+++ b/packages/template/webpack/package.json
@@ -2,7 +2,7 @@
   "name": "@electron-forge/template-webpack",
   "version": "6.0.0-beta.68",
   "description": "Webpack template for Electron Forge, gets you started with Webpack really quickly",
-  "repository": "https://github.com/electron-userland/electron-forge",
+  "repository": "https://github.com/electron/forge",
   "author": "Samuel Attard",
   "license": "MIT",
   "main": "dist/WebpackTemplate.js",
diff --git a/packages/utils/async-ora/package.json b/packages/utils/async-ora/package.json
index 74419cb69..0a9a3a51b 100644
--- a/packages/utils/async-ora/package.json
+++ b/packages/utils/async-ora/package.json
@@ -2,7 +2,7 @@
   "name": "@electron-forge/async-ora",
   "version": "6.0.0-beta.68",
   "description": "A helper utility for wrapping async functions in an ora",
-  "repository": "https://github.com/electron-userland/electron-forge",
+  "repository": "https://github.com/electron/forge",
   "author": "Samuel Attard",
   "license": "MIT",
   "main": "dist/index.js",
diff --git a/packages/utils/async-ora/src/ora-handler.ts b/packages/utils/async-ora/src/ora-handler.ts
index 3085f7816..629af9626 100644
--- a/packages/utils/async-ora/src/ora-handler.ts
+++ b/packages/utils/async-ora/src/ora-handler.ts
@@ -36,7 +36,7 @@ export interface AsyncOraMethod {
    * work to be done, as it will forever be waiting for input on stdin.
    *
    * More context:
-   *   https://github.com/electron-userland/electron-forge/issues/2319
+   *   https://github.com/electron/forge/issues/2319
    */
   keepStdinFlowing?: boolean;
 }
diff --git a/packages/utils/test-utils/package.json b/packages/utils/test-utils/package.json
index 1374a9fed..6b03cd911 100644
--- a/packages/utils/test-utils/package.json
+++ b/packages/utils/test-utils/package.json
@@ -2,7 +2,7 @@
   "name": "@electron-forge/test-utils",
   "version": "6.0.0-beta.68",
   "description": "Helper utilities for the Electron Forge testsuite",
-  "repository": "https://github.com/electron-userland/electron-forge",
+  "repository": "https://github.com/electron/forge",
   "author": "Mark Lee",
   "license": "MIT",
   "main": "dist/index.js",
diff --git a/packages/utils/types/package.json b/packages/utils/types/package.json
index b7ba95a2b..5adbbb026 100644
--- a/packages/utils/types/package.json
+++ b/packages/utils/types/package.json
@@ -2,7 +2,7 @@
   "name": "@electron-forge/shared-types",
   "version": "6.0.0-beta.68",
   "description": "Shared types across Electron Forge",
-  "repository": "https://github.com/electron-userland/electron-forge",
+  "repository": "https://github.com/electron/forge",
   "author": "Samuel Attard",
   "license": "MIT",
   "main": "dist/index.js",
diff --git a/packages/utils/web-multi-logger/package.json b/packages/utils/web-multi-logger/package.json
index d1eb56c2e..7934e1dcf 100644
--- a/packages/utils/web-multi-logger/package.json
+++ b/packages/utils/web-multi-logger/package.json
@@ -2,7 +2,7 @@
   "name": "@electron-forge/web-multi-logger",
   "version": "6.0.0-beta.68",
   "description": "Display multiple streams of logs in one window",
-  "repository": "https://github.com/electron-userland/electron-forge",
+  "repository": "https://github.com/electron/forge",
   "author": "Samuel Attard",
   "license": "MIT",
   "main": "dist/Logger.js",