diff --git a/apps/klaviyo/src/pages/api/webhooks/customer-created.ts b/apps/klaviyo/src/pages/api/webhooks/customer-created.ts
index f91543f..165d0d1 100644
--- a/apps/klaviyo/src/pages/api/webhooks/customer-created.ts
+++ b/apps/klaviyo/src/pages/api/webhooks/customer-created.ts
@@ -2,8 +2,8 @@ import { NextWebhookApiHandler, SaleorAsyncWebhook } from "@saleor/app-sdk/handl
 import { gql } from "urql";
 
 import {
+  CustomerCreatedDocument,
   CustomerCreatedWebhookPayloadFragment,
-  UntypedCustomerCreatedDocument,
 } from "../../../../generated/graphql";
 import { Klaviyo } from "../../../lib/klaviyo";
 import { createSettingsManager } from "../../../lib/metadata";
@@ -55,7 +55,7 @@ export const customerCreatedWebhook = new SaleorAsyncWebhook<CustomerCreatedWebh
     webhookPath: "api/webhooks/customer-created",
     event: "CUSTOMER_CREATED",
     apl: saleorApp.apl,
-    query: UntypedCustomerCreatedDocument,
+    query: CustomerCreatedDocument,
   }
 );
 
diff --git a/apps/klaviyo/src/pages/api/webhooks/fulfillment-created.ts b/apps/klaviyo/src/pages/api/webhooks/fulfillment-created.ts
index 7a07858..d012232 100644
--- a/apps/klaviyo/src/pages/api/webhooks/fulfillment-created.ts
+++ b/apps/klaviyo/src/pages/api/webhooks/fulfillment-created.ts
@@ -3,7 +3,7 @@ import { gql } from "urql";
 
 import {
   FulfillmentCreatedWebhookPayloadFragment,
-  UntypedFulfillmentCreatedDocument,
+  FulfillmentCreatedDocument,
 } from "../../../../generated/graphql";
 import { Klaviyo } from "../../../lib/klaviyo";
 import { createSettingsManager } from "../../../lib/metadata";
@@ -62,7 +62,7 @@ export const fulfillmentCreatedWebhook =
     webhookPath: "api/webhooks/fulfillment-created",
     event: "FULFILLMENT_CREATED",
     apl: saleorApp.apl,
-    query: UntypedFulfillmentCreatedDocument,
+    query: FulfillmentCreatedDocument,
   });
 
 const handler: NextWebhookApiHandler<FulfillmentCreatedWebhookPayloadFragment> = async (
diff --git a/apps/klaviyo/src/pages/api/webhooks/order-created.ts b/apps/klaviyo/src/pages/api/webhooks/order-created.ts
index 9f76718..401378e 100644
--- a/apps/klaviyo/src/pages/api/webhooks/order-created.ts
+++ b/apps/klaviyo/src/pages/api/webhooks/order-created.ts
@@ -3,7 +3,7 @@ import { gql } from "urql";
 
 import {
   OrderCreatedWebhookPayloadFragment,
-  UntypedOrderCreatedDocument,
+  OrderCreatedDocument,
 } from "../../../../generated/graphql";
 import { Klaviyo } from "../../../lib/klaviyo";
 import { createSettingsManager } from "../../../lib/metadata";
@@ -32,7 +32,7 @@ export const orderCreatedWebhook = new SaleorAsyncWebhook<OrderCreatedWebhookPay
   webhookPath: "api/webhooks/order-created",
   event: "ORDER_CREATED",
   apl: saleorApp.apl,
-  query: UntypedOrderCreatedDocument,
+  query: OrderCreatedDocument,
 });
 
 const handler: NextWebhookApiHandler<OrderCreatedWebhookPayloadFragment> = async (
diff --git a/apps/klaviyo/src/pages/api/webhooks/order-fully-paid.ts b/apps/klaviyo/src/pages/api/webhooks/order-fully-paid.ts
index 9b4b645..e59dc70 100644
--- a/apps/klaviyo/src/pages/api/webhooks/order-fully-paid.ts
+++ b/apps/klaviyo/src/pages/api/webhooks/order-fully-paid.ts
@@ -3,7 +3,7 @@ import { gql } from "urql";
 
 import {
   OrderFullyPaidWebhookPayloadFragment,
-  UntypedOrderFullyPaidDocument,
+  OrderFullyPaidDocument,
 } from "../../../../generated/graphql";
 import { Klaviyo } from "../../../lib/klaviyo";
 import { createSettingsManager } from "../../../lib/metadata";
@@ -32,7 +32,7 @@ export const orderFullyPaidWebhook = new SaleorAsyncWebhook<OrderFullyPaidWebhoo
   webhookPath: "api/webhooks/order-fully-paid",
   event: "ORDER_FULLY_PAID",
   apl: saleorApp.apl,
-  query: UntypedOrderFullyPaidDocument,
+  query: OrderFullyPaidDocument,
 });
 
 const handler: NextWebhookApiHandler<OrderFullyPaidWebhookPayloadFragment> = async (