diff --git a/lib/generators/add-generator.js b/lib/generators/add-generator.js
index 8994a608f56..c2572b904cb 100644
--- a/lib/generators/add-generator.js
+++ b/lib/generators/add-generator.js
@@ -1,4 +1,4 @@
-const Generator = require("yeoman-generator");
+const Generator = require("webpack-fork-yeoman-generator");
 const glob = require("glob-all");
 const path = require("path");
 const Confirm = require("webpack-addons").Confirm;
diff --git a/lib/generators/init-generator.js b/lib/generators/init-generator.js
index 5375ee13a59..cab1763da64 100644
--- a/lib/generators/init-generator.js
+++ b/lib/generators/init-generator.js
@@ -1,6 +1,6 @@
 "use strict";
 
-const Generator = require("yeoman-generator");
+const Generator = require("webpack-fork-yeoman-generator");
 const chalk = require("chalk");
 const logSymbols = require("log-symbols");
 
diff --git a/lib/generators/remove-generator.js b/lib/generators/remove-generator.js
index f249af53cfb..48bc2a1ecef 100644
--- a/lib/generators/remove-generator.js
+++ b/lib/generators/remove-generator.js
@@ -1,3 +1,3 @@
-const Generator = require("yeoman-generator");
+const Generator = require("webpack-fork-yeoman-generator");
 
 module.exports = class RemoveGenerator extends Generator {};
diff --git a/lib/generators/update-generator.js b/lib/generators/update-generator.js
index fc0515c3b8f..3112467119d 100644
--- a/lib/generators/update-generator.js
+++ b/lib/generators/update-generator.js
@@ -1,3 +1,3 @@
-const Generator = require("yeoman-generator");
+const Generator = require("webpack-fork-yeoman-generator");
 
 module.exports = class UpdateGenerator extends Generator {};
diff --git a/lib/generators/webpack-generator.js b/lib/generators/webpack-generator.js
index 561f10931f7..6353b28a3d2 100644
--- a/lib/generators/webpack-generator.js
+++ b/lib/generators/webpack-generator.js
@@ -1,6 +1,6 @@
 var path = require("path");
 var mkdirp = require("mkdirp");
-var Generator = require("yeoman-generator");
+var Generator = require("webpack-fork-yeoman-generator");
 var copyUtils = require("../utils/copy-utils");
 
 /**
diff --git a/lib/init/index.js b/lib/init/index.js
index 8fb2b3f6140..b6c91d6fbc5 100644
--- a/lib/init/index.js
+++ b/lib/init/index.js
@@ -1,7 +1,7 @@
 "use strict";
 
 const yeoman = require("yeoman-environment");
-const Generator = require("yeoman-generator");
+const Generator = require("webpack-fork-yeoman-generator");
 const path = require("path");
 const defaultGenerator = require("../generators/init-generator");
 const runTransform = require("./transformations/index");
diff --git a/package.json b/package.json
index 7e3debf5274..e342402c190 100644
--- a/package.json
+++ b/package.json
@@ -108,9 +108,9 @@
     "uglifyjs-webpack-plugin": "^1.2.2",
     "v8-compile-cache": "^1.1.0",
     "webpack-addons": "^1.1.5",
+    "webpack-fork-yeoman-generator": "^1.1.1",
     "yargs": "9.0.1",
-    "yeoman-environment": "^2.0.0",
-    "yeoman-generator": "https://github.com/ev1stensberg/generator.git#Feature-getArgument"
+    "yeoman-environment": "^2.0.0"
   },
   "devDependencies": {
     "@commitlint/cli": "^6.1.0",
diff --git a/yarn.lock b/yarn.lock
index db6e5cc0ddf..e8fab0d6d1b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7802,6 +7802,36 @@ webpack-dev-server@^2.9.7:
     webpack-dev-middleware "1.12.2"
     yargs "6.6.0"
 
+webpack-fork-yeoman-generator@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/webpack-fork-yeoman-generator/-/webpack-fork-yeoman-generator-1.1.1.tgz#c92b454aba7df9ea392669188aa0330964acf76f"
+  dependencies:
+    async "^2.0.0"
+    chalk "^1.0.0"
+    cli-table "^0.3.1"
+    cross-spawn "^5.0.1"
+    dargs "^5.1.0"
+    dateformat "^2.0.0"
+    debug "^2.1.0"
+    detect-conflict "^1.0.0"
+    error "^7.0.2"
+    find-up "^2.1.0"
+    github-username "^4.0.0"
+    istextorbinary "^2.1.0"
+    lodash "^4.11.1"
+    mem-fs-editor "^3.0.0"
+    minimist "^1.2.0"
+    mkdirp "^0.5.0"
+    pretty-bytes "^4.0.2"
+    read-chunk "^2.0.0"
+    read-pkg-up "^2.0.0"
+    rimraf "^2.2.0"
+    run-async "^2.0.0"
+    shelljs "^0.7.0"
+    text-table "^0.2.0"
+    through2 "^2.0.0"
+    yeoman-environment "^1.1.0"
+
 webpack-sources@^1.0.1, webpack-sources@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.1.0.tgz#a101ebae59d6507354d71d8013950a3a8b7a5a54"
@@ -8096,33 +8126,3 @@ yeoman-environment@^2.0.0:
     mem-fs "^1.1.0"
     text-table "^0.2.0"
     untildify "^3.0.2"
-
-"yeoman-generator@https://github.com/ev1stensberg/generator.git#Feature-getArgument":
-  version "1.1.1"
-  resolved "https://github.com/ev1stensberg/generator.git#9e24fa31c85302ca1145ae34fc68b4f133251ca0"
-  dependencies:
-    async "^2.0.0"
-    chalk "^1.0.0"
-    cli-table "^0.3.1"
-    cross-spawn "^5.0.1"
-    dargs "^5.1.0"
-    dateformat "^2.0.0"
-    debug "^2.1.0"
-    detect-conflict "^1.0.0"
-    error "^7.0.2"
-    find-up "^2.1.0"
-    github-username "^4.0.0"
-    istextorbinary "^2.1.0"
-    lodash "^4.11.1"
-    mem-fs-editor "^3.0.0"
-    minimist "^1.2.0"
-    mkdirp "^0.5.0"
-    pretty-bytes "^4.0.2"
-    read-chunk "^2.0.0"
-    read-pkg-up "^2.0.0"
-    rimraf "^2.2.0"
-    run-async "^2.0.0"
-    shelljs "^0.7.0"
-    text-table "^0.2.0"
-    through2 "^2.0.0"
-    yeoman-environment "^1.1.0"