diff --git a/CHANGELOG.md b/CHANGELOG.md
index 50228d6..79fc2d1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [2.2.0]
+### Added
+- Support Apple Pay functionality
+
 ## [2.1.0]
 ### Added
 - Add support for MarketPay payment methods.
diff --git a/Docs/Configuration/shopware_configure_altapay_terminal_detail.png b/Docs/Configuration/shopware_configure_altapay_terminal_detail.png
index f49261a..2988f5c 100644
Binary files a/Docs/Configuration/shopware_configure_altapay_terminal_detail.png and b/Docs/Configuration/shopware_configure_altapay_terminal_detail.png differ
diff --git a/composer.json b/composer.json
index 6181673..5fb7123 100644
--- a/composer.json
+++ b/composer.json
@@ -3,7 +3,7 @@
     "description": "AltaPay plugin for Shopware 6",
     "type": "shopware-platform-plugin",
     "license": "MIT",
-    "version": "2.1.0",
+    "version": "2.2.0",
     "authors": [
         {
             "name": "AltaPay A/S",
diff --git a/sonar-project.properties b/sonar-project.properties
index 6b906d5..5fc80f5 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -2,3 +2,8 @@ sonar.projectKey=AltaPay_plugin-shopware_6ff55bfb-f13e-4cba-a54c-9f0804511bbf
 sonar.projectBaseDir=src
 sonar.coverage.exclusions=**
 sonar.cpd.exclusions=**
+sonar.issue.ignore.multicriteria=e1,e2
+sonar.issue.ignore.multicriteria.e1.ruleKey=php:S1142
+sonar.issue.ignore.multicriteria.e1.resourceKey=**/Controller/*.php
+sonar.issue.ignore.multicriteria.e2.ruleKey=php:S3776
+sonar.issue.ignore.multicriteria.e2.resourceKey=**/Service/*.php
diff --git a/src/Controller/CallbackController.php b/src/Controller/CallbackController.php
index eaf7f31..ac3513d 100644
--- a/src/Controller/CallbackController.php
+++ b/src/Controller/CallbackController.php
@@ -3,6 +3,7 @@
 namespace Wexo\AltaPay\Controller;
 
 use Exception;
+use GuzzleHttp\Exception\GuzzleException;
 use Psr\Log\LoggerInterface;
 use Shopware\Core\Checkout\Cart\CartException;
 use Shopware\Core\Checkout\Order\OrderEntity;
@@ -16,19 +17,24 @@
 use Shopware\Storefront\Controller\StorefrontController;
 use SimpleXMLElement;
 use Symfony\Component\HttpFoundation\IpUtils;
+use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Routing\RouterInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
+use Wexo\AltaPay\Service\Exception\AltaPayException;
 use Wexo\AltaPay\Service\PaymentService;
 use Twig\Environment;
 
 #[Route(defaults: ['_routeScope' => ['storefront']])]
 class CallbackController
 {
+    private const ERROR_MISSING_PARAMETERS = 'Missing required parameters';
+
     public function __construct(
         protected readonly PaymentService $paymentService,
         protected readonly EntityRepository $orderRepository,
@@ -37,7 +43,8 @@ public function __construct(
         protected readonly TranslatorInterface $translator,
         protected readonly SystemConfigService $systemConfigService,
         protected readonly EntityRepository $mediaRepository,
-        protected Environment $twig
+        protected Environment $twig,
+        protected readonly RequestStack $requestStack
     ) {
     }
 
@@ -176,7 +183,7 @@ public function notification(Request $request, SalesChannelContext $salesChannel
             $result = new SimpleXMLElement($request->get('xml'));
             $orderNumber = (string)$result?->Body?->Transactions?->Transaction?->ShopOrderId;
             if (!$orderNumber) {
-                throw new Exception();
+                throw new AltaPayException();
             }
         } catch (Exception) {
             return new Response('Error processing request', 400);
@@ -195,4 +202,165 @@ public function notification(Request $request, SalesChannelContext $salesChannel
         $this->paymentService->transactionCallback($result, $order, $transaction, $salesChannelContext, $allRequestParams, true);
         return new Response("Acknowledged", 200);
     }
+
+    /**
+     * Validate an Apple Pay merchant session using only the payment method ID.
+     */
+    #[Route(
+        path: '/altapay/applepay/validate-merchant-by-method',
+        name: 'altapay.applepay.validate_merchant_by_method',
+        defaults: ['auth_required' => false, 'csrf_protected' => false],
+        methods: ['POST']
+    )]
+    public function validateMerchantByMethod(Request $request, SalesChannelContext $salesChannelContext): Response
+    {
+        $validationUrl   = $request->get('validationUrl');
+        $paymentMethodId = $request->get('paymentMethodId');
+
+        if (!$validationUrl || !$paymentMethodId) {
+            return new JsonResponse(['success' => false, 'error' => self::ERROR_MISSING_PARAMETERS]);
+        }
+
+        try {
+            $config = $this->paymentService->getApplePayConfigByPaymentMethodId(
+                $paymentMethodId,
+                $salesChannelContext->getContext(),
+                $salesChannelContext->getSalesChannelId()
+            );
+        } catch (\Throwable $e) {
+            $this->logger->error('Apple Pay validate-by-method config error: ' . $e->getMessage(), ['exception' => $e]);
+            return new JsonResponse(['success' => false, 'error' => 'Payment method config not found: ' . $e->getMessage()]);
+        }
+
+        try {
+            $applePaySession = $this->paymentService->cardWalletSession(
+                $validationUrl,
+                $config['terminal'],
+                $request->getHost(),
+                $salesChannelContext->getSalesChannelId()
+            );
+            return new JsonResponse(['success' => true, 'applePaySession' => $applePaySession]);
+        } catch (\Throwable $e) {
+            $this->logger->error('Apple Pay validate-by-method error: ' . $e->getMessage(), ['exception' => $e]);
+            return new JsonResponse(['success' => false, 'error' => $e->getMessage()]);
+        }
+    }
+
+    /**
+     * Serve the dedicated Apple Pay checkout page.
+     */
+    #[Route(
+        path: '/altapay/applepay/checkout',
+        name: 'altapay.applepay.checkout',
+        defaults: ['auth_required' => false],
+        methods: ['GET']
+    )]
+    public function applePayCheckout(Request $request, SalesChannelContext $salesChannelContext): Response
+    {
+        $orderTransactionId = $request->get('orderTransactionId');
+        $returnUrl          = $request->get('returnUrl');
+
+        if (!$orderTransactionId || !$returnUrl) {
+            return new Response('Missing orderTransactionId or returnUrl', 400);
+        }
+
+        try {
+            $config = $this->paymentService->getApplePayConfig($orderTransactionId, $salesChannelContext->getContext());
+        } catch (\Exception $e) {
+            $this->logger->error('Apple Pay checkout config error: ' . $e->getMessage());
+            return new Response('Error loading payment data: ' . $e->getMessage(), 500);
+        }
+
+        $config['returnUrl']   = $returnUrl;
+        $config['sessionUrl']  = $this->router->generate('altapay.applepay.session',   [], UrlGeneratorInterface::ABSOLUTE_URL);
+        $config['authorizeUrl']= $this->router->generate('altapay.applepay.authorize', [], UrlGeneratorInterface::ABSOLUTE_URL);
+
+        return $this->renderTemplate(
+            '@WexoAltaPay/gateway/applepay.html.twig',
+            ['applePayData' => $config]
+        );
+    }
+
+    /**
+     * Validate the Apple Pay merchant session with AltaPay (called by onvalidatemerchant JS event).
+     */
+    #[Route(
+        path: '/altapay/applepay/session',
+        name: 'altapay.applepay.session',
+        defaults: ['auth_required' => false, 'csrf_protected' => false],
+        methods: ['POST']
+    )]
+    public function applePaySession(Request $request, SalesChannelContext $salesChannelContext): Response
+    {
+        $validationUrl      = $request->get('validationUrl');
+        $orderTransactionId = $request->get('orderTransactionId');
+
+        if (!$validationUrl || !$orderTransactionId) {
+            return new JsonResponse(['success' => false, 'error' => self::ERROR_MISSING_PARAMETERS], 400);
+        }
+
+        try {
+            $config = $this->paymentService->getApplePayConfig($orderTransactionId, $salesChannelContext->getContext());
+        } catch (GuzzleException $e) {
+            $this->logger->error('Apple Pay session config error: ' . $e->getMessage());
+            return new JsonResponse(['success' => false, 'error' => 'Failed to load payment config: ' . $e->getMessage()]);
+        }
+
+        try {
+            $applePaySession = $this->paymentService->cardWalletSession(
+                $validationUrl,
+                $config['terminal'],
+                $request->getHost(),
+                $config['salesChannelId']
+            );
+            return new JsonResponse(['success' => true, 'applePaySession' => $applePaySession]);
+        } catch (GuzzleException $e) {
+            $this->logger->error('Apple Pay merchant validation network error: ' . $e->getMessage());
+            return new JsonResponse(['success' => false, 'error' => 'Network error during merchant validation: ' . $e->getMessage()]);
+        } catch (\Exception $e) {
+            $this->logger->error('Apple Pay merchant validation error: ' . $e->getMessage());
+            return new JsonResponse(['success' => false, 'error' => $e->getMessage()]);
+        }
+    }
+
+    /**
+     * Process the Apple Pay payment token received after onpaymentauthorized.
+     */
+    #[Route(
+        path: '/altapay/applepay/authorize',
+        name: 'altapay.applepay.authorize',
+        defaults: ['auth_required' => false, 'csrf_protected' => false],
+        methods: ['POST']
+    )]
+    public function applePayAuthorize(Request $request, SalesChannelContext $salesChannelContext): Response
+    {
+        $content = $request->getContent();
+        $data    = json_decode($content, true);
+
+        $orderTransactionId = $data['orderTransactionId'] ?? null;
+        $providerData       = $data['providerData'] ?? null;
+        $returnUrl          = $data['returnUrl'] ?? null;
+
+        if (!$orderTransactionId || $providerData === null || !$returnUrl) {
+            return new JsonResponse(['success' => false, 'error' => self::ERROR_MISSING_PARAMETERS], 400);
+        }
+
+        $providerDataJson = json_encode($providerData);
+
+        try {
+            $finalReturnUrl = $this->paymentService->processApplePayPayment(
+                $orderTransactionId,
+                $providerDataJson,
+                $returnUrl,
+                $salesChannelContext->getContext()
+            );
+            return new JsonResponse(['success' => true, 'redirectUrl' => $finalReturnUrl]);
+        } catch (GuzzleException $e) {
+            $this->logger->error('Apple Pay authorize network error: ' . $e->getMessage());
+            return new JsonResponse(['success' => false, 'error' => 'Network error during payment processing: ' . $e->getMessage()]);
+        } catch (\Exception $e) {
+            $this->logger->error('Apple Pay authorize error: ' . $e->getMessage());
+            return new JsonResponse(['success' => false, 'error' => 'Payment processing failed: ' . $e->getMessage()]);
+        }
+    }
 }
