diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..af19312d1
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+text=auto
\ No newline at end of file
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8de7bdbde..fab4b9c35 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -41,14 +41,14 @@ jobs:
       - name: Yarn Install
         run: yarn install --ignore-engines --frozen-lockfile
       - name: Run ember-cli-fastboot Tests
-        run: yarn workspace ember-cli-fastboot test:ember
+        run: yarn workspace @gaurav9576/ember-cli-fastboot test:ember
       - name: Run fastboot Tests
         if: ${{ matrix.os != 'windows-latest' }}
-        run: yarn workspace fastboot test
+        run: yarn workspace @gaurav9576/fastboot test
       - name: Run fastboot-express-middleware Tests
-        run: yarn workspace fastboot-express-middleware test
+        run: yarn workspace @gaurav9576/fastboot-express-middleware test
       - name: Run fastboot-app-server Tests
-        run: yarn workspace fastboot-app-server test:mocha
+        run: yarn workspace @gaurav9576/fastboot-app-server test:mocha
 
   integration-tests:
     name: Integration Tests
@@ -119,15 +119,20 @@ jobs:
         uses: volta-cli/action@v4
         with:
           node-version: ${{ matrix.node-version }}
+      - name: Update Npm
+        run: |
+          volta install npm@8
+          volta pin npm@8
+          npm -v
       - name: Yarn Install
         run: |
           yarn install --ignore-engines --frozen-lockfile
       - name: Precook node_modules
         run: |
-          yarn workspace ember-cli-fastboot pretest:precook
+          yarn workspace @gaurav9576/ember-cli-fastboot pretest:precook
       - name: Run Mocha Tests
         run: |
-          yarn workspace ember-cli-fastboot test:mocha
+          yarn workspace @gaurav9576/ember-cli-fastboot test:mocha
 
   try-scenarios:
     name: "${{ matrix.ember-try-scenario }} Scenario for ember-cli-fastboot"
@@ -163,4 +168,4 @@ jobs:
           cache: yarn
       - run: yarn install --ignore-engines --frozen-lockfile
       - name: test
-        run: yarn workspace ember-cli-fastboot ember try:one ${{ matrix.ember-try-scenario }} --skip-cleanup
+        run: yarn workspace @gaurav9576/ember-cli-fastboot ember try:one ${{ matrix.ember-try-scenario }} --skip-cleanup
diff --git a/package.json b/package.json
index 5eb69bcdc..07547c6e1 100644
--- a/package.json
+++ b/package.json
@@ -16,10 +16,10 @@
   },
   "scripts": {
     "test": "npm-run-all test:*",
-    "test:ember-cli-fastboot": "yarn workspace ember-cli-fastboot test:ember",
-    "test:fastboot": "yarn workspace fastboot test",
-    "test:fastboot-express-middleware": "yarn workspace fastboot-express-middleware test",
-    "test:fastboot-app-server": "yarn workspace fastboot-app-server test:mocha",
+    "test:ember-cli-fastboot": "yarn workspace @gaurav9576/ember-cli-fastboot test:ember",
+    "test:fastboot": "yarn workspace @gaurav9576/fastboot test",
+    "test:fastboot-express-middleware": "yarn workspace @gaurav9576/fastboot-express-middleware test",
+    "test:fastboot-app-server": "yarn workspace @gaurav9576/fastboot-app-server test:mocha",
     "test:integration": "yarn workspace integration-tests test",
     "test:extra": "yarn workspace basic-app test:mocha && yarn workspace custom-fastboot-app test:mocha"
   },
