diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index dcf81c44..e441edcf 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -52,4 +52,4 @@ jobs:
       - name: Run Typescript checker on cloud functions
         if: ${{ success() || failure() }}
         working-directory: functions
-        run: tsc --pretty --project tsconfig.json --noEmit
+        run: tsc -b -v --pretty
diff --git a/common/.gitignore b/common/.gitignore
index e0ba0181..11320851 100644
--- a/common/.gitignore
+++ b/common/.gitignore
@@ -1,6 +1,5 @@
 # Compiled JavaScript files
-lib/**/*.js
-lib/**/*.js.map
+lib/
 
 # TypeScript v1 declaration files
 typings/
@@ -10,4 +9,4 @@ node_modules/
 
 package-lock.json
 ui-debug.log
-firebase-debug.log
\ No newline at end of file
+firebase-debug.log
diff --git a/common/tsconfig.json b/common/tsconfig.json
index 158a5218..62a5c745 100644
--- a/common/tsconfig.json
+++ b/common/tsconfig.json
@@ -1,6 +1,8 @@
 {
   "compilerOptions": {
     "baseUrl": "../",
+    "composite": true,
+    "module": "commonjs",
     "moduleResolution": "node",
     "noImplicitReturns": true,
     "outDir": "lib",
diff --git a/firebase.json b/firebase.json
index de1e19b7..25f9b61f 100644
--- a/firebase.json
+++ b/firebase.json
@@ -1,8 +1,8 @@
 {
   "functions": {
-    "predeploy": "npm --prefix \"$RESOURCE_DIR\" run build",
+    "predeploy": "cd functions && yarn build",
     "runtime": "nodejs16",
-    "source": "functions"
+    "source": "functions/dist"
   },
   "firestore": {
     "rules": "firestore.rules",
diff --git a/functions/.gitignore b/functions/.gitignore
index 7aeaedd4..2aeae30c 100644
--- a/functions/.gitignore
+++ b/functions/.gitignore
@@ -2,9 +2,11 @@
 .env*
 .runtimeconfig.json
 
+# GCP deployment artifact
+dist/
+
 # Compiled JavaScript files
-lib/**/*.js
-lib/**/*.js.map
+lib/
 
 # TypeScript v1 declaration files
 typings/
diff --git a/functions/package.json b/functions/package.json
index 7b5c30b0..45ddcac2 100644
--- a/functions/package.json
+++ b/functions/package.json
@@ -5,7 +5,8 @@
     "firestore": "dev-mantic-markets.appspot.com"
   },
   "scripts": {
-    "build": "tsc",
+    "build": "yarn compile && rm -rf dist && mkdir -p dist/functions && cp -R ../common/lib dist/common && cp -R lib/src dist/functions/src && cp ../yarn.lock dist && cp package.json dist",
+    "compile": "tsc -b",
     "watch": "tsc -w",
     "shell": "yarn build && firebase functions:shell",
     "start": "yarn shell",
@@ -18,7 +19,7 @@
     "db:backup-remote": "yarn db:rename-remote-backup-folder && gcloud firestore export gs://$npm_package_config_firestore/firestore_export/",
     "verify": "(cd .. && yarn verify)"
   },
-  "main": "lib/functions/src/index.js",
+  "main": "functions/src/index.js",
   "dependencies": {
     "@amplitude/node": "1.10.0",
     "fetch": "1.1.0",
diff --git a/functions/tsconfig.json b/functions/tsconfig.json
index e183bb44..9496b9cb 100644
--- a/functions/tsconfig.json
+++ b/functions/tsconfig.json
@@ -1,6 +1,7 @@
 {
   "compilerOptions": {
     "baseUrl": "../",
+    "composite": true,
     "module": "commonjs",
     "noImplicitReturns": true,
     "outDir": "lib",
@@ -8,6 +9,11 @@
     "strict": true,
     "target": "es2017"
   },
+  "references": [
+    {
+      "path": "../common"
+    }
+  ],
   "compileOnSave": true,
-  "include": ["src", "../common/**/*.ts"]
+  "include": ["src"]
 }
diff --git a/web/tsconfig.json b/web/tsconfig.json
index 96cf1311..2f31aa8c 100644
--- a/web/tsconfig.json
+++ b/web/tsconfig.json
@@ -16,7 +16,6 @@
     "jsx": "preserve",
     "incremental": true
   },
-
   "watchOptions": {
     "excludeDirectories": [".next"]
   },