diff --git a/.github/workflows/release-docker.yml b/.github/workflows/release-docker.yml
index a4915919be..e09b796bee 100644
--- a/.github/workflows/release-docker.yml
+++ b/.github/workflows/release-docker.yml
@@ -43,7 +43,7 @@ jobs:
   buildx:
     runs-on: ubuntu-latest
     env:
-      working-directory: ./packages/nocodb-nest
+      working-directory: ./packages/nocodb
     steps:
       - name: Get Docker Repository
         id: get-docker-repository
diff --git a/.github/workflows/release-npm.yml b/.github/workflows/release-npm.yml
index 3ebd6fc7e2..55ec46d9af 100644
--- a/.github/workflows/release-npm.yml
+++ b/.github/workflows/release-npm.yml
@@ -35,7 +35,7 @@ jobs:
   release:
     runs-on: ubuntu-latest
     env:
-      working-directory: ./packages/nocodb-nest
+      working-directory: ./packages/nocodb
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -62,7 +62,7 @@ jobs:
           targetEnv=${{ github.event.inputs.targetEnv || inputs.targetEnv }} targetVersion=${{ github.event.inputs.tag || inputs.tag }} npm run build:copy:publish &&
           cd ../.. &&
           sleep 60 &&
-          targetEnv=${{ github.event.inputs.targetEnv || inputs.targetEnv }} node scripts/upgradeNcGui.js && cd packages/nocodb-nest && npm install && npm run obfuscate:build:publish
+          targetEnv=${{ github.event.inputs.targetEnv || inputs.targetEnv }} node scripts/upgradeNcGui.js && cd packages/nocodb && npm install && npm run obfuscate:build:publish
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
       - name: Create Pull Request
diff --git a/.github/workflows/release-pr.yml b/.github/workflows/release-pr.yml
index 0eb1a0393d..f4228853c5 100644
--- a/.github/workflows/release-pr.yml
+++ b/.github/workflows/release-pr.yml
@@ -13,7 +13,6 @@ on:
       - "packages/nc-gui/**"
       - "packages/nc-plugin/**"
       - "packages/nocodb/**"
-      - "packages/nocodb-nest/**"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
diff --git a/scripts/upgradeNcGui.js b/scripts/upgradeNcGui.js
index 46b0f2fc84..a8b4c3b8ba 100644
--- a/scripts/upgradeNcGui.js
+++ b/scripts/upgradeNcGui.js
@@ -22,8 +22,8 @@ const replacePackageName = (filePath) => {
 
 const bumbVersionAndSave = () => {
     // upgrade nc-lib-gui version in nocodb
-    execSync(`cd packages/nocodb-nest && npm install --save --save-exact ${ncLibPackage.name}@${ncLibPackage.version}`, {});
-    const nocodbPackageFilePath = path.join(__dirname, '..', 'packages', 'nocodb-nest', 'package.json')
+    execSync(`cd packages/nocodb && npm install --save --save-exact ${ncLibPackage.name}@${ncLibPackage.version}`, {});
+    const nocodbPackageFilePath = path.join(__dirname, '..', 'packages', 'nocodb', 'package.json')
     const nocoLibPackage = JSON.parse(fs.readFileSync(nocodbPackageFilePath))
     if (process.env.targetEnv === 'DEV') {
         nocoLibPackage.name = `${nocoLibPackage.name}-daily`
@@ -35,12 +35,12 @@ const bumbVersionAndSave = () => {
 if (process.env.targetEnv === 'DEV') {
     // replace nc-lib-gui by nc-lib-gui-daily if it is nightly build / pr release
     const filePaths = [
-        path.join(__dirname, '..', 'packages', 'nocodb-nest', 'Dockerfile'),
-        path.join(__dirname, '..', 'packages', 'nocodb-nest', 'litestream', 'Dockerfile'),
-        path.join(__dirname, '..', 'packages', 'nocodb-nest', 'package.json'),
-        path.join(__dirname, '..', 'packages', 'nocodb-nest', 'src', 'Noco.ts'),
-        path.join(__dirname, '..', 'packages', 'nocodb-nest', 'src', 'nocobuild.ts'),
-        path.join(__dirname, '..', 'packages', 'nocodb-nest', 'src', 'middlewares', 'gui', 'gui.middleware.ts'),
+        path.join(__dirname, '..', 'packages', 'nocodb', 'Dockerfile'),
+        path.join(__dirname, '..', 'packages', 'nocodb', 'litestream', 'Dockerfile'),
+        path.join(__dirname, '..', 'packages', 'nocodb', 'package.json'),
+        path.join(__dirname, '..', 'packages', 'nocodb', 'src', 'Noco.ts'),
+        path.join(__dirname, '..', 'packages', 'nocodb', 'src', 'nocobuild.ts'),
+        path.join(__dirname, '..', 'packages', 'nocodb', 'src', 'middlewares', 'gui', 'gui.middleware.ts'),
     ]
     Promise.all(filePaths.map(filePath => { return replacePackageName(filePath) })).then(() => {
         bumbVersionAndSave();
diff --git a/scripts/upgradeNocodbSdk.js b/scripts/upgradeNocodbSdk.js
index f031168df2..5deb3d8d64 100644
--- a/scripts/upgradeNocodbSdk.js
+++ b/scripts/upgradeNocodbSdk.js
@@ -20,7 +20,7 @@ const replacePackageName = (filePath) => {
 
 const bumbVersionAndSave = () => {
     // upgrade nocodb-sdk version in nocodb
-    execSync(`cd packages/nocodb-nest && npm install --save --save-exact ${nocodbSdkPackage.name}@${nocodbSdkPackage.version}`, {});
+    execSync(`cd packages/nocodb && npm install --save --save-exact ${nocodbSdkPackage.name}@${nocodbSdkPackage.version}`, {});
     // upgrade nocodb-sdk version in nc-gui
     execSync(`cd packages/nc-gui && npm install --save --save-exact ${nocodbSdkPackage.name}@${nocodbSdkPackage.version}`, {});
 }
@@ -47,9 +47,9 @@ const dfs = function(dir) {
 const searchAndReplace = (target) => {
     let list = [
         ...dfs(path.resolve(path.join(__dirname, '..', 'packages', 'nc-gui'))),
-        ...dfs(path.resolve(path.join(__dirname, '..', 'packages', 'nocodb-nest'))),
+        ...dfs(path.resolve(path.join(__dirname, '..', 'packages', 'nocodb'))),
         path.join(__dirname, '..', 'packages', 'nc-gui', 'package.json'),
-        path.join(__dirname, '..', 'packages', 'nocodb-nest', 'package.json')
+        path.join(__dirname, '..', 'packages', 'nocodb', 'package.json')
     ]
     return Promise.all(list.map(d => {
         return new Promise((resolve, reject) => {