diff --git a/packages/api-client/src/api/addPaymentMethod/index.ts b/packages/api-client/src/api/addPaymentMethod/index.ts
new file mode 100644
index 00000000..3dc90277
--- /dev/null
+++ b/packages/api-client/src/api/addPaymentMethod/index.ts
@@ -0,0 +1,23 @@
+/* eslint-disable camelcase */
+import { ApiContext } from '../../types';
+import getCurrentBearerOrCartToken from '../authentication/getCurrentBearerOrCartToken';
+
+export default async function addPaymentMethod({ client, config }: ApiContext, methodId: number): Promise<void> {
+  const token = await getCurrentBearerOrCartToken({ client, config });
+  const currency = await config.internationalization.getCurrency();
+
+  const result = await client.checkout.orderUpdate(token, {
+    order: {
+      payments_attributes: [
+        {
+          payment_method_id: methodId.toString()
+        }
+      ]
+    },
+    currency
+  });
+
+  if (result.isFail()) {
+    throw result.fail();
+  }
+}
diff --git a/packages/api-client/src/api/getPaymentIntent/index.ts b/packages/api-client/src/api/getPaymentIntent/index.ts
new file mode 100644
index 00000000..e5e03dcf
--- /dev/null
+++ b/packages/api-client/src/api/getPaymentIntent/index.ts
@@ -0,0 +1,28 @@
+import axios from 'axios';
+import { ApiContext, PaymentIntent } from '../../types';
+import getCurrentBearerOrCartToken from '../authentication/getCurrentBearerOrCartToken';
+import getAuthorizationHeaders from '../authentication/getAuthorizationHeaders';
+import { Logger } from '@vue-storefront/core';
+
+export default async function getPaymentIntent({ client, config }: ApiContext, methodId: number): Promise<PaymentIntent> {
+  try {
+    const token = await getCurrentBearerOrCartToken({ client, config });
+    const currency = await config.internationalization.getCurrency();
+    const endpoint = config.backendUrl.concat('/api/v2/storefront/intents/create');
+    const response = await axios.post(
+      endpoint, {
+        currency: currency,
+        payment_method_id: methodId
+      },
+      {
+        headers: getAuthorizationHeaders(token)
+      }
+    );
+    return {
+      clientSecret: response.data.client_secret
+    };
+  } catch (e) {
+    Logger.error(e);
+    throw e;
+  }
+}
diff --git a/packages/api-client/src/index.server.ts b/packages/api-client/src/index.server.ts
index 9e80a188..c5d34707 100644
--- a/packages/api-client/src/index.server.ts
+++ b/packages/api-client/src/index.server.ts
@@ -1,6 +1,7 @@
 import { ApiClientExtension, apiClientFactory } from '@vue-storefront/core';
 
 import addAddress from './api/addAddress';
+import addPaymentMethod from './api/addPaymentMethod';
 import addToCart from './api/addToCart';
 import addToWishlist from './api/addToWishlist';
 import applyCoupon from './api/applyCoupon';
@@ -24,6 +25,7 @@ import getOrCreateCart from './api/getOrCreateCart';
 import getOrder from './api/getOrder';
 import getOrders from './api/getOrders';
 import getPaymentConfirmationData from './api/getPaymentConfirmationData';
+import getPaymentIntent from './api/getPaymentIntent';
 import getPaymentMethods from './api/getPaymentMethods';
 import getProduct from './api/getProduct';
 import getProducts from './api/getProducts';
