diff --git a/CHANGELOG.md b/CHANGELOG.md
index 92e669b..2793028 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## [0.21.4-alpha.1](https://github.com/cloudgraphdev/cli/compare/0.21.3...0.21.4-alpha.1) (2022-04-14)
+
+
+### Bug Fixes
+
+* **rebase:** fastforward alpha to main ([a2416f4](https://github.com/cloudgraphdev/cli/commit/a2416f4a4c83836c0f65aa4f7ed22026f35bceba))
+* Update scan/load output of query engine location to be accurate ([af74605](https://github.com/cloudgraphdev/cli/commit/af746059eab95ec8163fc4d14c9e2d7321e84e46))
+
 ## [0.21.3](https://github.com/cloudgraphdev/cli/compare/0.21.2...0.21.3) (2022-04-06)
 
 
diff --git a/README.md b/README.md
index 9a3a372..a779f5f 100644
--- a/README.md
+++ b/README.md
@@ -1444,7 +1444,7 @@ EXAMPLES
   $ cg init aws -r [Specify resources to crawl]
 ```
 
-_See code: [src/commands/init.ts](https://github.com/cloudgraphdev/cli/blob/v0.21.3/src/commands/init.ts)_
+_See code: [src/commands/init.ts](https://github.com/cloudgraphdev/cli/blob/v0.21.4-alpha.1/src/commands/init.ts)_
 
 ## `cg launch [PROVIDER]`
 
@@ -1476,7 +1476,7 @@ EXAMPLES
   $ cg launch
 ```
 
-_See code: [src/commands/launch.ts](https://github.com/cloudgraphdev/cli/blob/v0.21.3/src/commands/launch.ts)_
+_See code: [src/commands/launch.ts](https://github.com/cloudgraphdev/cli/blob/v0.21.4-alpha.1/src/commands/launch.ts)_
 
 ## `cg load [PROVIDER]`
 
@@ -1510,7 +1510,7 @@ EXAMPLES
   $ cg load aws [Load data for AWS]
 ```
 
-_See code: [src/commands/load.ts](https://github.com/cloudgraphdev/cli/blob/v0.21.3/src/commands/load.ts)_
+_See code: [src/commands/load.ts](https://github.com/cloudgraphdev/cli/blob/v0.21.4-alpha.1/src/commands/load.ts)_
 
 ## `cg policy [PROVIDER]`
 
@@ -1539,7 +1539,7 @@ DESCRIPTION
   Commands to manage policy pack modules, run $ cg policy for more info.
 ```
 
-_See code: [src/commands/policy/index.ts](https://github.com/cloudgraphdev/cli/blob/v0.21.3/src/commands/policy/index.ts)_
+_See code: [src/commands/policy/index.ts](https://github.com/cloudgraphdev/cli/blob/v0.21.4-alpha.1/src/commands/policy/index.ts)_
 
 ## `cg policy add [PROVIDER]`
 
@@ -1752,7 +1752,7 @@ DESCRIPTION
   Commands to manage provider modules, run $ cg provider for more info.
 ```
 
-_See code: [src/commands/provider/index.ts](https://github.com/cloudgraphdev/cli/blob/v0.21.3/src/commands/provider/index.ts)_
+_See code: [src/commands/provider/index.ts](https://github.com/cloudgraphdev/cli/blob/v0.21.4-alpha.1/src/commands/provider/index.ts)_
 
 ## `cg provider add [PROVIDER]`
 
@@ -1974,7 +1974,7 @@ EXAMPLES
   $ cg scan aws --no-serve [Do not start the query engine]
 ```
 
-_See code: [src/commands/scan.ts](https://github.com/cloudgraphdev/cli/blob/v0.21.3/src/commands/scan.ts)_
+_See code: [src/commands/scan.ts](https://github.com/cloudgraphdev/cli/blob/v0.21.4-alpha.1/src/commands/scan.ts)_
 
 ## `cg serve [PROVIDER]`
 
@@ -2006,7 +2006,7 @@ EXAMPLES
   $ cg serve
 ```
 
-_See code: [src/commands/serve.ts](https://github.com/cloudgraphdev/cli/blob/v0.21.3/src/commands/serve.ts)_
+_See code: [src/commands/serve.ts](https://github.com/cloudgraphdev/cli/blob/v0.21.4-alpha.1/src/commands/serve.ts)_
 
 ## `cg teardown [PROVIDER]`
 
@@ -2028,7 +2028,7 @@ EXAMPLES
   $ cg teardown --delete-image
 ```
 
-_See code: [src/commands/teardown.ts](https://github.com/cloudgraphdev/cli/blob/v0.21.3/src/commands/teardown.ts)_
+_See code: [src/commands/teardown.ts](https://github.com/cloudgraphdev/cli/blob/v0.21.4-alpha.1/src/commands/teardown.ts)_
 
 ## `cg update [PROVIDER]`
 
@@ -2064,5 +2064,5 @@ EXAMPLES
   $ cg update
 ```
 
-_See code: [src/commands/update.ts](https://github.com/cloudgraphdev/cli/blob/v0.21.3/src/commands/update.ts)_
+_See code: [src/commands/update.ts](https://github.com/cloudgraphdev/cli/blob/v0.21.4-alpha.1/src/commands/update.ts)_
 <!-- commandsstop -->
diff --git a/package.json b/package.json
index fdd9301..3c9ffca 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@cloudgraph/cli",
   "description": "Scan your cloud infrastructure data and query it with GraphQL",
-  "version": "0.21.3",
+  "version": "0.21.4-alpha.1",
   "author": "AutoCloud",
   "license": "MPL-2.0",
   "publishConfig": {