diff --git a/README.md b/README.md
index 67c6854f..1806d853 100644
--- a/README.md
+++ b/README.md
@@ -514,7 +514,7 @@ Create a new Adobe I/O App
 USAGE
   $ aio app init [PATH] [-v] [--version] [--install] [-y] [--login] [-e <value> | -t <value> | --repo <value>]
     [--standalone-app |  | ] [-w <value> | -i <value>] [--confirm-new-workspace] [--use-jwt] [--github-pat <value> ]
-    [--base-url <value> ] [--linter none|basic|adobe-recommended]
+    [--repo-base-url <value> ] [--linter none|basic|adobe-recommended]
 
 ARGUMENTS
   PATH  [default: .] Path to the app directory
@@ -527,9 +527,6 @@ FLAGS
   -w, --workspace=<value>       [default: Stage] Specify the Adobe Developer Console Workspace to init from, defaults to
                                 Stage
   -y, --yes                     Skip questions, and use all default values
-  --base-url=<value>            When using with GitHub Enterprise Server, set to the root URL of the API. For example,
-                                if your GitHub Enterprise Server's hostname is `github.acme-inc.com`, then set
-                                `base-url` to `https://github.acme-inc.com/api/v3`
   --[no-]confirm-new-workspace  Prompt to confirm before creating a new workspace
   --github-pat=<value>          github personal access token to use for downloading private quickstart repos
   --[no-]install                [default: true] Run npm installation after files are created
@@ -537,6 +534,9 @@ FLAGS
                                 <options: none|basic|adobe-recommended>
   --[no-]login                  Login using your Adobe ID for interacting with Adobe I/O Developer Console
   --repo=<value>                Init from gh quick-start repo. Expected to be of the form <owner>/<repo>/<path>
+  --repo-base-url=<value>       When using with GitHub Enterprise Server, set to the root URL of the API. For example,
+                                if your GitHub Enterprise Server's hostname is `github.acme-inc.com`, then set
+                                `base-url` to `https://github.acme-inc.com/api/v3`
   --standalone-app              Create a stand-alone application
   --use-jwt                     if the config has both jwt and OAuth Server to Server Credentials (while migrating),
                                 prefer the JWT credentials
diff --git a/src/commands/app/init.js b/src/commands/app/init.js
index 7e8a24e4..9e94857e 100644
--- a/src/commands/app/init.js
+++ b/src/commands/app/init.js
@@ -104,7 +104,7 @@ class InitCommand extends TemplatesCommand {
     }
 
     if (flags.repo) {
-      await this.withQuickstart(flags.repo, flags['github-pat'], flags['base-url'])
+      await this.withQuickstart(flags.repo, flags['github-pat'], flags['repo-base-url'])
     } else {
       // 2. prompt for templates to be installed
       const templates = await this.getTemplatesForFlags(flags)
@@ -134,7 +134,7 @@ class InitCommand extends TemplatesCommand {
 
   async initWithLogin (flags) {
     if (flags.repo) {
-      await this.withQuickstart(flags.repo, flags['github-pat'], flags['base-url'])
+      await this.withQuickstart(flags.repo, flags['github-pat'], flags['repo-base-url'])
     }
     // this will trigger a login
     const consoleCLI = await this.getLibConsoleCLI()
@@ -490,7 +490,7 @@ InitCommand.flags = {
     description: 'github personal access token to use for downloading private quickstart repos',
     dependsOn: ['repo']
   }),
-  'base-url': Flags.string({
+  'repo-base-url': Flags.string({
     description: 'When using with GitHub Enterprise Server, set to the root URL of the API. For example, if your GitHub Enterprise Server\'s hostname is `github.acme-inc.com`, then set `base-url` to `https://github.acme-inc.com/api/v3`',
     dependsOn: ['repo']
   }),
diff --git a/test/commands/app/init.test.js b/test/commands/app/init.test.js
index 2ab071ae..70538511 100644
--- a/test/commands/app/init.test.js
+++ b/test/commands/app/init.test.js
@@ -418,11 +418,11 @@ describe('--no-login', () => {
     expect(Octokit).toHaveBeenCalledWith(expect.objectContaining({ auth: pat }))
   })
 
-  test('--repo --base-url', async () => {
+  test('--repo --repo-base-url', async () => {
     Octokit.mockImplementation(() => ({ repos: { getContent: () => Promise.resolve({ data: [] }) } }))
 
     const baseUrl = 'https://github.acme-inc.com/api/v3'
-    command.argv = ['--repo=org/repo', '--base-url', baseUrl]
+    command.argv = ['--repo=org/repo', '--repo-base-url', baseUrl]
 
     await command.run()