@@ -120,6 +122,8 @@ const { createApiClient } = apiClientFactory<any, any>({
     getPaymentMethods,
     savePaymentMethod,
     getPaymentConfirmationData,
+    addPaymentMethod,
+    getPaymentIntent,
     handlePaymentConfirmationResponse,
     makeOrder,
     forgotPassword,
diff --git a/packages/api-client/src/types/index.ts b/packages/api-client/src/types/index.ts
index 0d06b39b..70fac62c 100644
--- a/packages/api-client/src/types/index.ts
+++ b/packages/api-client/src/types/index.ts
@@ -11,6 +11,7 @@ export * from './wishlist';
 export * from './user';
 export * from './menu';
 export * from './page';
+export * from './paymentintent';
 
 export type CategoryFilter = Record<string, unknown>;
 export type ShippingMethod = Record<string, unknown>;
diff --git a/packages/api-client/src/types/paymentintent.ts b/packages/api-client/src/types/paymentintent.ts
new file mode 100644
index 00000000..4d490510
--- /dev/null
+++ b/packages/api-client/src/types/paymentintent.ts
@@ -0,0 +1,3 @@
+export type PaymentIntent = {
+    clientSecret: string;
+};
diff --git a/packages/theme/components/Checkout/PaymentMethod/Stripe.vue b/packages/theme/components/Checkout/PaymentMethod/Stripe.vue
index 58f669ce..3fa476b0 100644
--- a/packages/theme/components/Checkout/PaymentMethod/Stripe.vue
+++ b/packages/theme/components/Checkout/PaymentMethod/Stripe.vue
@@ -1,11 +1,19 @@
 <template>
-  <div ref="cardRef" />
+  <div>
+    <div ref="paymentRef" />
+    <div
+      ref="errorRef"
+      role="alert"
+      class="sf-alert color-danger"
+    />
+  </div>
 </template>
 
 <script>
-import { onMounted, ref, computed } from '@nuxtjs/composition-api';
+import { onMounted, ref, computed, useContext } from '@nuxtjs/composition-api';
 import { useVSFContext, Logger } from '@vue-storefront/core';
 import { loadStripe } from '@stripe/stripe-js';
+import { useCart, orderGetters } from '@vue-storefront/spree';
 
 export default {
   props: {
@@ -16,64 +24,71 @@ export default {
   },
 
   setup(props, { emit }) {
+    const { $config } = useContext();
     const { $spree } = useVSFContext();
+    const { cart } = useCart();
     const stripe = ref(null);
-    const card = ref(null);
-    const cardRef = ref(null);
-    const areIntentsEnabled = computed(() => props.method.preferences?.intents);
+    const payment = ref(null);
+    const elements = ref(null);
+    const paymentRef = ref(null);
+    const errorRef = ref(null);
     const publishableKey = computed(() => props.method.preferences?.publishable_key);
 
     const savePayment = async () => {
       try {
-        const methodId = props.method.id;
-        const { token } = await stripe.value.createToken(card.value);
-
-        const payload = {
-          // eslint-disable-next-line camelcase
-          gateway_payment_profile_id: token.id,
-          number: token.card.last4,
-          month: token.card.exp_month,
-          year: token.card.exp_year,
-          name: token.card.name
-        };
-
-        await $spree.api.savePaymentMethod(methodId, payload);
-
-        if (areIntentsEnabled.value) {
-          const threeDSecureData = await $spree.api.getPaymentConfirmationData();
-          const confirmCardPaymentResponse = await stripe.value.confirmCardPayment(threeDSecureData.clientSecret, {});
-          const handlePaymentConfirmationResponse = await $spree.api.handlePaymentConfirmationResponse({
-            confirmationResponse: confirmCardPaymentResponse
-          });
-
-          if (!handlePaymentConfirmationResponse.success) {
-            throw new Error('Failed to confirm payment');
+        const orderId = orderGetters.getId(cart.value);
+        const { error } = await stripe.value.confirmPayment({
+          elements: elements.value,
+          confirmParams: {
+            return_url: `${$config.baseUrl}/checkout/thank-you?order=${orderId}`
           }
+        });
+
+        if (error) {
+          errorRef.value.textContent = error.message;
+          // Return false to prevent order proceeding to complete
+          return false;
         }
       } catch (e) {
         Logger.error(e);
+        // Return false to prevent order proceeding to complete
+        return false;
       }
     };
 
     const handleCardChange = (ev) => {
+      if (ev.error) {
+        errorRef.value.textContent = ev.error.message;
+      } else {
+        errorRef.value.textContent = '';
+      }
       const isPaymentReady = ev.complete && !ev.error;
       emit('change:payment', { isPaymentReady, savePayment });
     };
 
     onMounted(async () => {
       try {
+        // Need to add payment method first to be able to create a payment intent
+        const methodId = props.method.id;
+        await $spree.api.addPaymentMethod(methodId);
+
+        const paymentIntent = await $spree.api.getPaymentIntent(methodId);
+
         stripe.value = await loadStripe(publishableKey.value);
-        const elements = stripe.value.elements();
-        card.value = elements.create('card');
-        card.value.on('change', handleCardChange);
-        card.value.mount(cardRef.value);
+        elements.value = stripe.value.elements({
+          clientSecret: paymentIntent.clientSecret
+        });
+        payment.value = elements.value.create('payment');
+        payment.value.mount(paymentRef.value);
+        payment.value.on('change', handleCardChange);
       } catch (e) {
         Logger.error(e);
       }
     });
 
     return {
-      cardRef
+      paymentRef,
+      errorRef
     };
   }
 };
diff --git a/packages/theme/nuxt.config.js b/packages/theme/nuxt.config.js
index 86fbd3fe..442792b7 100644
--- a/packages/theme/nuxt.config.js
+++ b/packages/theme/nuxt.config.js
@@ -218,6 +218,7 @@ export default {
     }
   },
   publicRuntimeConfig: {
-    theme
+    theme,
+    baseUrl: process.env.BASE_URL || 'http://localhost:3000'
   }
 };
diff --git a/packages/theme/pages/Checkout/Payment.vue b/packages/theme/pages/Checkout/Payment.vue
index b418f593..f5464263 100644
--- a/packages/theme/pages/Checkout/Payment.vue
+++ b/packages/theme/pages/Checkout/Payment.vue
@@ -135,6 +135,7 @@ export default {
     const isPaymentReady = ref(false);
     const savePayment = ref(null);
     const terms = ref(false);
+    const paymentSuccessful = ref(false);
 
     onSSR(async () => {
       await load();
@@ -148,18 +149,20 @@ export default {
     const processOrder = async () => {
       const orderId = orderGetters.getId(cart.value);
       try {
-        await savePayment.value();
+        paymentSuccessful.value = await savePayment.value();
       } catch (e) {
         Logger.error(e);
         return;
       }
 
-      await make();
-      if (makeError.value.make) {
-        Logger.error(makeError.value.make);
-        return;
+      if (paymentSuccessful.value) {
+        await make();
+        if (makeError.value.make) {
+          Logger.error(makeError.value.make);
+          return;
+        }
+        router.push(root.localePath(`/checkout/thank-you?order=${orderId}`));
       }
-      router.push(root.localePath(`/checkout/thank-you?order=${orderId}`));
     };
 
     return {