diff --git a/src/Resources/config/services.xml b/src/Resources/config/services.xml
index f2f28d6..ae26907 100644
--- a/src/Resources/config/services.xml
+++ b/src/Resources/config/services.xml
@@ -40,6 +40,7 @@
             <argument type="service" id="Shopware\Core\System\SystemConfig\SystemConfigService"/>
             <argument type="service" id="media.repository"/>
             <argument type="service" id="twig"/>
+            <argument type="service" id="request_stack"/>
         </service>
         <service id="Wexo\AltaPay\Controller\ApiController" public="true">
             <argument type="service" id="Wexo\AltaPay\Service\PaymentService" />
@@ -71,5 +72,10 @@
             <tag name="kernel.event_subscriber"/>
         </service>
 
+        <service id="Wexo\AltaPay\Subscriber\ApplePayAvailabilitySubscriber">
+            <argument type="service" id="request_stack"/>
+            <tag name="kernel.event_subscriber"/>
+        </service>
+
     </services>
 </container>
diff --git a/src/Resources/views/gateway/apple-pay-session.html.twig b/src/Resources/views/gateway/apple-pay-session.html.twig
new file mode 100644
index 0000000..a99a230
--- /dev/null
+++ b/src/Resources/views/gateway/apple-pay-session.html.twig
@@ -0,0 +1,92 @@
+{#
+  Shared Apple Pay session helper.
+
+  Wires the ApplePaySession event handlers that are identical regardless of
+  where the session is started from: merchant validation (POST to a caller
+  supplied URL), payment-method reselection, shipping no-ops, and cancel.
+
+  Only `onvalidatemerchant`'s request body and `onpaymentauthorized` differ
+  between entry points (pre-order vs. post-order), so those are left to the
+  caller via `cfg.validateMerchantParams` and `cfg.onPaymentAuthorized`.
+
+  Include this once before calling AltaPayApplePay.runSession(cfg), where
+  cfg is:
+    {
+      countryCode, currencyCode, supportedNetworks (array), label, amount,
+      validateMerchantUrl, validateMerchantParams (plain object, optional),
+      onPaymentAuthorized: function (event, session) {},
+      onError:  function (message) {},
+      onCancel: function () {}
+    }
+#}
+<script>
+window.AltaPayApplePay = window.AltaPayApplePay || {};
+
+AltaPayApplePay.runSession = function (cfg) {
+    'use strict';
+
+    var session = new ApplePaySession(3, {
+        countryCode:          cfg.countryCode,
+        currencyCode:         cfg.currencyCode,
+        merchantCapabilities: ['supports3DS'],
+        supportedNetworks:    cfg.supportedNetworks,
+        total: { label: cfg.label, type: 'final', amount: cfg.amount }
+    });
+
+    session.onvalidatemerchant = function (event) {
+        var body = new URLSearchParams(Object.assign(
+            { validationUrl: event.validationURL },
+            cfg.validateMerchantParams || {}
+        ));
+
+        fetch(cfg.validateMerchantUrl, {
+            method:      'POST',
+            headers:     { 'Content-Type': 'application/x-www-form-urlencoded' },
+            credentials: 'same-origin',
+            body:        body.toString()
+        })
+        .then(function (res) {
+            /* Read as text first — if the server returns an HTML error page, res.json() would throw. */
+            return res.text().then(function (text) {
+                try {
+                    return JSON.parse(text);
+                } catch (e) {
+                    throw new Error('HTTP ' + res.status + ' — non-JSON merchant validation response.');
+                }
+            });
+        })
+        .then(function (data) {
+            if (data.success) {
+                var merchantSession = (typeof data.applePaySession === 'string')
+                    ? JSON.parse(data.applePaySession)
+                    : data.applePaySession;
+                session.completeMerchantValidation(merchantSession);
+            } else {
+                session.abort();
+                cfg.onError(data.error || 'Merchant validation failed.');
+            }
+        })
+        .catch(function (err) {
+            session.abort();
+            cfg.onError(err.message || 'Network error during merchant validation.');
+        });
+    };
+
+    session.onpaymentmethodselected = function () {
+        session.completePaymentMethodSelection({
+            newTotal: { label: cfg.label, type: 'final', amount: cfg.amount }
+        });
+    };
+
+    session.onpaymentauthorized = function (event) {
+        cfg.onPaymentAuthorized(event, session);
+    };
+
+    session.onshippingmethodselected  = function () { session.completeShippingMethodSelection({}); };
+    session.onshippingcontactselected = function () { session.completeShippingContactSelection({}); };
+    session.oncancel = function () { cfg.onCancel && cfg.onCancel(); };
+
+    session.begin();
+    return session;
+};
+</script>
diff --git a/src/Resources/views/gateway/applepay.html.twig b/src/Resources/views/gateway/applepay.html.twig
new file mode 100644
index 0000000..6dfdfae
--- /dev/null
+++ b/src/Resources/views/gateway/applepay.html.twig
@@ -0,0 +1,270 @@
+<!DOCTYPE html>
+{% block altapay_applepay_head %}
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>{{ 'altapay.gateway.title'|trans }}</title>
+
+    <script type="text/javascript" src="https://applepay.cdn-apple.com/jsapi/v1/apple-pay-sdk.js" crossorigin="anonymous"></script>
+
+    <style>
+        *,
+        *::before,
+        *::after { box-sizing: border-box; }
+
+        body {
+            margin: 0;
+            font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
+            background-color: #f5f5f7;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            min-height: 100vh;
+        }
+
+        .applepay-container {
+            background: #ffffff;
+            border-radius: 16px;
+            box-shadow: 0 4px 24px rgba(0, 0, 0, 0.10);
+            padding: 40px 32px;
+            width: 100%;
+            max-width: 400px;
+            text-align: center;
+        }
+
+        .applepay-title {
+            font-size: 22px;
+            font-weight: 600;
+            color: #1d1d1f;
+            margin: 0 0 8px;
+        }
+
+        .applepay-order-info {
+            font-size: 15px;
+            color: #6e6e73;
+            margin: 0 0 28px;
+        }
+
+        .applepay-amount {
+            font-size: 32px;
+            font-weight: 700;
+            color: #1d1d1f;
+            margin: 0 0 32px;
+        }
+
+        #apple-pay-button {
+            -webkit-appearance: -apple-pay-button;
+            -apple-pay-button-type: buy;
+            -apple-pay-button-style: black;
+            display: block;
+            width: 100%;
+            height: 52px;
+            border-radius: 10px;
+            cursor: pointer;
+            border: none;
+            outline: none;
+        }
+
+        /* Fallback for browsers without Apple Pay button support */
+        #apple-pay-button.fallback {
+            background: #000000;
+            color: #ffffff;
+            font-size: 16px;
+            font-weight: 600;
+            letter-spacing: -0.3px;
+            -webkit-appearance: none;
+            appearance: none;
+        }
+
+        .applepay-unavailable {
+            display: none;
+            padding: 14px;
+            background: #fff3cd;
+            border: 1px solid #ffc107;
+            border-radius: 8px;
+            color: #856404;
+            font-size: 14px;
+        }
+
+        .applepay-error {
+            display: none;
+            margin-top: 16px;
+            padding: 12px;
+            background: #fde8e8;
+            border: 1px solid #f5c6c6;
+            border-radius: 8px;
+            color: #c0392b;
+            font-size: 14px;
+        }
+
+        .applepay-back {
+            display: inline-block;
+            margin-top: 20px;
+            font-size: 14px;
+            color: #6e6e73;
+            text-decoration: none;
+        }
+
+        .applepay-back:hover {
+            color: #1d1d1f;
+            text-decoration: underline;
+        }
+    </style>
+</head>
+{% endblock %}
+
+{% block altapay_applepay_body %}
+<body>
+    <div class="applepay-container">
+        {% block applepay_title %}
+            <h1 class="applepay-title">{{ 'altapay.gateway.title'|trans }}</h1>
+        {% endblock %}
+
+        {% block applepay_order_info %}
+            <p class="applepay-order-info">
+                {{ 'altapay.gateway.orderNumber'|trans }}: <strong>{{ applePayData.orderTransactionId|slice(0,8)|upper }}</strong>
+            </p>
+        {% endblock %}
+
+        {% block applepay_amount %}
+            <p class="applepay-amount">{{ applePayData.currency }} {{ applePayData.amount }}</p>
+        {% endblock %}
+
+        {% block applepay_button %}
+            <div id="apple-pay-wrapper">
+                <button id="apple-pay-button" type="button" aria-label="Buy with Apple Pay"></button>
+                <div id="applepay-unavailable" class="applepay-unavailable">
+                    Apple Pay is not available in this browser. Please use Safari on a supported Apple device.
+                </div>
+            </div>
+        {% endblock %}
+
+        {% block applepay_error %}
+            <div id="applepay-error" class="applepay-error"></div>
+        {% endblock %}
+
+        {% block applepay_back %}
+            <a href="{{ path('frontend.checkout.cart.page') }}" class="applepay-back">
+                ← {{ 'checkout.finishButtonBackToShop'|trans|striptags }}
+            </a>
+        {% endblock %}
+    </div>
+
+    {% block applepay_script %}
+    {% include '@WexoAltaPay/gateway/apple-pay-session.html.twig' %}
+    <script>
+    (function () {
+        'use strict';
+
+        var cfg = {
+            orderTransactionId: {{ applePayData.orderTransactionId|json_encode|raw }},
+            sessionUrl:         {{ applePayData.sessionUrl|json_encode|raw }},
+            authorizeUrl:       {{ applePayData.authorizeUrl|json_encode|raw }},
+            returnUrl:          {{ applePayData.returnUrl|json_encode|raw }},
+            amount:             {{ applePayData.amount|json_encode|raw }},
+            currencyCode:       {{ applePayData.currency|json_encode|raw }},
+            countryCode:        {{ applePayData.countryCode|json_encode|raw }},
+            label:              {{ applePayData.applePayLabel|json_encode|raw }},
+            supportedNetworks:  {{ applePayData.supportedNetworks|json_encode|raw }}
+        };
+
+        var button        = document.getElementById('apple-pay-button');
+        var errorEl       = document.getElementById('applepay-error');
+        var unavailableEl = document.getElementById('applepay-unavailable');
+
+        function showError(msg) {
+            errorEl.textContent = msg || 'Payment failed. Please try again.';
+            errorEl.style.display = 'block';
+        }
+
+        if (!window.ApplePaySession) {
+            button.style.display = 'none';
+            unavailableEl.style.display = 'block';
+            return;
+        }
+
+        try {
+            if (!ApplePaySession.canMakePayments()) {
+                button.style.display = 'none';
+                unavailableEl.style.display = 'block';
+                return;
+            }
+        } catch (e) {
+            button.style.display = 'none';
+            unavailableEl.style.display = 'block';
+            return;
+        }
+
+        // Safari carries the user-gesture context across navigation.
+        // This page was reached by the user submitting the checkout form (user gesture),
+        // so session.begin() is allowed here without an additional click.
+        button.addEventListener('click', function () { startApplePaySession(); });
+
+        // Auto-trigger: begin the sheet immediately on page load.
+        // If the browser rejects it (not a user-gesture context), fall back to the button.
+        try {
+            startApplePaySession();
+        } catch (e) {
+            // Not in a user-gesture context (e.g. direct URL access) — show the button.
+            button.style.display = 'block';
+        }
+
+        function startApplePaySession() {
+            errorEl.style.display = 'none';
+            button.style.display = 'none';
+
+            AltaPayApplePay.runSession({
+                countryCode:             cfg.countryCode,
+                currencyCode:            cfg.currencyCode,
+                supportedNetworks:       cfg.supportedNetworks,
+                label:                   cfg.label,
+                amount:                  cfg.amount,
+                validateMerchantUrl:     cfg.sessionUrl,
+                validateMerchantParams:  { orderTransactionId: cfg.orderTransactionId },
+
+                onPaymentAuthorized: function (event, session) {
+                    fetch(cfg.authorizeUrl, {
+                        method:      'POST',
+                        headers:     { 'Content-Type': 'application/json' },
+                        credentials: 'same-origin',
+                        body:        JSON.stringify({
+                            providerData:       event.payment.token,
+                            orderTransactionId: cfg.orderTransactionId,
+                            returnUrl:          cfg.returnUrl
+                        })
+                    })
+                    .then(function (res) { return res.json(); })
+                    .then(function (data) {
+                        if (data.success) {
+                            session.completePayment(ApplePaySession.STATUS_SUCCESS);
+                            window.location.href = data.redirectUrl;
+                        } else {
+                            session.completePayment(ApplePaySession.STATUS_FAILURE);
+                            button.style.display = 'block';
+                            showError(data.error || 'Payment failed. Please try again.');
+                        }
+                    })
+                    .catch(function () {
+                        session.completePayment(ApplePaySession.STATUS_FAILURE);
+                        button.style.display = 'block';
+                        showError('Network error during payment processing.');
+                    });
+                },
+
+                onError: function (msg) {
+                    showError(msg);
+                    button.style.display = 'block';
+                },
+
+                onCancel: function () {
+                    button.style.display = 'block';
+                }
+            });
+        }
+    }());
+    </script>
+    {% endblock %}
+</body>
+{% endblock %}
+</html>
diff --git a/src/Resources/views/storefront/page/checkout/confirm/index.html.twig b/src/Resources/views/storefront/page/checkout/confirm/index.html.twig
new file mode 100644
index 0000000..e7ea775
--- /dev/null
+++ b/src/Resources/views/storefront/page/checkout/confirm/index.html.twig
@@ -0,0 +1,204 @@
+{% sw_extends '@Storefront/storefront/page/checkout/confirm/index.html.twig' %}
+
+{% block page_checkout_confirm %}
+    {{ parent() }}
+
+    {#
+      Detect Apple Pay methods. customFields may be on pm.customFields (not translated),
+      check that first, fall back to pm.translated.customFields.
+    #}
+    {% set altapayAppleMethods = [] %}
+    {% if page.paymentMethods is defined %}
+        {% for pm in page.paymentMethods %}
+            {% set cf = pm.customFields ?? pm.translated.customFields ?? {} %}
+            {% if cf.wexoAltaPayIsApplePay is defined and cf.wexoAltaPayIsApplePay %}
+                {% set altapayAppleMethods = altapayAppleMethods|merge([{
+                    'id':       pm.id,
+                    'label':    pm.translated.name,
+                    'networks': (cf.wexoAltaPayApplePayNetworks is defined and cf.wexoAltaPayApplePayNetworks)
+                                    ? cf.wexoAltaPayApplePayNetworks
+                                    : 'visa,masterCard,amex'
+                }]) %}
+            {% endif %}
+        {% endfor %}
+    {% endif %}
+
+    {% if altapayAppleMethods is not empty %}
+    <script type="text/javascript" src="https://applepay.cdn-apple.com/jsapi/v1/apple-pay-sdk.js" crossorigin="anonymous"></script>
+    {% include '@WexoAltaPay/gateway/apple-pay-session.html.twig' %}
+    <script>
+    (function () {
+        'use strict';
+
+        var APPLE_PAY_METHODS     = {{ altapayAppleMethods|json_encode|raw }};
+        var VALIDATE_MERCHANT_URL = '{{ path('altapay.applepay.validate_merchant_by_method') }}';
+        var AUTHORIZE_URL         = '{{ path('altapay.applepay.authorize') }}';
+        var CART_TOTAL            = '{{ page.cart.price.totalPrice|number_format(2, '.', '') }}';
+        var CURRENCY_ISO          = {{ context.currency.isoCode|json_encode|raw }};
+        var COUNTRY_CODE          = {{ (context.shippingLocation.country.iso ?? 'DK')|json_encode|raw }};
+
+        /* paymentMethodId → Apple Pay config */
+        var applePayMap = {};
+        APPLE_PAY_METHODS.forEach(function (m) { applePayMap[m.id] = m; });
+
+        if (!window.ApplePaySession) {
+            console.warn('[AltaPay] Apple Pay: not available (use Safari on Apple device).');
+            return;
+        }
+
+        /* Same check as Magento2 AltaPay plugin — exclude Chrome, Android and non-Safari browsers */
+        var isSafari = (/^((?!chrome|android).)*safari/i.test(navigator.userAgent));
+        if (!isSafari) {
+            console.warn('[AltaPay] Apple Pay: hidden — not a Safari browser.');
+            /* Hide the Apple Pay payment method radio options in the payment list */
+            APPLE_PAY_METHODS.forEach(function (m) {
+                var el = document.querySelector('input[name="paymentMethodId"][value="' + m.id + '"]');
+                if (el) {
+                    var row = el.closest('.payment-method') || el.closest('label') || el.parentElement;
+                    if (row) { row.style.display = 'none'; }
+                }
+            });
+            return;
+        }
+
+        try {
+            if (!ApplePaySession.canMakePayments()) {
+                console.warn('[AltaPay] Apple Pay: canMakePayments() = false.');
+                return;
+            }
+        } catch (e) {
+            console.warn('[AltaPay] Apple Pay: canMakePayments() threw:', e);
+            return;
+        }
+
+        /* Run init() exactly once after DOM is ready */
+        var _initialized = false;
+        function runOnce() {
+            if (_initialized) { return; }
+            _initialized = true;
+            init();
+        }
+        if (document.readyState === 'loading') {
+            document.addEventListener('DOMContentLoaded', runOnce);
+        } else {
+            runOnce();
+        }
+
+        function init() {
+            /* Try every known Shopware confirm-form selector */
+            var form = document.getElementById('confirmOrderForm')
+                    || document.querySelector('[data-form-csrf-handler] form')
+                    || document.querySelector('form[action*="checkout/order"]')
+                    || document.querySelector('form[action*="order/confirm"]');
+
+            if (!form) {
+                /* Last resort: find the submit button and walk up to its form */
+                var btn = document.querySelector('[data-form-submit-loader]')
+                       || document.querySelector('button[form="confirmOrderForm"]')
+                       || document.querySelector('.confirm-tos ~ div button[type="submit"]');
+                if (btn) { form = btn.closest('form'); }
+            }
+
+            if (!form) {
+                console.warn('[AltaPay] Apple Pay: form not found. All forms on page:', [].map.call(document.querySelectorAll('form'), function(f){ return f.id + '|' + f.action; }));
+                return;
+            }
+
+            console.log('[AltaPay] Apple Pay ready. Form:', form.id || form.action, 'Methods:', APPLE_PAY_METHODS);
+
+            function getSelectedPaymentMethodId() {
+                var checked = document.querySelector('input[name="paymentMethodId"]:checked')
+                           || document.querySelector('.payment-method-input:checked');
+                return checked ? checked.value : null;
+            }
+
+            /* useCapture:true — run BEFORE Shopware's own submit handlers */
+            form.addEventListener('submit', function (e) {
+                var pmId   = getSelectedPaymentMethodId();
+                var config = pmId ? applePayMap[pmId] : null;
+
+                if (!config) { return; } /* not Apple Pay — let Shopware handle */
+
+                e.preventDefault();
+                e.stopImmediatePropagation();
+
+                console.log('[AltaPay] Intercepted submit for Apple Pay method:', pmId);
+
+                var networks = config.networks.split(',').map(function (n) { return n.trim(); }).filter(Boolean);
+
+                /* AltaPayApplePay.runSession() calls session.begin() synchronously,
+                   which MUST happen inside this submit handler (user-gesture context). */
+                AltaPayApplePay.runSession({
+                    countryCode:            COUNTRY_CODE,
+                    currencyCode:           CURRENCY_ISO,
+                    supportedNetworks:      networks,
+                    label:                  config.label,
+                    amount:                 CART_TOTAL,
+                    validateMerchantUrl:    VALIDATE_MERCHANT_URL,
+                    validateMerchantParams: { paymentMethodId: pmId },
+
+                    /* Authenticated: create the order, then authorize */
+                    onPaymentAuthorized: function (event, session) {
+                        var appleToken = event.payment.token;
+
+                        fetch(form.action, {
+                            method:      'POST',
+                            credentials: 'same-origin',
+                            redirect:    'follow',
+                            body:        new FormData(form)
+                        })
+                        .then(function (resp) {
+                            var finalUrl           = new URL(resp.url, window.location.origin);
+                            var orderTransactionId = finalUrl.searchParams.get('orderTransactionId');
+                            var returnUrl          = finalUrl.searchParams.get('returnUrl');
+
+                            if (!orderTransactionId || !returnUrl) {
+                                console.error('[AltaPay] Order creation landed on unexpected URL:', resp.url);
+                                throw new Error('Order creation failed — expected Apple Pay redirect params in URL.');
+                            }
+
+                            console.log('[AltaPay] Order created. Transaction:', orderTransactionId);
+
+                            return fetch(AUTHORIZE_URL, {
+                                method:      'POST',
+                                credentials: 'same-origin',
+                                headers:     { 'Content-Type': 'application/json' },
+                                body:        JSON.stringify({
+                                    providerData:       appleToken,
+                                    orderTransactionId: orderTransactionId,
+                                    returnUrl:          returnUrl
+                                })
+                            });
+                        })
+                        .then(function (r) { return r.json(); })
+                        .then(function (data) {
+                            if (data.success) {
+                                session.completePayment(ApplePaySession.STATUS_SUCCESS);
+                                window.location.href = data.redirectUrl;
+                            } else {
+                                console.error('[AltaPay] Authorize failed:', data.error);
+                                session.completePayment(ApplePaySession.STATUS_FAILURE);
+                            }
+                        })
+                        .catch(function (err) {
+                            console.error('[AltaPay] Payment error:', err);
+                            session.completePayment(ApplePaySession.STATUS_FAILURE);
+                        });
+                    },
+
+                    onError: function (msg) {
+                        console.error('[AltaPay] Merchant validation error:', msg);
+                    },
+
+                    onCancel: function () {
+                        console.log('[AltaPay] Apple Pay cancelled.');
+                    }
+                });
+
+            }, true); /* useCapture:true */
+        }
+
+    }());
+    </script>
+    {% endif %}
+{% endblock %}
diff --git a/src/Service/Exception/AltaPayException.php b/src/Service/Exception/AltaPayException.php
new file mode 100644
index 0000000..08b3c31
--- /dev/null
+++ b/src/Service/Exception/AltaPayException.php
@@ -0,0 +1,7 @@
+<?php declare(strict_types=1);
+
+namespace Wexo\AltaPay\Service\Exception;
+
+class AltaPayException extends \RuntimeException
+{
+}
diff --git a/src/Service/PaymentService.php b/src/Service/PaymentService.php
index 09e1b7f..5023e51 100644
--- a/src/Service/PaymentService.php
+++ b/src/Service/PaymentService.php
@@ -16,6 +16,7 @@
 use Shopware\Core\Checkout\Order\OrderEntity;
 use Shopware\Core\Checkout\Payment\PaymentException;
 use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository;
+use Wexo\AltaPay\Service\Exception\AltaPayException;
 use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria;
 use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\EqualsFilter;
 use Shopware\Core\System\Language\LanguageEntity;
@@ -60,6 +61,10 @@ class PaymentService extends AbstractPaymentHandler
     public const ALTAPAY_IP_ADDRESS_SET = ["185.206.120.0/24", "2a10:a200::/29", '185.203.232.129', '185.203.233.129']; //NOSONAR
     public const ALTAPAY_ORDER_STATUS = "altaPayOrderStatus";
     public const ALTAPAY_SALES_CHANNEL_TERMINAL_ID = "altapaySalesChannelTerminalId";
+    public const ALTAPAY_IS_APPLE_PAY_CUSTOM_FIELD = "wexoAltaPayIsApplePay";
+    public const ALTAPAY_APPLE_PAY_NETWORKS_CUSTOM_FIELD = "wexoAltaPayApplePayNetworks";
+    public const ALTAPAY_APPLE_PAY_SESSION_PREFIX = "altapay_apple_pay_checkout_";
+    public const ALTAPAY_APPLE_PAY_RESULT_PREFIX = "altapay_apple_pay_data_";
 
     public function __construct(
         protected readonly SystemConfigService $systemConfigService,
@@ -123,7 +128,7 @@ private function loadOrderTransactionAndOrder(PaymentTransactionStruct $transact
             ->get($orderTransactionId);
 
         if (!$orderTransaction) {
-            throw new \RuntimeException("OrderTransaction not found.");
+            throw new AltaPayException("OrderTransaction not found.");
         }
 
         $orderId = $orderTransaction->getOrderId();
@@ -141,7 +146,7 @@ private function loadOrderTransactionAndOrder(PaymentTransactionStruct $transact
         $order = $this->orderRepository->search($criteria, $context)->first();
 
         if (!$order) {
-            throw new \RuntimeException("Order not found.");
+            throw new AltaPayException("Order not found.");
         }
 
         $billingAddress = $order->getBillingAddress();
@@ -234,6 +239,20 @@ public function pay(
         }
 
         $paymentRequestType = ($paymentMethod->getTranslated()['customFields'][self::ALTAPAY_AUTO_CAPTURE_CUSTOM_FIELD] ?? null) ? 'paymentAndCapture' : 'payment';
+
+        $isApplePay = (bool)($paymentMethod->getTranslated()['customFields'][self::ALTAPAY_IS_APPLE_PAY_CUSTOM_FIELD] ?? false);
+        if ($isApplePay) {
+            $applePayCheckoutUrl = $this->router->generate(
+                'altapay.applepay.checkout',
+                [
+                    'orderTransactionId' => $orderTransactionId,
+                    'returnUrl'          => $transaction->getReturnUrl(),
+                ],
+                UrlGeneratorInterface::ABSOLUTE_URL
+            );
+            return new RedirectResponse($applePayCheckoutUrl);
+        }
+
         try {
             $altaPayResponse = $this->createPaymentRequest(
                 $order,
@@ -376,8 +395,26 @@ public function finalize(
         );
 
         $allRequestParams = array_merge($request->query->all(), $request->request->all());
+        $xmlString        = $request->get('xml');
+
+        // For Apple Pay payments the XML result is stored in the session
+        if (empty($xmlString)) {
+            $sessionKey = self::ALTAPAY_APPLE_PAY_RESULT_PREFIX . $transaction->getOrderTransactionId();
+            try {
+                $session    = $this->requestStack->getSession();
+                $storedData = $session->get($sessionKey);
+                if ($storedData) {
+                    $xmlString        = $storedData['xml'];
+                    $allRequestParams = array_merge($allRequestParams, $storedData['params'] ?? []);
+                    $session->remove($sessionKey);
+                }
+            } catch (\Exception $e) {
+                $this->logger->warning('Apple Pay: failed to restore stored payment result from session: ' . $e->getMessage());
+            }
+        }
+
         $this->transactionCallback(
-            new SimpleXMLElement($request->get('xml')),
+            new SimpleXMLElement($xmlString),
             $order,
             $orderTransaction,
             $salesChannelContext,
@@ -655,7 +692,8 @@ public function createPaymentRequest(
         SalesChannelContext $context,
         string      $terminal,
         string $paymentRequestType,
-        string $sessionId = null
+        string $sessionId = null,
+        string $providerData = null
     ): SimpleXMLElement {
         $orderLines = [];
         $itemIdCounter = 0;
@@ -831,6 +869,10 @@ public function createPaymentRequest(
             $formParams['session_id'] = $sessionId;
         }
 
+        if ($providerData !== null) {
+            $formParams['provider_data'] = $providerData;
+        }
+
         $checkoutStyle = $this->systemConfigService->get('WexoAltaPay.config.checkoutStyle', $salesChannelId);
         if (!empty($checkoutStyle)) {
           $formParams['form_template'] = $checkoutStyle;
@@ -843,8 +885,222 @@ public function createPaymentRequest(
         return new SimpleXMLElement($response->getBody()->getContents());
     }
 
-    public function getTransaction(OrderEntity $order, string $salesChannelId): ResponseInterface
+    /**
+     * Load Apple Pay config (terminal, label, networks) from a payment method ID directly.
+     *
+     * @throws \RuntimeException
+     */
+    public function getApplePayConfigByPaymentMethodId(
+        string $paymentMethodId,
+        Context $context,
+        string $salesChannelId
+    ): array {
+        $criteria      = new Criteria([$paymentMethodId]);
+        $paymentMethod = $this->container->get('payment_method.repository')
+            ->search($criteria, $context)
+            ->first();
+
+        if (!$paymentMethod) {
+            throw new AltaPayException('Payment method not found: ' . $paymentMethodId);
+        }
+
+        $customFields = $paymentMethod->getTranslated()['customFields'] ?? [];
+
+        if (empty($customFields[self::ALTAPAY_IS_APPLE_PAY_CUSTOM_FIELD])) {
+            throw new AltaPayException('Payment method is not an Apple Pay terminal: ' . $paymentMethodId);
+        }
+
+        $terminal             = $customFields[self::ALTAPAY_TERMINAL_ID_CUSTOM_FIELD] ?? null;
+        $salesChannelTerminal = $customFields[self::ALTAPAY_SALES_CHANNEL_TERMINAL_ID] ?? null;
+
+        if (!empty($salesChannelTerminal)) {
+            $field                     = 'WexoAltaPay.config.' . $salesChannelTerminal;
+            $salesChannelTerminalValue = $this->systemConfigService->get($field, $salesChannelId);
+            if (!empty($salesChannelTerminalValue)) {
+                $terminal = $salesChannelTerminalValue;
+            }
+        }
+
+        if (empty($terminal)) {
+            throw new AltaPayException(
+                'Apple Pay terminal is not configured. Please set the AltaPay Terminal ID on the payment method "'
+                . ($paymentMethod->getName() ?? $paymentMethodId) . '" in the Shopware admin.'
+            );
+        }
+
+        return [
+            'terminal'      => $terminal,
+            'applePayLabel' => (string)($paymentMethod->getTranslated()['name'] ?? $paymentMethod->getName() ?? 'Payment'),
+            'networks'      => array_values(array_filter(array_map('trim',
+                explode(',', $customFields[self::ALTAPAY_APPLE_PAY_NETWORKS_CUSTOM_FIELD] ?? 'visa,masterCard,amex')
+            ))),
+        ];
+    }
+
+    /**
+     * Load all Apple Pay configuration needed for the checkout page, merchant validation,
+     * and payment authorisation. Reads fresh from the DB — no session dependency.
+     *
+     * @throws \RuntimeException
+     */
+    public function getApplePayConfig(string $orderTransactionId, Context $context): array
     {
+        $criteria = new Criteria([$orderTransactionId]);
+        $orderTransaction = $this->orderTransactionRepository->search($criteria, $context)->get($orderTransactionId);
+
+        if (!$orderTransaction) {
+            throw new AltaPayException('OrderTransaction not found: ' . $orderTransactionId);
+        }
+
+        $orderId  = $orderTransaction->getOrderId();
+        $criteria = new Criteria([$orderId]);
+        $criteria->addAssociation('currency');
+        $criteria->addAssociation('billingAddress.country');
+        $criteria->addAssociation('salesChannel');
+
+        $order = $this->orderRepository->search($criteria, $context)->first();
+        if (!$order) {
+            throw new AltaPayException('Order not found for transaction: ' . $orderTransactionId);
+        }
+
+        $pmCriteria    = new Criteria([$orderTransaction->getPaymentMethodId()]);
+        $paymentMethod = $this->container->get('payment_method.repository')
+            ->search($pmCriteria, $context)
+            ->first();
+
+        $customFields = ($paymentMethod ? $paymentMethod->getTranslated()['customFields'] : null) ?? [];
+
+        $terminal             = $customFields[self::ALTAPAY_TERMINAL_ID_CUSTOM_FIELD] ?? null;
+        $salesChannelTerminal = $customFields[self::ALTAPAY_SALES_CHANNEL_TERMINAL_ID] ?? null;
+
+        if (!empty($salesChannelTerminal)) {
+            $field                     = 'WexoAltaPay.config.' . $salesChannelTerminal;
+            $salesChannelTerminalValue = $this->systemConfigService->get($field, $order->getSalesChannelId());
+            if (!empty($salesChannelTerminalValue)) {
+                $terminal = $salesChannelTerminalValue;
+            }
+        }
+
+        $paymentMethodName = $paymentMethod
+            ? ($paymentMethod->getTranslated()['name'] ?? $paymentMethod->getName())
+            : null;
+        $applePayLabel     = (string)$paymentMethodName ?: $order->getSalesChannel()?->getName() ?: 'Payment';
+        $networksRaw        = (string)($customFields[self::ALTAPAY_APPLE_PAY_NETWORKS_CUSTOM_FIELD] ?? 'visa,masterCard,amex');
+        $networks           = array_values(array_filter(array_map('trim', explode(',', $networksRaw))));
+        $paymentRequestType = ($customFields[self::ALTAPAY_AUTO_CAPTURE_CUSTOM_FIELD] ?? false) ? 'paymentAndCapture' : 'payment';
+
+        return [
+            'orderTransactionId' => $orderTransactionId,
+            'orderId'            => $order->getId(),
+            'terminal'           => $terminal,
+            'paymentRequestType' => $paymentRequestType,
+            'amount'             => (string)round($order->getAmountTotal(), 2),
+            'currency'           => $order->getCurrency()->getIsoCode(),
+            'countryCode'        => $order->getBillingAddress()?->getCountry()?->getIso() ?? 'US',
+            'salesChannelId'     => $order->getSalesChannelId(),
+            'applePayLabel'      => $applePayLabel,
+            'supportedNetworks'  => $networks,
+        ];
+    }
+
+    /**
+     * Validate an Apple Pay merchant session via AltaPay's cardWalletSession API.
+     *
+     * @see https://documentation.altapay.com/Content/Ecom/API/API%20Methods/cardWalletSession.htm
+     * @throws GuzzleException
+     */
+    public function cardWalletSession(
+        string $validationUrl,
+        string $terminal,
+        string $domain,
+        string $salesChannelId
+    ): string {
+        $response = $this->getAltaPayClient($salesChannelId)->request('POST', 'cardWallet/session', [
+            'form_params' => [
+                'terminal'      => $terminal,
+                'validationUrl' => $validationUrl,
+                'domain'        => $domain,
+            ]
+        ]);
+
+        $xml = new SimpleXMLElement($response->getBody()->getContents());
+
+        if ((string)$xml->Body->Result !== 'Success') {
+            throw new AltaPayException(
+                'Apple Pay merchant validation failed: '
+                . ((string)($xml->Body->MerchantErrorMessage ?? $xml->Header->ErrorMessage ?? 'Unknown error'))
+            );
+        }
+
+        return (string)$xml->Body->ApplePaySession;
+    }
+
+    /**
+     * Process an Apple Pay payment token via AltaPay's createPaymentRequest with provider_data.
+     *
+     * @throws GuzzleException|\RuntimeException
+     * @return string The returnUrl that the browser should navigate to (Shopware's finalize URL).
+     */
+    public function processApplePayPayment(
+        string $orderTransactionId,
+        string $providerData,
+        string $returnUrl,
+        Context $context
+    ): string {
+        $config = $this->getApplePayConfig($orderTransactionId, $context);
+
+        $criteria = new Criteria([$config['orderId']]);
+        $criteria->addAssociation('currency');
+        $order = $this->orderRepository->search($criteria, $context)->first();
+        if (!$order) {
+            throw new AltaPayException('Order not found.');
+        }
+
+        $amount      = number_format((float)$order->getAmountTotal(), 2, '.', '');
+        $currency    = $order->getCurrency()?->getIsoCode() ?? 'EUR';
+        $shopOrderId = $order->getOrderNumber();
+
+        // --- Call AltaPay cardWallet/authorize ---
+        $response = $this->getAltaPayClient($config['salesChannelId'])->request('POST', 'cardWallet/authorize', [
+            'form_params' => [
+                'provider_data' => $providerData,
+                'terminal'      => $config['terminal'],
+                'shop_orderid'  => $shopOrderId,
+                'amount'        => $amount,
+                'currency'      => $currency,
+            ]
+        ]);
+
+        $altaPayResponse = new SimpleXMLElement($response->getBody()->getContents());
+
+        $result = strtolower((string)($altaPayResponse->Body?->Result ?? ''));
+        if (!in_array($result, ['success', 'open'], true)) {
+            throw new AltaPayException(
+                'AltaPay Apple Pay payment failed: '
+                . ((string)($altaPayResponse->Body?->MerchantErrorMessage ?? $altaPayResponse->Header?->ErrorMessage ?? 'Unknown error'))
+            );
+        }
+
+        // --- Store XML result in session so finalize() can read it ---
+        $xmlString = $altaPayResponse->asXML();
+        $resultKey = self::ALTAPAY_APPLE_PAY_RESULT_PREFIX . $orderTransactionId;
+        try {
+            $session = $this->requestStack->getSession();
+            $session->set($resultKey, [
+                'xml'    => $xmlString,
+                'params' => [
+                    'type'            => $config['paymentRequestType'] ?? 'payment',
+                    'require_capture' => 'false',
+                ],
+            ]);
+        } catch (\Exception $e) {
+            $this->logger->warning('Apple Pay: could not store payment result in session: ' . $e->getMessage());
+        }
+
+        return $returnUrl;
+    }
+
+    public function getTransaction(OrderEntity $order, string $salesChannelId): ResponseInterface    {
         return $this->getAltaPayClient($salesChannelId)->request('GET', 'payments', [
             'query' => [
                 'transaction_id' => $order->getCustomFields()[self::ALTAPAY_TRANSACTION_ID_CUSTOM_FIELD],
diff --git a/src/Service/Setup/CustomFieldSetupService.php b/src/Service/Setup/CustomFieldSetupService.php
index e9762e6..4bb572f 100644
--- a/src/Service/Setup/CustomFieldSetupService.php
+++ b/src/Service/Setup/CustomFieldSetupService.php
@@ -186,37 +186,46 @@ private function createPaymentMethodCustomField(Context $context): void
             context: $context
         );
 
-        $terminals = [];
-        $languages = ['de-DE', 'en-GB', 'da-DK'];
-
-        // Add default empty option
-        $terminals[] = [
-            'label' => [
-                'de-DE' => 'Wählen Sie ein Terminal aus',
-                'en-GB' => 'Select a terminal',
-                'da-DK' => 'Vælg en terminal',
+        $this->addCustomField(
+            name: PaymentService::ALTAPAY_IS_APPLE_PAY_CUSTOM_FIELD,
+            type: CustomFieldTypes::SWITCH,
+            config: [
+                'label' => [
+                    'de-DE' => 'Ist Apple Pay',
+                    'en-GB' => 'Is Apple Pay',
+                    'da-DK' => 'Er Apple Pay',
+                ],
+                'customFieldPosition' => 4,
+                'defaultValue' => false,
             ],
-            'value' => '',
-        ];
-
-        for ($i = 1; $i <= 10; $i++) {
-            $label = [];
-
-            foreach ($languages as $lang) {
-                $label[$lang] = 'terminal ' . $i;
-            }
+            customFieldSetId: $fieldSetId,
+            context: $context
+        );
 
-            $terminals[] = [
-                'label' => $label,
-                'value' => 'terminal' . $i,
-            ];
-        }
+        $this->addCustomField(
+            name: PaymentService::ALTAPAY_APPLE_PAY_NETWORKS_CUSTOM_FIELD,
+            type: CustomFieldTypes::TEXT,
+            config: [
+                'label' => [
+                    'de-DE' => 'Apple Pay unterstützte Netzwerke',
+                    'en-GB' => 'Apple Pay Supported Networks',
+                    'da-DK' => 'Apple Pay understøttede netværk',
+                ],
+                'helpText' => [
+                    'en-GB' => 'Comma-separated list of supported networks, e.g.: visa,masterCard,amex',
+                ],
+                'customFieldPosition' => 6,
+                'defaultValue' => 'visa,masterCard,amex,discover',
+            ],
+            customFieldSetId: $fieldSetId,
+            context: $context
+        );
 
         $this->addCustomField(
             name: PaymentService::ALTAPAY_SALES_CHANNEL_TERMINAL_ID,
             type: CustomFieldTypes::SELECT,
             config: [
-                'customFieldPosition' => 4,
+                'customFieldPosition' => 7,
                 'componentName' => 'sw-single-select',
                 'customFieldType' => 'select',
                 'label' => [
@@ -234,12 +243,46 @@ private function createPaymentMethodCustomField(Context $context): void
                     'en-GB' => 'Select the terminal configuration for the sales channel. If left empty, the default terminal ID from the payment method will be used.',
                     'da-DK' => 'Vælg terminal-konfigurationen for salgskanalen. Hvis den efterlades tom, vil standard terminal-ID fra betalingsmetoden blive brugt.',
                 ],
-                'options' => $terminals,
+                'options' => $this->buildTerminalOptions(),
             ],
             customFieldSetId: $fieldSetId,
             context: $context
         );
+    }
+
+    /**
+     * @return array<int, array{label: array<string,string>, value: string}>
+     */
+    private function buildTerminalOptions(): array
+    {
+        $languages = ['de-DE', 'en-GB', 'da-DK'];
+
+        // Add default empty option
+        $terminals = [
+            [
+                'label' => [
+                    'de-DE' => 'Wählen Sie ein Terminal aus',
+                    'en-GB' => 'Select a terminal',
+                    'da-DK' => 'Vælg en terminal',
+                ],
+                'value' => '',
+            ],
+        ];
+
+        for ($i = 1; $i <= 10; $i++) {
+            $label = [];
+
+            foreach ($languages as $lang) {
+                $label[$lang] = 'terminal ' . $i;
+            }
+
+            $terminals[] = [
+                'label' => $label,
+                'value' => 'terminal' . $i,
+            ];
+        }
 
+        return $terminals;
     }
 
     private function addCustomField(
diff --git a/src/Subscriber/ApplePayAvailabilitySubscriber.php b/src/Subscriber/ApplePayAvailabilitySubscriber.php
new file mode 100644
index 0000000..435c258
--- /dev/null
+++ b/src/Subscriber/ApplePayAvailabilitySubscriber.php
@@ -0,0 +1,52 @@
+<?php declare(strict_types=1);
+
+namespace Wexo\AltaPay\Subscriber;
+
+use Shopware\Core\Checkout\Payment\SalesChannel\PaymentMethodRouteResponse;
+use Shopware\Core\Framework\DataAbstractionLayer\Search\EntitySearchResult;
+use Shopware\Storefront\Page\Checkout\Confirm\CheckoutConfirmPageLoadedEvent;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Wexo\AltaPay\Service\PaymentService;
+
+/**
+ * Hides Apple Pay payment methods from the checkout confirm page when
+ * the browser is not Safari (Apple Pay is only available in Safari).
+ */
+class ApplePayAvailabilitySubscriber implements EventSubscriberInterface
+{
+    public function __construct(
+        private readonly RequestStack $requestStack
+    ) {
+    }
+
+    public static function getSubscribedEvents(): array
+    {
+        return [
+            CheckoutConfirmPageLoadedEvent::class => 'hideApplePayForNonSafari',
+        ];
+    }
+
+    public function hideApplePayForNonSafari(CheckoutConfirmPageLoadedEvent $event): void
+    {
+        $request   = $this->requestStack->getCurrentRequest();
+        $userAgent = $request ? $request->headers->get('User-Agent', '') : '';
+
+        /* Same regex as AltaPay Magento2 plugin: exclude Chrome and Android browsers */
+        if (preg_match('/^((?!chrome|android).)*safari/i', $userAgent)) {
+            return;
+        }
+
+        $paymentMethods = $event->getPage()->getPaymentMethods();
+        if (!$paymentMethods) {
+            return;
+        }
+
+        $filtered = $paymentMethods->filter(function ($method) {
+            $customFields = $method->getTranslated()['customFields'] ?? $method->getCustomFields() ?? [];
+            return empty($customFields[PaymentService::ALTAPAY_IS_APPLE_PAY_CUSTOM_FIELD]);
+        });
+
+        $event->getPage()->setPaymentMethods($filtered);
+    }
+}
diff --git a/src/WexoAltaPay.php b/src/WexoAltaPay.php
index 97bef51..caa8be0 100644
--- a/src/WexoAltaPay.php
+++ b/src/WexoAltaPay.php
@@ -21,7 +21,7 @@ class WexoAltaPay extends Plugin
     public const ALTAPAY_FIELD_SET_NAME = "wexoAltaPay";
     public const ALTAPAY_PAYMENT_METHOD_FIELD_SET_NAME = "wexoAltaPayPaymentMethod";
     public const ALTAPAY_CART_TOKEN = "wexoAltaPayCartToken";
-    public const ALTAPAY_PLUGIN_VERSION = '2.1.0';
+    public const ALTAPAY_PLUGIN_VERSION = '2.2.0';
     public const ALTAPAY_PLUGIN_NAME = 'WexoAltaPay';
 
     public function update(UpdateContext $updateContext): void
diff --git a/wiki.md b/wiki.md
index d6c491d..50905ee 100644
--- a/wiki.md
+++ b/wiki.md
@@ -106,23 +106,27 @@ be provided by AltaPay.
 7. Click the **Save** button.
 
 8. Once saved, a new section, **Custom fields**, will appear with the options **AltaPay Terminal ID**(where you must enter the terminal name from AltaPay), **Auto Capture**, and **Surcharge**.
+
+9. Enable this option when the payment method is for Apple Pay. This marks the terminal as an Apple Pay payment option.
+
+10. Enter the card networks supported for Apple Pay, separated by commas, for example: amex,visa,mastercard. This defines which card networks are allowed for Apple Pay payments.
     ![shopware_configure_altapay_terminal_detail](Docs/Configuration/shopware_configure_altapay_terminal_detail.png)
 
-9. Select a sales channel-specific terminal configuration. If left empty, the default terminal ID (from the field above) will be used.
+11. Select a sales channel-specific terminal configuration. If left empty, the default terminal ID (from the field above) will be used.
 
-10. Click the **Save** button again.
+12. Click the **Save** button again.
 
-11. Now click on your desired shop from the **Sales Channels** menu on the left.
+13. Now click on your desired shop from the **Sales Channels** menu on the left.
  
-12. In the **General** tab, scroll down to the **Payment and shipping** section & search by name for the payment method you just created.
+14. In the **General** tab, scroll down to the **Payment and shipping** section & search by name for the payment method you just created.
 
     ![shopware_show_payment_method_on_checkout.png](Docs/Configuration/shopware_show_payment_method_on_checkout.png)
 
-13. Choose the payment method and click Save button in the top-right corner.
+15. Choose the payment method and click Save button in the top-right corner.
 
     ![shopware_verify_payment_method.png](Docs/Configuration/shopware_verify_payment_method.png)
 
-14. Once the payment methods are configured, you will be ready to process transactions through AltaPay.
+16. Once the payment methods are configured, you will be ready to process transactions through AltaPay.
 
     ![shopware_checkout_page.png](Docs/Configuration/shopware_checkout_page.png)