diff --git a/next.config.js b/next.config.js
index 6122951e9a..fa5bc84e10 100644
--- a/next.config.js
+++ b/next.config.js
@@ -10,28 +10,36 @@ const withTM = require("next-transpile-modules")([
 // use something like withPlugins([withTM], {}) if more plugins added later.
 
 module.exports = withTM({
+  async headers() {
+    return [
+      {
+        // matching all API routes
+        source: "/api/:path*",
+        headers: [
+          { key: "Access-Control-Allow-Credentials", value: "true" },
+          { key: "Access-Control-Allow-Origin", value: "*" },
+          { key: "Access-Control-Allow-Methods", value: "GET,OPTIONS,PATCH,DELETE,POST,PUT" },
+          {
+            key: "Access-Control-Allow-Headers",
+            value:
+              "X-CSRF-Token, X-Requested-With, Accept, Accept-Version, Content-Length, Content-MD5, Content-Type, Date, X-Api-Version, Content-Type, api_key, Authorization",
+          },
+        ],
+      },
+    ];
+  },
   async rewrites() {
-    return {
-      beforeFiles: [
-        // This redirects requests recieved at / the root to the /api/ folder.
-        {
-          source: "/v:version/:rest*",
-          destination: "/api/v:version/:rest*",
-        },
-        // This redirects requests to api/v*/ to /api/ passing version as a query parameter.
-        {
-          source: "/api/v:version/:rest*",
-          destination: "/api/:rest*?version=:version",
-        },
-      ],
-      fallback: [
-        // These rewrites are checked after both pages/public files
-        // and dynamic routes are checked
-        {
-          source: "/:path*",
-          destination: `/api/:path*`,
-        },
-      ],
-    };
+    return [
+      // This redirects requests recieved at / the root to the /api/ folder.
+      {
+        source: "/:rest*",
+        destination: "/api/:rest*",
+      },
+      // This redirects requests to api/v*/ to /api/ passing version as a query parameter.
+      {
+        source: "/api/v:version/:rest*",
+        destination: "/api/:rest*?version=:version",
+      },
+    ];
   },
 });
diff --git a/package.json b/package.json
index 42f655236a..18d9081665 100644
--- a/package.json
+++ b/package.json
@@ -7,8 +7,8 @@
   "author": "Cal.com Inc.",
   "private": true,
   "scripts": {
-    "dev": "PORT=3002 next",
-    "start": "next start",
+    "dev": "next build && PORT=3002 next start",
+    "start": "PORT=3002 next start",
     "build": "next build",
     "lint": "next lint",
     "lint-fix": "next lint --fix && prettier --write .",