diff --git a/packages/backend-core/src/context/localStorage.ts b/packages/backend-core/src/context/Context.ts
similarity index 93%
rename from packages/backend-core/src/context/localStorage.ts
rename to packages/backend-core/src/context/Context.ts
index fd761d10bc..6ffb57e44e 100644
--- a/packages/backend-core/src/context/localStorage.ts
+++ b/packages/backend-core/src/context/Context.ts
@@ -1,7 +1,7 @@
 import { AsyncLocalStorage } from "async_hooks"
 import { ContextMap } from "./constants"
 
-export class Context {
+export default class Context {
   static storage = new AsyncLocalStorage<ContextMap>()
 
   static run(context: ContextMap, func: any) {
diff --git a/packages/backend-core/src/context/index.ts b/packages/backend-core/src/context/index.ts
index 076d9af65a..3499082f6a 100644
--- a/packages/backend-core/src/context/index.ts
+++ b/packages/backend-core/src/context/index.ts
@@ -8,7 +8,7 @@ import {
   getDB,
   PouchLike,
 } from "../db"
-import { Context } from "./localStorage"
+import Context from "./Context"
 import { IdentityContext } from "@budibase/types"
 import { DEFAULT_TENANT_ID as _DEFAULT_TENANT_ID } from "../constants"
 import { ContextMap } from "./constants"
diff --git a/packages/backend-core/src/db/couch/pouchLike.ts b/packages/backend-core/src/db/couch/PouchLike.ts
similarity index 100%
rename from packages/backend-core/src/db/couch/pouchLike.ts
rename to packages/backend-core/src/db/couch/PouchLike.ts
diff --git a/packages/backend-core/src/db/couch/index.ts b/packages/backend-core/src/db/couch/index.ts
index b8cb0ab79f..ea47022c35 100644
--- a/packages/backend-core/src/db/couch/index.ts
+++ b/packages/backend-core/src/db/couch/index.ts
@@ -1,4 +1,4 @@
 export * from "./connections"
-export * from "./pouchLike"
+export * from "./PouchLike"
 export * from "./utils"
 export { init, getPouch, getPouchDB, closePouchDB } from "./pouchDB"
diff --git a/packages/backend-core/src/db/index.ts b/packages/backend-core/src/db/index.ts
index 7269aa8f92..3db29a905f 100644
--- a/packages/backend-core/src/db/index.ts
+++ b/packages/backend-core/src/db/index.ts
@@ -5,3 +5,4 @@ export * from "./views"
 export * from "./constants"
 export * from "./conversions"
 export * from "./tenancy"
+export { PouchLike } from "./couch"
diff --git a/packages/backend-core/src/index.ts b/packages/backend-core/src/index.ts
index 24207a7a91..c68c8f0927 100644
--- a/packages/backend-core/src/index.ts
+++ b/packages/backend-core/src/index.ts
@@ -21,10 +21,9 @@ import * as middleware from "./middleware"
 import plugins from "./plugin"
 import encryption from "./security/encryption"
 import * as queue from "./queue"
-import * as types from "./types"
+import * as db from "./db"
 
 // mimic the outer package exports
-import * as db from "./db"
 import * as objectStore from "./pkg/objectStore"
 import * as utils from "./pkg/utils"
 import redis from "./pkg/redis"
@@ -68,7 +67,6 @@ const core = {
   encryption,
   queue,
   permissions,
-  ...types,
 }
 
 export = core
diff --git a/packages/backend-core/src/types.ts b/packages/backend-core/src/types.ts
deleted file mode 100644
index eeb784b0c1..0000000000
--- a/packages/backend-core/src/types.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { PouchLike } from "./db"
diff --git a/packages/backend-core/src/users.ts b/packages/backend-core/src/users.ts
index 13e8f8d36e..1720a79a83 100644
--- a/packages/backend-core/src/users.ts
+++ b/packages/backend-core/src/users.ts
@@ -3,9 +3,9 @@ import {
   getUsersByAppParams,
   getProdAppID,
   generateAppUserID,
-} from "./db/utils"
-import { queryGlobalView } from "./db/views"
-import { UNICODE_MAX } from "./db/constants"
+  queryGlobalView,
+  UNICODE_MAX,
+} from "./db"
 import { BulkDocsResponse, User } from "@budibase/types"
 import { getGlobalDB } from "./context"
 
diff --git a/packages/backend-core/tsconfig.build.json b/packages/backend-core/tsconfig.build.json
index 40ffe6b827..f5b16eda1a 100644
--- a/packages/backend-core/tsconfig.build.json
+++ b/packages/backend-core/tsconfig.build.json
@@ -12,7 +12,7 @@
     "sourceMap": true,
     "declaration": true,
     "types": [ "node", "jest" ],
-    "outDir": "dist"
+    "outDir": "dist",
   },
   "include": [
     "**/*.js",
diff --git a/packages/server/src/middleware/builder.ts b/packages/server/src/middleware/builder.ts
index 403597ff1a..719a4dc060 100644
--- a/packages/server/src/middleware/builder.ts
+++ b/packages/server/src/middleware/builder.ts
@@ -9,9 +9,13 @@ import {
   checkDebounce,
   setDebounce,
 } from "../utilities/redis"
-import { db as dbCore, cache, permissions } from "@budibase/backend-core"
+import {
+  db as dbCore,
+  cache,
+  permissions,
+  PouchLike,
+} from "@budibase/backend-core"
 import { BBContext } from "@budibase/types"
-import { PouchLike } from "@budibase/backend-core/src/db"
 
 const DEBOUNCE_TIME_SEC = 30
 
diff --git a/packages/server/src/middleware/selfhost.ts b/packages/server/src/middleware/selfhost.ts
index 180d80c8ea..54b757d29c 100644
--- a/packages/server/src/middleware/selfhost.ts
+++ b/packages/server/src/middleware/selfhost.ts
@@ -3,7 +3,7 @@ import { BBContext } from "@budibase/types"
 
 // if added as a middleware will stop requests unless builder is in self host mode
 // or cloud is in self host
-module.exports = async (ctx: BBContext, next: any) => {
+export = async (ctx: BBContext, next: any) => {
   if (env.SELF_HOSTED) {
     await next()
     return
diff --git a/packages/worker/src/sdk/users/users.ts b/packages/worker/src/sdk/users/users.ts
index e2215cee80..539ac21300 100644
--- a/packages/worker/src/sdk/users/users.ts
+++ b/packages/worker/src/sdk/users/users.ts
@@ -479,7 +479,7 @@ export const bulkDelete = async (
     (user: RowResponse<User>) => {
       return user.doc
     }
-  ) as User[]
+  )
 
   // Delete from DB
   const toDelete = usersToDelete.map(user => ({
diff --git a/packages/worker/src/utilities/email.ts b/packages/worker/src/utilities/email.ts
index c07604827d..e71109c0b8 100644
--- a/packages/worker/src/utilities/email.ts
+++ b/packages/worker/src/utilities/email.ts
@@ -142,7 +142,7 @@ async function buildEmail(
  * @return {Promise<object|null>} returns the SMTP configuration if it exists
  */
 async function getSmtpConfiguration(
-  db: PouchLike,
+  db: dbCore.PouchLike,
   workspaceId?: string,
   automation?: boolean
 ) {
diff --git a/packages/worker/tsconfig.build.json b/packages/worker/tsconfig.build.json
index 36622d33eb..8071b4ad00 100644
--- a/packages/worker/tsconfig.build.json
+++ b/packages/worker/tsconfig.build.json
@@ -1,17 +1,17 @@
 {
   "compilerOptions": {
     "target": "es6",
-    "skipLibCheck": true,
     "module": "commonjs",
     "lib": ["es2020"],
     "allowJs": true,
-    "outDir": "dist",
     "strict": true,
     "noImplicitAny": true,
     "esModuleInterop": true,
     "resolveJsonModule": true,
     "incremental": true,
-    "types": [ "node", "jest"],
+    "types": [ "node", "jest" ],
+    "outDir": "dist",
+    "skipLibCheck": true
   },
   "include": [
     "src/**/*"