diff --git a/apps/demo/pages/demos/feedback.tsx b/apps/demo/pages/demos/feedback.tsx
index a7139baa4a..41697422d9 100644
--- a/apps/demo/pages/demos/feedback.tsx
+++ b/apps/demo/pages/demos/feedback.tsx
@@ -1,4 +1,3 @@
-import Script from "next/script";
 import { useEffect } from "react";
 import AppPage from "../../components/AppPage";
 
@@ -11,8 +10,9 @@ declare global {
 export default function Feedback() {
   useEffect(() => {
     window.formbricks = {
+      ...window.formbricks,
       config: {
-        hqUrl: process.env.NEXT_PUBLIC_FORMBRICKS_URL,
+        formbricksUrl: process.env.NEXT_PUBLIC_FORMBRICKS_URL,
         formId: process.env.NEXT_PUBLIC_FORMBRICKS_FEEDBACK_FORM_ID,
         contact: {
           name: "Matti Nannt",
@@ -25,14 +25,7 @@ export default function Feedback() {
         },
       },
     };
-    require("@formbricks/pmf");
+    require("@formbricks/feedback");
   }, []);
-  return (
-    <>
-      <Script src="https://cdn.jsdelivr.net/npm/@formbricks/feedback@0.2.1/dist/index.umd.js" defer />
-      <>
-        <AppPage onClickFeedback={(event) => window.formbricks.open(event)} />
-      </>
-    </>
-  );
+  return <AppPage onClickFeedback={(event) => window.formbricks.open(event)} />;
 }
diff --git a/apps/web/src/pages/api/capture/forms/[formId]/submissions/index.ts b/apps/web/src/pages/api/capture/forms/[formId]/submissions/index.ts
index 0168012845..ef55d9d6ff 100644
--- a/apps/web/src/pages/api/capture/forms/[formId]/submissions/index.ts
+++ b/apps/web/src/pages/api/capture/forms/[formId]/submissions/index.ts
@@ -70,7 +70,7 @@ export default async function handle(req: NextApiRequest, res: NextApiResponse)
           },
         });
         event.data.customer = {
-          connect: { organisationId_email: { email: customerEmail, organisationId: form.organisationId } },
+          connect: { email_organisationId: { email: customerEmail, organisationId: form.organisationId } },
         };
       } else {
         // create customer
diff --git a/packages/feedback-widget/package.json b/packages/feedback-widget/package.json
index 366d331981..32b71b7103 100644
--- a/packages/feedback-widget/package.json
+++ b/packages/feedback-widget/package.json
@@ -13,7 +13,7 @@
   },
   "scripts": {
     "build": "node ./html-to-ts && microbundle --define process.env.NODE_ENV=production",
-    "dev": "node ./html-to-ts && tsup src/index.ts --format esm,cjs --watch",
+    "dev": "node ./html-to-ts && microbundle watch --define process.env.NODE_ENV=production",
     "clean": "rm -rf dist"
   },
   "devDependencies": {
@@ -24,7 +24,6 @@
     "focus-trap": "^6.7.3",
     "html-minifier": "^4.0.0",
     "microbundle": "^0.14.2",
-    "tsup": "^6.4.0",
     "typescript": "^4.8.4"
   }
 }
diff --git a/packages/feedback-widget/src/index.ts b/packages/feedback-widget/src/index.ts
index 1086b508fa..d84f2b09b9 100644
--- a/packages/feedback-widget/src/index.ts
+++ b/packages/feedback-widget/src/index.ts
@@ -13,7 +13,7 @@ export interface FormbricksConfig {
   divId?: string;
   style?: any;
   formId?: string;
-  hqUrl?: string;
+  formbricksUrl?: string;
   customer?: Record<any, any>;
   disableErrorAlert: boolean;
 }
@@ -258,7 +258,7 @@ function submit(e: Event) {
   };
 
   fetch(
-    `${stripLastBackslash(config.hqUrl || "https://xm.formbricks.com")}/api/capture/forms/${
+    `${stripLastBackslash(config.formbricksUrl || "https://app.formbricks.com")}/api/capture/forms/${
       config.formId
     }/submissions`,
     {