@@ -30,7 +30,8 @@
     "release-it-yarn-workspaces": "^2.0.0"
   },
   "resolutions": {
-    "fastboot": "4.1.1"
+    "fastboot": "file:packages/fastboot",
+    "ember-cli-fastboot": "file:packages/ember-cli-fastboot"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
diff --git a/packages/ember-cli-fastboot/app/instance-initializers/clear-double-boot.js b/packages/ember-cli-fastboot/app/instance-initializers/clear-double-boot.js
index bf8f015b8..41d1548a1 100644
--- a/packages/ember-cli-fastboot/app/instance-initializers/clear-double-boot.js
+++ b/packages/ember-cli-fastboot/app/instance-initializers/clear-double-boot.js
@@ -1 +1 @@
-export { default } from 'ember-cli-fastboot/instance-initializers/clear-double-boot';
+export { default } from '@gaurav9576/ember-cli-fastboot/instance-initializers/clear-double-boot';
diff --git a/packages/ember-cli-fastboot/app/locations/none.js b/packages/ember-cli-fastboot/app/locations/none.js
index 578cc0cdc..4192d5f95 100644
--- a/packages/ember-cli-fastboot/app/locations/none.js
+++ b/packages/ember-cli-fastboot/app/locations/none.js
@@ -1 +1 @@
-export { default } from 'ember-cli-fastboot/locations/none';
+export { default } from '@gaurav9576/ember-cli-fastboot/locations/none';
diff --git a/packages/ember-cli-fastboot/app/services/fastboot.js b/packages/ember-cli-fastboot/app/services/fastboot.js
index 1ca8b7dda..20e09afd3 100644
--- a/packages/ember-cli-fastboot/app/services/fastboot.js
+++ b/packages/ember-cli-fastboot/app/services/fastboot.js
@@ -1 +1 @@
-export { default } from 'ember-cli-fastboot/services/fastboot';
+export { default } from '@gaurav9576/ember-cli-fastboot/services/fastboot';
diff --git a/packages/ember-cli-fastboot/fix-node-modules.mjs b/packages/ember-cli-fastboot/fix-node-modules.mjs
index 96c081172..6b6b1e87f 100644
--- a/packages/ember-cli-fastboot/fix-node-modules.mjs
+++ b/packages/ember-cli-fastboot/fix-node-modules.mjs
@@ -28,10 +28,10 @@ Options:
 }
 
 function run(shouldRestore) {
-  ['fastboot', 'fastboot-express-middleware'].forEach((packageName) => {
+  ['@gaurav9576/fastboot', '@gaurav9576/fastboot-express-middleware'].forEach((packageName) => {
     const nodeModulesPackageDir = path.join(nodeModulesDir, packageName);
     const precookedPackageDir = path.join(precookedDir, packageName);
-    const workspacesPackageDir = path.resolve(packagesDir, packageName);
+    const workspacesPackageDir = path.resolve(packagesDir, packageName.substring(packageName.indexOf('/') + 1));
     if (fs.existsSync(nodeModulesPackageDir)) {
       console.log(chalk.blue(`remove ${nodeModulesPackageDir}`));
       fs.removeSync(nodeModulesPackageDir);
@@ -46,10 +46,12 @@ function run(shouldRestore) {
           `symlink ${nodeModulesPackageDir} -> ${workspacesPackageDir}`
         )
       );
+      fs.ensureDirSync(path.dirname(nodeModulesPackageDir));
       fs.symlinkSync(workspacesPackageDir, nodeModulesPackageDir, 'dir');
       console.log(
         chalk.green(`symlink ${precookedPackageDir} -> ${workspacesPackageDir}`)
       );
+      fs.ensureDirSync(path.dirname(precookedPackageDir));
       fs.symlinkSync(workspacesPackageDir, precookedPackageDir, 'dir');
     }
   });
diff --git a/packages/ember-cli-fastboot/index.js b/packages/ember-cli-fastboot/index.js
index 41c20d52b..b1cdfb160 100644
--- a/packages/ember-cli-fastboot/index.js
+++ b/packages/ember-cli-fastboot/index.js
@@ -5,8 +5,8 @@ const path = require('path');
 const fs = require('fs');
 
 const MergeTrees = require('broccoli-merge-trees');
-const FastBootExpressMiddleware = require('fastboot-express-middleware');
-const FastBoot = require('fastboot');
+const FastBootExpressMiddleware = require('@gaurav9576/fastboot-express-middleware');
+const FastBoot = require('@gaurav9576/fastboot');
 const chalk = require('chalk');
 
 const fastbootAppBoot = require('./lib/utilities/fastboot-app-boot');
diff --git a/packages/ember-cli-fastboot/lib/path/get-path.js b/packages/ember-cli-fastboot/lib/path/get-path.js
new file mode 100644
index 000000000..dacadc7fc
--- /dev/null
+++ b/packages/ember-cli-fastboot/lib/path/get-path.js
@@ -0,0 +1,5 @@
+const path = require('path');
+
+module.exports = function() {
+  return path.resolve(__dirname, '../../../../packages/ember-cli-fastboot');
+};
diff --git a/packages/ember-cli-fastboot/lib/path/set-fastboot-pkg-path.js b/packages/ember-cli-fastboot/lib/path/set-fastboot-pkg-path.js
new file mode 100644
index 000000000..8bea4d3f0
--- /dev/null
+++ b/packages/ember-cli-fastboot/lib/path/set-fastboot-pkg-path.js
@@ -0,0 +1,19 @@
+const scope = '@gaurav9576';
+const packageDir = `${__dirname}/../../../../packages`;
+
+module.exports = function setFastbootPkgPath(pkg) {
+  pkg.dependencies = pkg.dependencies ?? {};
+  pkg.overrides = pkg.overrides ?? {};
+  pkg.overrides[`${scope}/fastboot`] = '*';
+  pkg.overrides[`${scope}/fastboot-express-middleware`] = '*';
+  [pkg.dependencies, pkg.devDependencies, pkg.overrides].forEach(depList => {
+    ['fastboot', 'ember-cli-fastboot', 'fastboot-express-middleware'].forEach(
+      depName => {
+        const dep = `${scope}/${depName}`;
+        if (dep in depList) {
+          depList[dep] = `file:${packageDir}/${depName}`;
+        }
+      }
+    );
+  });
+};
diff --git a/packages/ember-cli-fastboot/package.json b/packages/ember-cli-fastboot/package.json
index 8a670fd34..03776e63c 100644
--- a/packages/ember-cli-fastboot/package.json
+++ b/packages/ember-cli-fastboot/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "ember-cli-fastboot",
+  "name": "@gaurav9576/ember-cli-fastboot",
   "version": "4.1.1",
   "description": "Server-side rendering for Ember.js apps",
   "keywords": [
@@ -39,8 +39,8 @@
     "ember-cli-lodash-subset": "^2.0.1",
     "ember-cli-preprocess-registry": "^3.3.0",
     "ember-cli-version-checker": "^5.1.2",
-    "fastboot": "4.1.1",
-    "fastboot-express-middleware": "4.1.1",
+    "@gaurav9576/fastboot": "4.1.1",
+    "@gaurav9576/fastboot-express-middleware": "4.1.1",
     "fastboot-transform": "^0.1.3",
     "fs-extra": "^10.0.0",
     "json-stable-stringify": "^1.0.1",
@@ -69,7 +69,7 @@
     "co": "4.6.0",
     "ember-auto-import": "^2.2.1",
     "ember-cli": "~4.1.0",
-    "ember-cli-addon-tests": "^0.11.1",
+    "ember-cli-addon-tests": "Gaurav0/ember-cli-addon-tests#fix_scope",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-htmlbars": "^5.7.2",
     "ember-cli-inject-live-reload": "^2.1.0",
diff --git a/packages/ember-cli-fastboot/test/fastboot-config-test.js b/packages/ember-cli-fastboot/test/fastboot-config-test.js
index 19202c763..dbc50262e 100644
--- a/packages/ember-cli-fastboot/test/fastboot-config-test.js
+++ b/packages/ember-cli-fastboot/test/fastboot-config-test.js
@@ -3,24 +3,26 @@
 const expect = require('chai').use(require('chai-string')).expect;
 const RSVP = require('rsvp');
 const request = RSVP.denodeify(require('request'));
+const setFastbootPkgPath = require('../lib/path/set-fastboot-pkg-path');
 
 const AddonTestApp = require('ember-cli-addon-tests').AddonTestApp;
 
-describe('FastBoot config', function () {
+describe('FastBoot config', function() {
   this.timeout(400000);
 
   let app;
 
-  before(function () {
+  before(function() {
     app = new AddonTestApp();
 
     return app
       .create('fastboot-config', {
         emberVersion: '~3.28.12',
-        emberDataVersion: '~3.28.12',
+        emberDataVersion: '~3.28.12'
       })
-      .then(function () {
-        app.editPackageJSON((pkg) => {
+      .then(function() {
+        app.editPackageJSON(pkg => {
+          setFastbootPkgPath(pkg);
           delete pkg.devDependencies['ember-fetch'];
           delete pkg.devDependencies['ember-welcome-page'];
           // needed because @ember-data/store does `FastBoot.require('crypto')`
@@ -28,24 +30,24 @@ describe('FastBoot config', function () {
         });
         return app.run('npm', 'install');
       })
-      .then(function () {
+      .then(function() {
         return app.startServer({
-          command: 'serve',
+          command: 'serve'
         });
       });
   });
 
-  after(function () {
+  after(function() {
     return app.stopServer();
   });
 
-  it('provides sandbox globals', function () {
+  it('provides sandbox globals', function() {
     return request({
       url: 'http://localhost:49741/',
       headers: {
-        Accept: 'text/html',
-      },
-    }).then(function (response) {
+        Accept: 'text/html'
+      }
+    }).then(function(response) {
       expect(response.statusCode).to.equal(200);
       expect(response.headers['content-type']).to.equalIgnoreCase(
         'text/html; charset=utf-8'
diff --git a/packages/ember-cli-fastboot/test/fastboot-location-config-test.js b/packages/ember-cli-fastboot/test/fastboot-location-config-test.js
index 63a0797c9..efbeda611 100644
--- a/packages/ember-cli-fastboot/test/fastboot-location-config-test.js
+++ b/packages/ember-cli-fastboot/test/fastboot-location-config-test.js
@@ -3,6 +3,7 @@
 const expect = require('chai').expect;
 const RSVP = require('rsvp');
 const request = RSVP.denodeify(require('request'));
+const setFastbootPkgPath = require('../lib/path/set-fastboot-pkg-path');
 
 const AddonTestApp = require('ember-cli-addon-tests').AddonTestApp;
 
@@ -21,6 +22,7 @@ describe('FastBootLocation Configuration', function () {
       })
       .then(function () {
         app.editPackageJSON((pkg) => {
+          setFastbootPkgPath(pkg);
           delete pkg.devDependencies['ember-fetch'];
           delete pkg.devDependencies['ember-welcome-page'];
           // needed because @ember-data/store does `FastBoot.require('crypto')`
diff --git a/packages/ember-cli-fastboot/test/fastboot-location-test.js b/packages/ember-cli-fastboot/test/fastboot-location-test.js
index 99c4540b5..1ca661fc9 100644
--- a/packages/ember-cli-fastboot/test/fastboot-location-test.js
+++ b/packages/ember-cli-fastboot/test/fastboot-location-test.js
@@ -3,6 +3,7 @@
 const expect = require('chai').expect;
 const RSVP = require('rsvp');
 const request = RSVP.denodeify(require('request'));
+const setFastbootPkgPath = require('../lib/path/set-fastboot-pkg-path');
 
 const AddonTestApp = require('ember-cli-addon-tests').AddonTestApp;
 
@@ -20,6 +21,7 @@ describe('FastBootLocation', function () {
       })
       .then(function () {
         app.editPackageJSON((pkg) => {
+          setFastbootPkgPath(pkg);
           delete pkg.devDependencies['ember-fetch'];
           delete pkg.devDependencies['ember-welcome-page'];
           // needed because @ember-data/store does `FastBoot.require('crypto')`
diff --git a/packages/ember-cli-fastboot/test/fixtures/request/lib/post-middleware/index.js b/packages/ember-cli-fastboot/test/fixtures/request/lib/post-middleware/index.js
index a6466b981..2ce415da6 100644
--- a/packages/ember-cli-fastboot/test/fixtures/request/lib/post-middleware/index.js
+++ b/packages/ember-cli-fastboot/test/fixtures/request/lib/post-middleware/index.js
@@ -1,6 +1,6 @@
 var bodyParser = require('body-parser');
-var FastBootExpressMiddleware = require('fastboot-express-middleware');
-var FastBoot = require('fastboot');
+var FastBootExpressMiddleware = require('@gaurav9576/fastboot-express-middleware');
+var FastBoot = require('@gaurav9576/fastboot');
 
 module.exports = {
   name: 'post-middleware',
diff --git a/packages/ember-cli-fastboot/test/fixtures/request/lib/post-middleware/package.json b/packages/ember-cli-fastboot/test/fixtures/request/lib/post-middleware/package.json
index 8f2ccbf0d..44ca36f33 100644
--- a/packages/ember-cli-fastboot/test/fixtures/request/lib/post-middleware/package.json
+++ b/packages/ember-cli-fastboot/test/fixtures/request/lib/post-middleware/package.json
@@ -2,7 +2,7 @@
   "name": "post-middlware",
   "ember-addon": {
     "after": [
-      "ember-cli-fastboot"
+      "@gaurav9576/ember-cli-fastboot"
     ]
   },
   "keywords": [
diff --git a/packages/ember-cli-fastboot/test/package-json-test.js b/packages/ember-cli-fastboot/test/package-json-test.js
index 0f98eb677..5e10ebbfa 100644
--- a/packages/ember-cli-fastboot/test/package-json-test.js
+++ b/packages/ember-cli-fastboot/test/package-json-test.js
@@ -5,6 +5,7 @@ const expect = chai.expect;
 const fs = require('fs-extra');
 const path = require('path');
 const AddonTestApp = require('ember-cli-addon-tests').AddonTestApp;
+const setFastbootPkgPath = require('../lib/path/set-fastboot-pkg-path');
 
 chai.use(require('chai-fs'));
 
@@ -23,6 +24,7 @@ describe('generating package.json', function () {
         })
         .then(function () {
           customApp.editPackageJSON((pkg) => {
+            setFastbootPkgPath(pkg);
             delete pkg.devDependencies['ember-fetch'];
             delete pkg.devDependencies['ember-welcome-page'];
             // needed because @ember-data/store does `FastBoot.require('crypto')`
diff --git a/packages/ember-cli-fastboot/test/request-details-test.js b/packages/ember-cli-fastboot/test/request-details-test.js
index 278392cfb..f8162d675 100644
--- a/packages/ember-cli-fastboot/test/request-details-test.js
+++ b/packages/ember-cli-fastboot/test/request-details-test.js
@@ -6,15 +6,21 @@ const expect = chai.expect;
 const RSVP = require('rsvp');
 const AddonTestApp = require('ember-cli-addon-tests').AddonTestApp;
 const request = RSVP.denodeify(require('request'));
+const setFastbootPkgPath = require('../lib/path/set-fastboot-pkg-path');
 
 async function injectMiddlewareAddon(app) {
   app.editPackageJSON(function (pkg) {
+    const scope = '@gaurav9576';
+    pkg.dependencies = pkg.dependencies ?? {};
+    ['fastboot', 'fastboot-express-middleware'].forEach(depName => {
+      pkg.dependencies[`${scope}/${depName}`] = '*';
+    });
     pkg.devDependencies['body-parser'] =
       process.env.npm_package_devDependencies_body_parser;
-    pkg.dependencies = pkg.dependencies || {};
     pkg['ember-addon'] = {
       paths: ['lib/post-middleware'],
     };
+    setFastbootPkgPath(pkg);
     delete pkg.devDependencies['ember-fetch'];
     delete pkg.devDependencies['ember-welcome-page'];
     // needed because @ember-data/store does `FastBoot.require('crypto')`
@@ -24,19 +30,15 @@ async function injectMiddlewareAddon(app) {
   await app.run(
     'ln',
     '-s',
-    path.resolve(__dirname, '../../fastboot'),
+    path.resolve(__dirname, '../../@gaurav9576/fastboot'),
     path.resolve(app.path, 'node_modules/fastboot')
   );
   await app.run(
     'ln',
     '-s',
-    path.resolve(__dirname, '../../fastboot-express-middleware'),
+    path.resolve(__dirname, '../../@gaurav9576/fastboot-express-middleware'),
     path.resolve(app.path, 'node_modules/fastboot-express-middleware')
   );
-  app.editPackageJSON(function (pkg) {
-    pkg.dependencies['fastboot'] = '*';
-    pkg.dependencies['fastboot-express-middleware'] = '*';
-  });
 }
 
 describe('request details', function () {
diff --git a/packages/ember-cli-fastboot/test/root-url-test.js b/packages/ember-cli-fastboot/test/root-url-test.js
index d787496e0..123c2389e 100644
--- a/packages/ember-cli-fastboot/test/root-url-test.js
+++ b/packages/ember-cli-fastboot/test/root-url-test.js
@@ -2,7 +2,11 @@
 
 const expect = require('chai').use(require('chai-string')).expect;
 const RSVP = require('rsvp');
+const path = require('path');
 const request = RSVP.denodeify(require('request'));
+const setFastbootPkgPath = require('../lib/path/set-fastboot-pkg-path');
+const getPath = require('../lib/path/get-path');
+const exec = RSVP.denodeify(require('child_process').exec);
 
 const AddonTestApp = require('ember-cli-addon-tests').AddonTestApp;
 
@@ -19,8 +23,17 @@ describe('rootUrl acceptance', function () {
         emberVersion: '~3.28.12',
         emberDataVersion: '~3.28.12',
       })
+      .then(function () {
+        return exec(`cd ${getPath()} && npm pack`);
+      })
       .then(function () {
         app.editPackageJSON((pkg) => {
+          const scope = '@gaurav9576';
+          pkg.dependencies = pkg.dependencies ?? {};
+          ['fastboot', 'fastboot-express-middleware'].forEach(depName => {
+            pkg.dependencies[`${scope}/${depName}`] = '*';
+          });
+          setFastbootPkgPath(pkg);
           delete pkg.devDependencies['ember-fetch'];
           delete pkg.devDependencies['ember-welcome-page'];
           // needed because @ember-data/store does `FastBoot.require('crypto')`
@@ -28,6 +41,13 @@ describe('rootUrl acceptance', function () {
         });
         return app.run('npm', 'install');
       })
+      .then(function () {
+        const file = path.resolve(
+          getPath(),
+          'gaurav9576-ember-cli-fastboot-4.1.1.tgz'
+        );
+        return app.run('npm', 'install', file);
+      })
       .then(function () {
         return app.startServer({
           command: 'serve',
diff --git a/packages/ember-cli-fastboot/tests/integration/instance-initializers/clear-double-boot-test.js b/packages/ember-cli-fastboot/tests/integration/instance-initializers/clear-double-boot-test.js
index 611dba545..d5e691792 100644
--- a/packages/ember-cli-fastboot/tests/integration/instance-initializers/clear-double-boot-test.js
+++ b/packages/ember-cli-fastboot/tests/integration/instance-initializers/clear-double-boot-test.js
@@ -2,7 +2,7 @@ import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
 import hbs from 'htmlbars-inline-precompile';
-import { clearHtml } from 'ember-cli-fastboot/instance-initializers/clear-double-boot';
+import { clearHtml } from '@gaurav9576/ember-cli-fastboot/instance-initializers/clear-double-boot';
 
 module('Instance-initializer: clear-double-boot', function(hooks) {
   setupRenderingTest(hooks);
diff --git a/packages/fastboot-app-server/package.json b/packages/fastboot-app-server/package.json
index 910085044..01ae79194 100644
--- a/packages/fastboot-app-server/package.json
+++ b/packages/fastboot-app-server/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "fastboot-app-server",
+  "name": "@gaurav9576/fastboot-app-server",
   "version": "4.1.1",
   "description": "A production-ready app server for running Ember FastBoot apps",
   "keywords": [
@@ -28,8 +28,8 @@
     "chalk": "^4.1.2",
     "compression": "^1.7.4",
     "express": "^4.17.2",
-    "fastboot": "4.1.1",
-    "fastboot-express-middleware": "4.1.1"
+    "@gaurav9576/fastboot": "4.1.1",
+    "@gaurav9576/fastboot-express-middleware": "4.1.1"
   },
   "devDependencies": {
     "chai": "^4.3.4",
diff --git a/packages/fastboot-app-server/src/worker.js b/packages/fastboot-app-server/src/worker.js
index ccc96fdef..635df6735 100644
--- a/packages/fastboot-app-server/src/worker.js
+++ b/packages/fastboot-app-server/src/worker.js
@@ -1,7 +1,7 @@
 "use strict";
 
-const FastBoot           = require('fastboot');
-const fastbootMiddleware = require('fastboot-express-middleware');
+const FastBoot           = require('@gaurav9576/fastboot');
+const fastbootMiddleware = require('@gaurav9576/fastboot-express-middleware');
 const ExpressHTTPServer  = require('./express-http-server');
 
 class Worker {
diff --git a/packages/fastboot-express-middleware/.eslintrc.js b/packages/fastboot-express-middleware/.eslintrc.js
index 0176f70bc..51c59a005 100644
--- a/packages/fastboot-express-middleware/.eslintrc.js
+++ b/packages/fastboot-express-middleware/.eslintrc.js
@@ -9,6 +9,14 @@ module.exports = {
     node: true,
     es6: true,
   },
+  rules: {
+    "prettier/prettier": [
+      "error",
+      {
+        endOfLine: "auto",
+      }
+    ]
+  },
   overrides: [
     {
       files: ['test/**/*-test.js'],
diff --git a/packages/fastboot-express-middleware/package.json b/packages/fastboot-express-middleware/package.json
index f0d59cf84..ce9400f1d 100644
--- a/packages/fastboot-express-middleware/package.json
+++ b/packages/fastboot-express-middleware/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "fastboot-express-middleware",
+  "name": "@gaurav9576/fastboot-express-middleware",
   "version": "4.1.1",
   "description": "An Express middleware for rendering Ember apps with FastBoot",
   "keywords": [
@@ -25,7 +25,7 @@
   },
   "dependencies": {
     "chalk": "^4.1.2",
-    "fastboot": "4.1.1"
+    "@gaurav9576/fastboot": "4.1.1"
   },
   "devDependencies": {
     "chai": "^4.3.4",
diff --git a/packages/fastboot-express-middleware/src/index.js b/packages/fastboot-express-middleware/src/index.js
index 05ad810a7..49185d0cd 100644
--- a/packages/fastboot-express-middleware/src/index.js
+++ b/packages/fastboot-express-middleware/src/index.js
@@ -18,7 +18,7 @@ function fastbootExpressMiddleware(distPath, options) {
   let fastboot = opts.fastboot;
 
   if (!fastboot) {
-    let FastBoot = require('fastboot');
+    let FastBoot = require('@gaurav9576/fastboot');
     fastboot = new FastBoot({
       distPath: opts.distPath,
       resilient: opts.resilient,
diff --git a/packages/fastboot-express-middleware/test/middleware-test.js b/packages/fastboot-express-middleware/test/middleware-test.js
index f088be48e..41dd5a01d 100644
--- a/packages/fastboot-express-middleware/test/middleware-test.js
+++ b/packages/fastboot-express-middleware/test/middleware-test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const expect = require('chai').expect;
-const FastBoot = require('fastboot');
+const FastBoot = require('@gaurav9576/fastboot');
 const fastbootMiddleware = require('./../src/index');
 const fixture = require('./helpers/fixture-path');
 const TestHTTPServer = require('./helpers/test-http-server');
diff --git a/packages/fastboot/package.json b/packages/fastboot/package.json
index d80ff0e19..5f2dce7a2 100644
--- a/packages/fastboot/package.json
+++ b/packages/fastboot/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "fastboot",
+  "name": "@gaurav9576/fastboot",
   "version": "4.1.1",
   "description": "Library for rendering Ember apps in node.js",
   "keywords": [
diff --git a/test-packages/basic-app/package.json b/test-packages/basic-app/package.json
index ce04e0e0a..27b7af246 100644
--- a/test-packages/basic-app/package.json
+++ b/test-packages/basic-app/package.json
@@ -39,7 +39,7 @@
     "ember-cli-app-version": "^6.0.0",
     "ember-cli-babel": "^7.20.5",
     "ember-cli-dependency-checker": "^3.2.0",
-    "ember-cli-fastboot": "4.1.1",
+    "@gaurav9576/ember-cli-fastboot": "4.1.1",
     "ember-cli-head": "^1.0.0",
     "ember-cli-htmlbars": "^5.1.2",
     "ember-cli-inject-live-reload": "^2.0.2",
diff --git a/test-packages/custom-fastboot-app/package.json b/test-packages/custom-fastboot-app/package.json
index dbea4363a..074e92ead 100644
--- a/test-packages/custom-fastboot-app/package.json
+++ b/test-packages/custom-fastboot-app/package.json
@@ -36,7 +36,7 @@
     "ember-cli-app-version": "^6.0.0",
     "ember-cli-babel": "^7.20.5",
     "ember-cli-dependency-checker": "^3.2.0",
-    "ember-cli-fastboot": "4.1.1",
+    "@gaurav9576/ember-cli-fastboot": "4.1.1",
     "ember-cli-htmlbars": "^5.1.2",
     "ember-cli-inject-live-reload": "^2.0.2",
     "ember-cli-sri": "^2.1.1",
diff --git a/test-packages/custom-sandbox-app/package.json b/test-packages/custom-sandbox-app/package.json
index ae69cf3d1..f832e045b 100644
--- a/test-packages/custom-sandbox-app/package.json
+++ b/test-packages/custom-sandbox-app/package.json
@@ -32,7 +32,7 @@
     "ember-cli-babel": "^7.20.5",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-htmlbars": "^5.1.2",
-    "ember-cli-fastboot": "4.1.1",
+    "@gaurav9576/ember-cli-fastboot": "4.1.1",
     "ember-cli-inject-live-reload": "^2.0.2",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-uglify": "^3.0.0",
diff --git a/test-packages/ember-cli-fastboot-testing-app/package.json b/test-packages/ember-cli-fastboot-testing-app/package.json
index c3e08fc95..94cdd0550 100644
--- a/test-packages/ember-cli-fastboot-testing-app/package.json
+++ b/test-packages/ember-cli-fastboot-testing-app/package.json
@@ -30,7 +30,8 @@
     "ember-cli-app-version": "^6.0.0",
     "ember-cli-babel": "^7.20.5",
     "ember-cli-dependency-checker": "^3.2.0",
-    "ember-cli-fastboot": "4.1.1",
+    "ember-cli-fastboot": "file:packages/ember-cli-fastboot",
+    "@gaurav9576/ember-cli-fastboot": "4.1.1",
     "ember-cli-fastboot-testing": "^0.5.0",
     "ember-cli-htmlbars": "^5.1.2",
     "ember-cli-inject-live-reload": "^2.0.2",
diff --git a/test-packages/hot-swap-app/package.json b/test-packages/hot-swap-app/package.json
index a65939513..a6b72f74a 100644
--- a/test-packages/hot-swap-app/package.json
+++ b/test-packages/hot-swap-app/package.json
@@ -32,7 +32,7 @@
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-htmlbars": "^5.1.2",
     "ember-cli-inject-live-reload": "^2.0.2",
-    "ember-cli-fastboot": "4.1.1",
+    "@gaurav9576/ember-cli-fastboot": "4.1.1",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-uglify": "^3.0.0",
     "ember-data": "~3.28.0",
diff --git a/test-packages/integration-tests/package.json b/test-packages/integration-tests/package.json
index d9c1493d1..da5b3ea9d 100644
--- a/test-packages/integration-tests/package.json
+++ b/test-packages/integration-tests/package.json
@@ -7,8 +7,8 @@
     "test": "node helpers/clean-dists.js && mocha"
   },
   "devDependencies": {
-    "ember-cli-fastboot": "4.1.1",
-    "fastboot": "4.1.1",
+    "@gaurav9576/ember-cli-fastboot": "4.1.1",
+    "@gaurav9576/fastboot": "4.1.1",
     "mocha": "^9.1.2"
   },
   "volta": {
diff --git a/test-packages/test-libs/debug.js b/test-packages/test-libs/debug.js
index a7f9dfa81..1dc7c5521 100644
--- a/test-packages/test-libs/debug.js
+++ b/test-packages/test-libs/debug.js
@@ -1,5 +1,5 @@
 'use strict';
 
-const debug = require('debug')('ember-cli-fastboot');
+const debug = require('debug')('@gaurav9576/ember-cli-fastboot');
 
 module.exports = debug;
diff --git a/yarn.lock b/yarn.lock
index e483c680c..3db2eae79 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5349,10 +5349,9 @@ ember-cached-decorator-polyfill@^0.1.4:
     ember-cli-babel "^7.21.0"
     ember-cli-babel-plugin-helpers "^1.1.1"
 
-ember-cli-addon-tests@^0.11.1:
+ember-cli-addon-tests@Gaurav0/ember-cli-addon-tests#fix_scope:
   version "0.11.1"
-  resolved "https://registry.yarnpkg.com/ember-cli-addon-tests/-/ember-cli-addon-tests-0.11.1.tgz#70c9164cb4126b2d17bbf9588ff34d97d4bfbad1"
-  integrity sha512-PI3ht9NrgfAwBgh3aPCVecajndvDKltTqRdtxt5bgfQJ3+AMs6moXhijKygwuAeT5btyhhLbceTfHRL/K8pX2w==
+  resolved "https://codeload.github.com/Gaurav0/ember-cli-addon-tests/tar.gz/2f2dc5101db492db527a93b135110ee662259748"
   dependencies:
     chalk "^2.0.1"
     debug "^3.0.0"
@@ -5439,6 +5438,29 @@ ember-cli-fastboot-testing@^0.5.0:
     resolve "^1.10.0"
     whatwg-fetch "^3.0.0"
 
+"ember-cli-fastboot@file:packages/ember-cli-fastboot", "ember-cli-fastboot@file:test-packages/ember-cli-fastboot-testing-app/packages/ember-cli-fastboot":
+  version "4.1.1"
+  dependencies:
+    "@gaurav9576/fastboot" "4.1.1"
+    "@gaurav9576/fastboot-express-middleware" "4.1.1"
+    broccoli-concat "^4.2.5"
+    broccoli-file-creator "^2.1.1"
+    broccoli-funnel "^3.0.8"
+    broccoli-merge-trees "^4.2.0"
+    broccoli-plugin "^4.0.7"
+    chalk "^4.1.2"
+    ember-cli-babel "^7.26.10"
+    ember-cli-lodash-subset "^2.0.1"
+    ember-cli-preprocess-registry "^3.3.0"
+    ember-cli-version-checker "^5.1.2"
+    fastboot-transform "^0.1.3"
+    fs-extra "^10.0.0"
+    json-stable-stringify "^1.0.1"
+    md5-hex "^3.0.1"
+    node-fetch "^2.6.7"
+    recast "^0.19.1"
+    silent-error "^1.1.1"
+
 ember-cli-get-component-path-option@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/ember-cli-get-component-path-option/-/ember-cli-get-component-path-option-1.0.0.tgz#0d7b595559e2f9050abed804f1d8eff1b08bc771"
@@ -6955,7 +6977,7 @@ fastboot-transform@^0.1.3:
     broccoli-stew "^1.5.0"
     convert-source-map "^1.5.1"
 
-fastboot@^3.0.3:
+fastboot@^3.0.3, "fastboot@file:packages/fastboot":
   version "4.1.1"
   dependencies:
     abortcontroller-polyfill "^1.7.3"