diff --git a/packages/nc-gui/package-lock.json b/packages/nc-gui/package-lock.json
index 4757d24e90..5b6c751139 100644
--- a/packages/nc-gui/package-lock.json
+++ b/packages/nc-gui/package-lock.json
@@ -30,7 +30,7 @@
         "leaflet.markercluster": "^1.5.3",
         "locale-codes": "^1.3.1",
         "monaco-editor": "^0.33.0",
-        "nocodb-sdk": "0.107.1",
+        "nocodb-sdk": "file:../nocodb-sdk",
         "papaparse": "^5.3.2",
         "pinia": "^2.0.33",
         "qrcode": "^1.5.1",
@@ -111,7 +111,6 @@
     },
     "../nocodb-sdk": {
       "version": "0.107.1",
-      "extraneous": true,
       "license": "AGPL-3.0-or-later",
       "dependencies": {
         "axios": "^0.21.1",
@@ -8776,6 +8775,7 @@
       "version": "1.15.1",
       "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz",
       "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==",
+      "devOptional": true,
       "funding": [
         {
           "type": "individual",
@@ -12294,21 +12294,8 @@
       }
     },
     "node_modules/nocodb-sdk": {
-      "version": "0.107.1",
-      "resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.107.1.tgz",
-      "integrity": "sha512-8wJieBl9UwEpRTQHRjyRvui5ojoWP0yOHyJqMaJT2RbX6fE2kW0dL9m0a75kwM7xCd08QtP0Y5RPeUx4fepF3Q==",
-      "dependencies": {
-        "axios": "^0.21.1",
-        "jsep": "^1.3.6"
-      }
-    },
-    "node_modules/nocodb-sdk/node_modules/axios": {
-      "version": "0.21.4",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",
-      "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",
-      "dependencies": {
-        "follow-redirects": "^1.14.0"
-      }
+      "resolved": "../nocodb-sdk",
+      "link": true
     },
     "node_modules/node-abi": {
       "version": "3.23.0",
@@ -24810,7 +24797,8 @@
     "follow-redirects": {
       "version": "1.15.1",
       "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz",
-      "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA=="
+      "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==",
+      "devOptional": true
     },
     "form-data": {
       "version": "4.0.0",
@@ -27360,22 +27348,22 @@
       }
     },
     "nocodb-sdk": {
-      "version": "0.107.1",
-      "resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.107.1.tgz",
-      "integrity": "sha512-8wJieBl9UwEpRTQHRjyRvui5ojoWP0yOHyJqMaJT2RbX6fE2kW0dL9m0a75kwM7xCd08QtP0Y5RPeUx4fepF3Q==",
+      "version": "file:../nocodb-sdk",
       "requires": {
+        "@typescript-eslint/eslint-plugin": "^4.0.1",
+        "@typescript-eslint/parser": "^4.0.1",
         "axios": "^0.21.1",
-        "jsep": "^1.3.6"
-      },
-      "dependencies": {
-        "axios": {
-          "version": "0.21.4",
-          "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",
-          "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",
-          "requires": {
-            "follow-redirects": "^1.14.0"
-          }
-        }
+        "cspell": "^4.1.0",
+        "eslint": "^7.8.0",
+        "eslint-config-prettier": "^6.11.0",
+        "eslint-plugin-eslint-comments": "^3.2.0",
+        "eslint-plugin-functional": "^3.0.2",
+        "eslint-plugin-import": "^2.22.0",
+        "eslint-plugin-prettier": "^4.0.0",
+        "jsep": "^1.3.6",
+        "npm-run-all": "^4.1.5",
+        "prettier": "^2.1.1",
+        "typescript": "^4.0.2"
       }
     },
     "node-abi": {
diff --git a/packages/nc-gui/package.json b/packages/nc-gui/package.json
index f84c0c8241..847017b499 100644
--- a/packages/nc-gui/package.json
+++ b/packages/nc-gui/package.json
@@ -54,7 +54,7 @@
     "leaflet.markercluster": "^1.5.3",
     "locale-codes": "^1.3.1",
     "monaco-editor": "^0.33.0",
-    "nocodb-sdk": "0.107.1",
+    "nocodb-sdk": "file:../nocodb-sdk",
     "papaparse": "^5.3.2",
     "pinia": "^2.0.33",
     "qrcode": "^1.5.1",
diff --git a/packages/nocodb-sdk/package-lock.json b/packages/nocodb-sdk/package-lock.json
index 2490203172..0af2305204 100644
--- a/packages/nocodb-sdk/package-lock.json
+++ b/packages/nocodb-sdk/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "nocodb-sdk",
-  "version": "0.107.0",
+  "version": "0.107.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "nocodb-sdk",
-      "version": "0.107.0",
+      "version": "0.107.1",
       "license": "AGPL-3.0-or-later",
       "dependencies": {
         "axios": "^0.21.1",
diff --git a/packages/nocodb/package-lock.json b/packages/nocodb/package-lock.json
index 32f6fe8837..08d3053137 100644
--- a/packages/nocodb/package-lock.json
+++ b/packages/nocodb/package-lock.json
@@ -83,7 +83,7 @@
         "nc-lib-gui": "0.107.1",
         "nc-plugin": "^0.1.3",
         "ncp": "^2.0.0",
-        "nocodb-sdk": "0.107.1",
+        "nocodb-sdk": "file:../nocodb-sdk",
         "nodemailer": "^6.4.10",
         "object-hash": "^3.0.0",
         "os-locale": "^6.0.2",
@@ -191,7 +191,6 @@
     },
     "../nocodb-sdk": {
       "version": "0.107.1",
-      "extraneous": true,
       "license": "AGPL-3.0-or-later",
       "dependencies": {
         "axios": "^0.21.1",
@@ -13207,13 +13206,8 @@
       }
     },
     "node_modules/nocodb-sdk": {
-      "version": "0.107.1",
-      "resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.107.1.tgz",
-      "integrity": "sha512-8wJieBl9UwEpRTQHRjyRvui5ojoWP0yOHyJqMaJT2RbX6fE2kW0dL9m0a75kwM7xCd08QtP0Y5RPeUx4fepF3Q==",
-      "dependencies": {
-        "axios": "^0.21.1",
-        "jsep": "^1.3.6"
-      }
+      "resolved": "../nocodb-sdk",
+      "link": true
     },
     "node_modules/node-abort-controller": {
       "version": "3.1.1",
@@ -28485,12 +28479,22 @@
       "integrity": "sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg=="
     },
     "nocodb-sdk": {
-      "version": "0.107.1",
-      "resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.107.1.tgz",
-      "integrity": "sha512-8wJieBl9UwEpRTQHRjyRvui5ojoWP0yOHyJqMaJT2RbX6fE2kW0dL9m0a75kwM7xCd08QtP0Y5RPeUx4fepF3Q==",
+      "version": "file:../nocodb-sdk",
       "requires": {
+        "@typescript-eslint/eslint-plugin": "^4.0.1",
+        "@typescript-eslint/parser": "^4.0.1",
         "axios": "^0.21.1",
-        "jsep": "^1.3.6"
+        "cspell": "^4.1.0",
+        "eslint": "^7.8.0",
+        "eslint-config-prettier": "^6.11.0",
+        "eslint-plugin-eslint-comments": "^3.2.0",
+        "eslint-plugin-functional": "^3.0.2",
+        "eslint-plugin-import": "^2.22.0",
+        "eslint-plugin-prettier": "^4.0.0",
+        "jsep": "^1.3.6",
+        "npm-run-all": "^4.1.5",
+        "prettier": "^2.1.1",
+        "typescript": "^4.0.2"
       }
     },
     "node-abort-controller": {
diff --git a/packages/nocodb/package.json b/packages/nocodb/package.json
index 05fde5dd4d..3ff54ec2a1 100644
--- a/packages/nocodb/package.json
+++ b/packages/nocodb/package.json
@@ -114,7 +114,7 @@
     "nc-lib-gui": "0.107.1",
     "nc-plugin": "^0.1.3",
     "ncp": "^2.0.0",
-    "nocodb-sdk": "0.107.1",
+    "nocodb-sdk": "file:../nocodb-sdk",
     "nodemailer": "^6.4.10",
     "object-hash": "^3.0.0",
     "os-locale": "^6.0.2",
@@ -201,4 +201,4 @@
     "coverageDirectory": "../coverage",
     "testEnvironment": "node"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/nocodb/src/middlewares/public/public.middleware.ts b/packages/nocodb/src/middlewares/public/public.middleware.ts
index c14bcd2792..4c5761065c 100644
--- a/packages/nocodb/src/middlewares/public/public.middleware.ts
+++ b/packages/nocodb/src/middlewares/public/public.middleware.ts
@@ -1,6 +1,7 @@
-import { join } from 'path';
+import path, { join } from 'path';
 import { Injectable } from '@nestjs/common';
 import express from 'express';
+import isDocker from 'is-docker';
 import type { NestMiddleware } from '@nestjs/common';
 
 @Injectable()
@@ -13,6 +14,10 @@ export class PublicMiddleware implements NestMiddleware {
     }
 
     // serve static files from public folder
-    express.static(join(process.cwd(), 'public'))(req, res, next);
+    if (isDocker()) {
+      express.static(join(process.cwd(), 'docker', 'public'))(req, res, next);
+    } else {
+      express.static(join(process.cwd(), 'public'))(req, res, next);
+    }
   }
 }