diff --git a/functions/stripe.ts b/functions/stripe.ts
deleted file mode 100644
index 0d9dcd4..0000000
--- a/functions/stripe.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-const stripe = require('stripe')(process.env.STRIPE_SECRET_KEY);
-
-exports.handler = async (event: any, context: any) => {
-  const { amount, currency } = JSON.parse(event.body);
-
-  try {
-    const paymentIntent = await stripe.paymentIntents.create({
-      amount: parseInt(amount),
-      currency: currency || 'eur',
-      payment_method_types: ['card'],
-    });
-
-    return {
-      statusCode: 200,
-      body: JSON.stringify({ ...paymentIntent }),
-    };
-  } catch (error) {
-    return {
-      statusCode: 500,
-      body: JSON.stringify({ error }),
-    };
-  }
-};
diff --git a/netlify.toml b/netlify.toml
index 8359c40..3768647 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -4,12 +4,6 @@
 
 [build]
   command = "nuxi generate"
-  functions = "functions"
-
-[[redirects]]
-  from = '/api/*'
-  to = '/.netlify/functions/:splat'
-  status = 200
 
 [[headers]]
   for = "/*.js"
diff --git a/woonuxt_base/components/shopElements/StripeElement.vue b/woonuxt_base/components/shopElements/StripeElement.vue
index ec3ce6d..ba3aaf1 100644
--- a/woonuxt_base/components/shopElements/StripeElement.vue
+++ b/woonuxt_base/components/shopElements/StripeElement.vue
@@ -1,22 +1,14 @@
 <script setup>
-const { cart } = useCart();
-
+import { GqlGetStripePaymentIntent } from '#gql';
 const { stripe } = defineProps(['stripe']);
 const emit = defineEmits(['elements']);
 
-let elements = null;
-
 const refreshStripeElements = async () => {
-  const totalForStripe = Math.round(parseFloat(cart.value?.rawTotal) * 100);
-  if (!stripe || !cart.value || !totalForStripe) return;
-  const { client_secret } = await fetch('/api/stripe', {
-    method: 'POST',
-    headers: { 'Content-Type': 'application/json' },
-    body: JSON.stringify({ amount: totalForStripe }),
-  }).then((res) => res.json());
+  if (!stripe) return;
 
+  const { stripePaymentIntent } = await GqlGetStripePaymentIntent();
   const stripeEl = document.getElementById('stripe-payment');
-  elements = stripe?.elements({ clientSecret: client_secret });
+  const elements = stripe?.elements({ clientSecret: stripePaymentIntent.clientSecret });
   const payEl = elements?.create('payment', { layout: 'tabs' });
 
   if (payEl && stripeEl) {
@@ -25,6 +17,7 @@ const refreshStripeElements = async () => {
   }
 };
 
+const { cart } = useCart();
 watch(
   () => cart.value,
   (newVal) => {
diff --git a/woonuxt_base/composables/useAuth.ts b/woonuxt_base/composables/useAuth.ts
index dcc7ba3..3a5325a 100644
--- a/woonuxt_base/composables/useAuth.ts
+++ b/woonuxt_base/composables/useAuth.ts
@@ -1,3 +1,6 @@
+import { GqlLogin, GqlLogout, GqlRegisterCustomer, GqlResetPasswordEmail, GqlGetOrders } from '#gql';
+import type { RegisterCustomerInput } from '#gql';
+
 export const useAuth = () => {
   const { refreshCart } = useCart();
 
@@ -51,7 +54,7 @@ export const useAuth = () => {
   };
 
   // Register the user
-  const registerUser = async (userInfo: CreateAccountInput): Promise<{ success: boolean; error: any }> => {
+  const registerUser = async (userInfo: RegisterCustomerInput): Promise<{ success: boolean; error: any }> => {
     isPending.value = true;
     try {
       await GqlRegisterCustomer({ input: userInfo });
diff --git a/woonuxt_base/composables/useCart.ts b/woonuxt_base/composables/useCart.ts
index fc06c79..67fe366 100644
--- a/woonuxt_base/composables/useCart.ts
+++ b/woonuxt_base/composables/useCart.ts
@@ -1,3 +1,6 @@
+import { GqlGetCart, GqlAddToCart, GqlUpDateCartQuantity, GqlEmptyCart, GqlChangeShippingMethod, GqlApplyCoupon, GqlRemoveCoupons } from '#gql';
+import type { AddToCartInput } from '#gql';
+
 /**
  * @name useCart
  * @description A composable that handles the cart in local storage
diff --git a/woonuxt_base/queries/getStripePaymentIntent.gql b/woonuxt_base/queries/getStripePaymentIntent.gql
new file mode 100644
index 0000000..fa1f4ee
--- /dev/null
+++ b/woonuxt_base/queries/getStripePaymentIntent.gql
@@ -0,0 +1,9 @@
+query getStripePaymentIntent {
+  stripePaymentIntent {
+    amount
+    clientSecret
+    error
+    id
+    currency
+  }
+}