diff --git a/.github/docker-compose.e2e.yml b/.github/docker-compose.e2e.yml
index d9cea1b6ec..10893da3a4 100644
--- a/.github/docker-compose.e2e.yml
+++ b/.github/docker-compose.e2e.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
   playwright:
-    image: mcr.microsoft.com/playwright:v1.47.2
+    image: mcr.microsoft.com/playwright:v1.49.1
     shm_size: 1gb
     ipc: host
     cap_add:
diff --git a/Gateway/Http/Client/TransactionRefund.php b/Gateway/Http/Client/TransactionRefund.php
index 3484c030d0..238f18fb79 100644
--- a/Gateway/Http/Client/TransactionRefund.php
+++ b/Gateway/Http/Client/TransactionRefund.php
@@ -88,6 +88,8 @@ public function placeRequest(TransferInterface $transferObject): array
                 $this->adyenHelper->logResponse($responseData);
             } catch (AdyenException $e) {
                 $this->adyenHelper->logAdyenException($e);
+                $responseData['error'] = $e->getMessage();
+                $responseData['errorCode'] = $e->getAdyenErrorCode();
             }
             $responses[] = $responseData;
         }
diff --git a/Gateway/Request/AdditionalDataLevel23DataBuilder.php b/Gateway/Request/AdditionalDataLevel23DataBuilder.php
index c07d049e18..0ed6a23059 100644
--- a/Gateway/Request/AdditionalDataLevel23DataBuilder.php
+++ b/Gateway/Request/AdditionalDataLevel23DataBuilder.php
@@ -3,7 +3,7 @@
  *
  * Adyen Payment Module
  *
- * Copyright (c) 2022 Adyen N.V.
+ * Copyright (c) 2024 Adyen N.V.
  * This file is open source and available under the MIT license.
  * See the LICENSE file for more info.
  *
@@ -16,90 +16,145 @@
 use Adyen\Payment\Helper\Config;
 use Adyen\Payment\Helper\Data;
 use Adyen\Payment\Helper\Requests;
+use Adyen\Payment\Logger\AdyenLogger;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Payment\Gateway\Helper\SubjectReader;
 use Magento\Payment\Gateway\Request\BuilderInterface;
+use Magento\Sales\Api\Data\OrderItemInterface;
 use Magento\Sales\Model\Order;
-use Magento\Sales\Model\Order\Item;
 use Magento\Store\Model\StoreManagerInterface;
 
 class AdditionalDataLevel23DataBuilder implements BuilderInterface
 {
+    const ENHANCED_SCHEME_DATA_PREFIX = 'enhancedSchemeData';
+    const ITEM_DETAIL_LINE_PREFIX = 'itemDetailLine';
+    const UNIT_OF_MEASURE_PCS = 'pcs';
+
     /**
-     * @var Config
-     */
-    private $config;
-    /**
-     * @var StoreManagerInterface
-     */
-    private $storeManager;
-    /**
-     * @var Data
-     */
-    private $adyenHelper;
-    /**
-     * @var ChargedCurrency
+     * @param Config $config
+     * @param StoreManagerInterface $storeManager
+     * @param ChargedCurrency $chargedCurrency
+     * @param Requests $adyenRequestHelper
+     * @param Data $adyenHelper
+     * @param AdyenLogger $adyenLogger
      */
-    private $chargedCurrency;
+    public function __construct(
+        public Config $config,
+        public StoreManagerInterface $storeManager,
+        public ChargedCurrency $chargedCurrency,
+        public Requests $adyenRequestHelper,
+        public Data $adyenHelper,
+        public AdyenLogger $adyenLogger
+    ) { }
+
     /**
-     * @var Requests
+     * This data builder creates `additionalData` object for Level 2/3 enhanced scheme data.
+     * For more information refer to https://docs.adyen.com/payment-methods/cards/enhanced-scheme-data/l2-l3
+     *
+     * @param array $buildSubject
+     * @return array|array[]
+     * @throws NoSuchEntityException
      */
-    private $adyenRequestHelper;
-
-    public function __construct(
-        Config $config,
-        StoreManagerInterface $storeManager,
-        ChargedCurrency $chargedCurrency,
-        Requests $adyenRequestHelper,
-        Data $adyenHelper
-    )
+    public function build(array $buildSubject): array
     {
-        $this->config = $config;
-        $this->storeManager = $storeManager;
-        $this->adyenHelper = $adyenHelper;
-        $this->chargedCurrency = $chargedCurrency;
-        $this->adyenRequestHelper = $adyenRequestHelper;
-    }
+        $request = [];
 
-    public function build(array $buildSubject)
-    {
-        $requestBody = [];
         if ($this->config->sendLevel23AdditionalData($this->storeManager->getStore()->getId())) {
             $paymentDataObject = SubjectReader::readPayment($buildSubject);
             $payment = $paymentDataObject->getPayment();
+
             /** @var Order $order */
             $order = $payment->getOrder();
             $currencyCode = $this->chargedCurrency->getOrderAmountCurrency($order)->getCurrencyCode();
 
-            $prefix = 'enhancedSchemeData';
-            $requestBody['additionalData'][$prefix . '.totalTaxAmount'] = $this->adyenHelper->formatAmount($order->getTaxAmount(), $currencyCode);
-            $requestBody['additionalData'][$prefix . '.customerReference'] = $this->adyenRequestHelper->getShopperReference($order->getCustomerId(), $order->getIncrementId());
+            // `totalTaxAmount` field is required and L2/L3 data can not be generated without this field.
+            if (empty($order->getTaxAmount()) || $order->getTaxAmount() < 0 || $order->getTaxAmount() === 0) {
+                $this->adyenLogger->warning(__('L2/L3 data can not be generated if tax amount is zero.'));
+                return $request;
+            }
+
+            $additionalDataLevel23 = [
+                self::ENHANCED_SCHEME_DATA_PREFIX . '.orderDate' => date('dmy', time()),
+                self::ENHANCED_SCHEME_DATA_PREFIX . '.customerReference' =>
+                    $this->adyenRequestHelper->getShopperReference($order->getCustomerId(), $order->getIncrementId()),
+                self::ENHANCED_SCHEME_DATA_PREFIX . '.totalTaxAmount' =>
+                    (string) $this->adyenHelper->formatAmount($order->getTaxAmount(), $currencyCode)
+            ];
+
             if ($order->getIsNotVirtual()) {
-                $requestBody['additionalData'][$prefix . '.freightAmount'] = $this->adyenHelper->formatAmount($order->getBaseShippingAmount(), $currencyCode);
-                $requestBody['additionalData'][$prefix . '.destinationPostalCode'] = $order->getShippingAddress()->getPostcode();
-                $requestBody['additionalData'][$prefix . '.destinationCountryCode'] = $order->getShippingAddress()->getCountryId();
+                $additionalDataLevel23[self::ENHANCED_SCHEME_DATA_PREFIX . '.freightAmount'] =
+                    (string) $this->adyenHelper->formatAmount($order->getBaseShippingAmount(), $currencyCode);
+
+                $additionalDataLevel23[self::ENHANCED_SCHEME_DATA_PREFIX . '.destinationPostalCode'] =
+                    $order->getShippingAddress()->getPostcode();
+
+                $additionalDataLevel23[self::ENHANCED_SCHEME_DATA_PREFIX . '.destinationCountryCode'] =
+                    $order->getShippingAddress()->getCountryId();
+
+                if (!empty($order->getShippingAddress()->getRegionCode())) {
+                    $additionalDataLevel23[self::ENHANCED_SCHEME_DATA_PREFIX . '.destinationStateProvinceCode'] =
+                        $order->getShippingAddress()->getRegionCode();
+                }
             }
 
-            $itemIndex = 0;
+            $itemIndex = 1;
             foreach ($order->getItems() as $item) {
-                /** @var Item $item */
-                if ($item->getPrice() == 0 && !empty($item->getParentItem())) {
-                    // Products variants get added to the order as separate items, filter out the variants.
+                if (!$this->validateLineItem($item)) {
                     continue;
                 }
 
-                $itemPrefix = $prefix . '.itemDetailLine';
-                $requestBody['additionalData'][$itemPrefix . $itemIndex . '.description'] = $item->getName();
-                $requestBody['additionalData'][$itemPrefix . $itemIndex . '.unitPrice'] = $this->adyenHelper->formatAmount($item->getPrice(), $currencyCode);
-                $requestBody['additionalData'][$itemPrefix . $itemIndex . '.discountAmount'] = $this->adyenHelper->formatAmount($item->getDiscountAmount(), $currencyCode);
-                $requestBody['additionalData'][$itemPrefix . $itemIndex . '.commodityCode'] = $item->getQuoteItemId();
-                $requestBody['additionalData'][$itemPrefix . $itemIndex . '.quantity'] = $item->getQtyOrdered();
-                $requestBody['additionalData'][$itemPrefix . $itemIndex . '.productCode'] = $item->getSku();
-                $requestBody['additionalData'][$itemPrefix . $itemIndex . '.totalAmount'] = $this->adyenHelper->formatAmount($item->getRowTotal(), $currencyCode);
+                $itemPrefix = self::ENHANCED_SCHEME_DATA_PREFIX . '.' . self::ITEM_DETAIL_LINE_PREFIX;
+
+                $additionalDataLevel23[$itemPrefix . $itemIndex . '.description'] = $item->getName();
+                $additionalDataLevel23[$itemPrefix . $itemIndex . '.discountAmount'] =
+                    (string) $this->adyenHelper->formatAmount($item->getDiscountAmount(), $currencyCode);
+                $additionalDataLevel23[$itemPrefix . $itemIndex . '.commodityCode'] = (string) $item->getQuoteItemId();
+                $additionalDataLevel23[$itemPrefix . $itemIndex . '.productCode'] = $item->getSku();
+                $additionalDataLevel23[$itemPrefix . $itemIndex . '.unitOfMeasure'] = self::UNIT_OF_MEASURE_PCS;
+                $additionalDataLevel23[$itemPrefix . $itemIndex . '.quantity'] = (string) $item->getQtyOrdered();
+                $additionalDataLevel23[$itemPrefix . $itemIndex . '.unitPrice'] =
+                    (string) $this->adyenHelper->formatAmount($item->getPrice(), $currencyCode);
+                $additionalDataLevel23[$itemPrefix . $itemIndex . '.totalAmount'] =
+                    (string) $this->adyenHelper->formatAmount($item->getRowTotal(), $currencyCode);
 
                 $itemIndex++;
             }
+
+            $request = [
+                'body' => [
+                    'additionalData' => $additionalDataLevel23
+                ]
+            ];
+        }
+
+        return $request;
+    }
+
+    /**
+     * Required fields `unitPrice`, `totalAmount` or `quantity` can not be null or zero in the line items.
+     *
+     * @param OrderItemInterface $orderItem
+     * @return bool
+     */
+    private function validateLineItem(OrderItemInterface $orderItem): bool
+    {
+        $validationResult = true;
+
+        // `unitPrice` should be a non-zero numeric value.
+        if ($orderItem->getPrice() === 0) {
+            $validationResult = false;
+        }
+
+        // `totalAmount` should be a non-zero numeric value.
+        if ($orderItem->getRowTotal() === 0) {
+            $validationResult = false;
+        }
+
+        // `quantity` should be a positive integer. If not, skip the line item.
+        if ($orderItem->getQtyOrdered() < 1) {
+            $validationResult = false;
         }
 
-        return ['body' => $requestBody];
+        return $validationResult;
     }
 }
diff --git a/Gateway/Request/DescriptionDataBuilder.php b/Gateway/Request/DescriptionDataBuilder.php
index 0bd7c12a26..3bd2c252e9 100644
--- a/Gateway/Request/DescriptionDataBuilder.php
+++ b/Gateway/Request/DescriptionDataBuilder.php
@@ -34,7 +34,7 @@ public function build(array $buildSubject)
             'Order %1 from %2',
             $order->getIncrementId(),
             $order->getStore()->getGroup()->getName()
-        );
+        )->render();
 
         return $request;
     }
diff --git a/Model/Sales/OrderRepository.php b/Model/Sales/OrderRepository.php
index d51680b268..0919294075 100644
--- a/Model/Sales/OrderRepository.php
+++ b/Model/Sales/OrderRepository.php
@@ -16,6 +16,7 @@
 use Magento\Framework\Api\Search\FilterGroupBuilder;
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
 use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\Api\SortOrderBuilder;
 use Magento\Framework\Serialize\Serializer\Json as JsonSerializer;
 use Magento\Payment\Api\Data\PaymentAdditionalInfoInterfaceFactory;
 use Magento\Sales\Api\Data\OrderExtensionFactory;
@@ -28,6 +29,7 @@
 class OrderRepository extends SalesOrderRepository
 {
     private SearchCriteriaBuilder $searchCriteriaBuilder;
+    private SortOrderBuilder $sortOrderBuilder;
     private FilterBuilder $filterBuilder;
     private FilterGroupBuilder $filterGroupBuilder;
 
@@ -35,6 +37,7 @@ public function __construct(
         SearchCriteriaBuilder $searchCriteriaBuilder,
         FilterBuilder $filterBuilder,
         FilterGroupBuilder $filterGroupBuilder,
+        SortOrderBuilder $sortOrderBuilder,
         Metadata $metadata,
         SearchResultFactory $searchResultFactory,
         CollectionProcessorInterface $collectionProcessor = null,
@@ -56,6 +59,7 @@ public function __construct(
         );
 
         $this->searchCriteriaBuilder = $searchCriteriaBuilder;
+        $this->sortOrderBuilder = $sortOrderBuilder;
         $this->filterBuilder = $filterBuilder;
         $this->filterGroupBuilder = $filterGroupBuilder;
     }
@@ -68,9 +72,14 @@ public function getOrderByQuoteId(int $quoteId): OrderInterface|false
             ->create();
 
         $quoteIdFilterGroup = $this->filterGroupBuilder->setFilters([$quoteIdFilter])->create();
+        $sortOrder = $this->sortOrderBuilder->setField('entity_id')
+            ->setDescendingDirection()
+            ->create();
 
         $searchCriteria = $this->searchCriteriaBuilder
             ->setFilterGroups([$quoteIdFilterGroup])
+            ->setSortOrders([$sortOrder])
+            ->setPageSize(1)
             ->create();
 
         $orders = $this->getList($searchCriteria)->getItems();
diff --git a/Plugin/GraphQlPlaceOrderAddCartId.php b/Plugin/GraphQlPlaceOrderAddCartId.php
index ee360eb04f..bf88af05b8 100644
--- a/Plugin/GraphQlPlaceOrderAddCartId.php
+++ b/Plugin/GraphQlPlaceOrderAddCartId.php
@@ -59,6 +59,10 @@ public function __construct(
      */
     public function afterResolve(PlaceOrder $placeOrder, array $result): array
     {
+        if (!isset($result['order'])) {
+            return $result;
+        }
+
         try {
             $cart = $this->quoteHelper->getQuoteByOrderIncrementId($result['order']['order_number']);
             $maskedId = $this->quoteIdToMaskedQuoteId->execute($cart->getId());
diff --git a/Test/Unit/Gateway/Http/Client/TransactionRefundTest.php b/Test/Unit/Gateway/Http/Client/TransactionRefundTest.php
index 3d98825999..21b2730451 100644
--- a/Test/Unit/Gateway/Http/Client/TransactionRefundTest.php
+++ b/Test/Unit/Gateway/Http/Client/TransactionRefundTest.php
@@ -21,6 +21,7 @@
 use Adyen\Service\Checkout\ModificationsApi;
 use Magento\Payment\Gateway\Http\TransferInterface;
 use PHPUnit\Framework\MockObject\MockObject;
+use Adyen\AdyenException;
 
 class TransactionRefundTest extends AbstractAdyenTestCase
 {
@@ -102,4 +103,46 @@ public function testPlaceRequestIncludesHeadersInRequest()
         $this->assertCount(1, $responses);
         $this->assertArrayHasKey('pspReference', $responses[0]);
     }
+
+    public function testPlaceRequestHandlesException()
+    {
+        $requestBody = [
+            'amount' => ['value' => 1000, 'currency' => 'EUR'],
+            'paymentPspReference' => '123456789'
+        ];
+
+        $headers = ['idempotencyExtraData' => ['order_id' => '1001']];
+
+        $transferObjectMock = $this->createConfiguredMock(TransferInterface::class, [
+            'getBody' => [$requestBody],
+            'getHeaders' => $headers,
+            'getClientConfig' => []
+        ]);
+
+        $serviceMock = $this->createMock(ModificationsApi::class);
+        $adyenClientMock = $this->createMock(Client::class);
+
+        $this->adyenHelperMock->method('initializeAdyenClientWithClientConfig')->willReturn($adyenClientMock);
+        $this->adyenHelperMock->method('initializeModificationsApi')->willReturn($serviceMock);
+        $this->adyenHelperMock->method('buildRequestHeaders')->willReturn(['custom-header' => 'value']);
+
+        $this->idempotencyHelperMock->expects($this->once())
+            ->method('generateIdempotencyKey')
+            ->with($requestBody, $headers['idempotencyExtraData'])
+            ->willReturn('generated_idempotency_key');
+
+        $serviceMock->expects($this->once())
+            ->method('refundCapturedPayment')
+            ->willThrowException(new AdyenException());
+
+        $this->adyenHelperMock->expects($this->once())
+            ->method('logAdyenException')
+            ->with($this->isInstanceOf(AdyenException::class));
+
+        $responses = $this->transactionRefund->placeRequest($transferObjectMock);
+        $this->assertIsArray($responses);
+        $this->assertCount(1, $responses);
+        $this->assertArrayHasKey('error', $responses[0]);
+        $this->assertArrayHasKey('errorCode', $responses[0]);
+    }
 }
diff --git a/Test/Unit/Gateway/Request/AdditionalDataLevel23DataBuilderTest.php b/Test/Unit/Gateway/Request/AdditionalDataLevel23DataBuilderTest.php
index 318ef93ccf..77ce4ab6eb 100644
--- a/Test/Unit/Gateway/Request/AdditionalDataLevel23DataBuilderTest.php
+++ b/Test/Unit/Gateway/Request/AdditionalDataLevel23DataBuilderTest.php
@@ -2,6 +2,8 @@
 
 namespace Adyen\Payment\Test\Gateway\Request;
 
+use Adyen\Payment\Logger\AdyenLogger;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Payment\Gateway\Data\OrderAdapterInterface;
 use Magento\Payment\Gateway\Data\PaymentDataObject;
 use Magento\Sales\Model\Order;
@@ -17,19 +19,23 @@
 use Adyen\Payment\Helper\Data;
 use Adyen\Payment\Helper\ChargedCurrency;
 use Adyen\Payment\Helper\Requests;
+use PHPUnit\Framework\MockObject\MockObject;
 
 class AdditionalDataLevel23DataBuilderTest extends AbstractAdyenTestCase
 {
-    private $storeMock;
-    private $configMock;
-    private $storeManagerMock;
-    private $adyenHelperMock;
-    private $chargedCurrencyMock;
-    private $adyenRequestHelperMock;
-
-
-    protected function setUp(): void
+    protected ?AdditionalDataLevel23DataBuilder $additionalDataBuilder;
+    protected MockObject|StoreInterface $storeMock;
+    protected MockObject|Config $configMock;
+    protected MockObject|StoreManagerInterface $storeManagerMock;
+    protected MockObject|Data $adyenHelperMock;
+    protected MockObject|ChargedCurrency $chargedCurrencyMock;
+    protected MockObject|Requests $adyenRequestHelperMock;
+    protected MockObject|AdyenLogger $adyenLoggerMock;
+
+    public function setUp(): void
     {
+        parent::setUp();
+
         $this->configMock = $this->createMock(Config::class);
         $this->storeManagerMock = $this->createMock(StoreManagerInterface::class);
         $this->chargedCurrencyMock = $this->createMock(ChargedCurrency::class);
@@ -37,17 +43,41 @@ protected function setUp(): void
         $this->adyenHelperMock = $this->createMock(Data::class);
         $this->storeMock = $this->createMock(StoreInterface::class);
         $this->storeManagerMock->method('getStore')->willReturn($this->storeMock);
+        $this->adyenLoggerMock = $this->createMock(AdyenLogger::class);
 
         $this->additionalDataBuilder = new AdditionalDataLevel23DataBuilder(
             $this->configMock,
             $this->storeManagerMock,
             $this->chargedCurrencyMock,
             $this->adyenRequestHelperMock,
-            $this->adyenHelperMock
+            $this->adyenHelperMock,
+            $this->adyenLoggerMock
         );
     }
 
-    public function testLevel23DataConfigurationEnabled()
+    public function tearDown(): void
+    {
+        parent::tearDown();
+
+        $this->additionalDataBuilder = null;
+    }
+
+    protected static function orderTypeDataProvider(): array
+    {
+        return [
+            ['isVirtual' => true],
+            ['isVirtual' => false],
+        ];
+    }
+
+    /**
+     * @dataProvider orderTypeDataProvider
+     *
+     * @param $isVirtual
+     * @return void
+     * @throws NoSuchEntityException
+     */
+    public function testLevel23DataConfigurationEnabled($isVirtual)
     {
         $storeId = 1;
         $currencyCode = 'USD';
@@ -56,257 +86,150 @@ public function testLevel23DataConfigurationEnabled()
         $shopperReference = '000123';
         $taxAmount = 10.00;
         $formattedTaxAmount = '1000';
+        $shippingAmount = 5.00;
 
         $this->storeMock->method('getId')->willReturn($storeId);
-        $this->configMock->method('sendLevel23AdditionalData')->with($storeId)->willReturn(true);
-        $this->chargedCurrencyMock->method('getOrderAmountCurrency')->willReturn(new AdyenAmountCurrency(null, $currencyCode));
+        $this->configMock->method('sendLevel23AdditionalData')
+            ->with($storeId)
+            ->willReturn(true);
+
+        $this->chargedCurrencyMock->method('getOrderAmountCurrency')
+            ->willReturn(new AdyenAmountCurrency(null, $currencyCode));
+
         $this->adyenHelperMock->method('formatAmount')->willReturn($formattedTaxAmount);
-        $this->adyenRequestHelperMock->method('getShopperReference')->with($customerId, $orderIncrementId)->willReturn($shopperReference);
+
+        $this->adyenRequestHelperMock->method('getShopperReference')
+            ->with($customerId, $orderIncrementId)
+            ->willReturn($shopperReference);
+
         $itemMock1 = $this->createMock(Item::class);
+        $itemMock1->method('getPrice')->willReturn(0);
+
         $itemMock2 = $this->createMock(Item::class);
+        $itemMock2->method('getPrice')->willReturn(10);
+        $itemMock2->method('getRowTotal')->willReturn(0);
+
+        $itemMock3 = $this->createMock(Item::class);
+        $itemMock3->method('getPrice')->willReturn(10);
+        $itemMock3->method('getRowTotal')->willReturn(5);
+        $itemMock3->method('getQtyOrdered')->willReturn(0.5);
+
+        $itemMock4 = $this->createMock(Item::class);
+        $itemMock4->method('getPrice')->willReturn(15);
+        $itemMock4->method('getRowTotal')->willReturn(30);
+        $itemMock4->method('getQtyOrdered')->willReturn(2);
+        $itemMock4->method('getSku')->willReturn('ABC123');
+        $itemMock4->method('getDescription')->willReturn('Mock Product Description');
 
         $orderMock = $this->createConfiguredMock(Order::class, [
             'getCustomerId' => $customerId,
             'getIncrementId' => $orderIncrementId,
             'getTaxAmount' => $taxAmount,
-            'getItems' => [$itemMock1, $itemMock2]
+            'getItems' => [$itemMock1, $itemMock2, $itemMock3, $itemMock4],
+            'getIsNotVirtual' => !$isVirtual,
+            'getBaseShippingAmount' => $shippingAmount
         ]);
 
+        $shippingAddressMock = $this->createMock(Address::class);
+        $shippingAddressMock->method('getPostcode')->willReturn('12345');
+        $shippingAddressMock->method('getCountryId')->willReturn('US');
+        $shippingAddressMock->method('getRegionCode')->willReturn('MI');
+
+        $orderMock->method('getShippingAddress')->willReturn($shippingAddressMock);
+
         $orderAdapterMock = $this->createMock(OrderAdapterInterface::class);
         $paymentMock = $this->createMock(Payment::class);
         $paymentMock->method('getOrder')->willReturn($orderMock);
         $paymentDataObject = new PaymentDataObject($orderAdapterMock, $paymentMock);
         $buildSubject = ['payment' => $paymentDataObject, 'order' => $orderMock];
         $result = $this->additionalDataBuilder->build($buildSubject);
-        $expectedResult = [
-            'body' => [
-                'additionalData' => [
-                    'enhancedSchemeData.totalTaxAmount' => '1000',
-                    'enhancedSchemeData.customerReference' => '000123',
-                    'enhancedSchemeData.itemDetailLine0.description' => null,
-                    'enhancedSchemeData.itemDetailLine0.unitPrice' => '1000',
-                    'enhancedSchemeData.itemDetailLine0.discountAmount' => '1000',
-                    'enhancedSchemeData.itemDetailLine0.commodityCode' => null,
-                    'enhancedSchemeData.itemDetailLine0.quantity' => null,
-                    'enhancedSchemeData.itemDetailLine0.productCode' => null,
-                    'enhancedSchemeData.itemDetailLine0.totalAmount' => '1000',
-                    'enhancedSchemeData.itemDetailLine1.description' => null,
-                    'enhancedSchemeData.itemDetailLine1.unitPrice' => '1000',
-                    'enhancedSchemeData.itemDetailLine1.discountAmount' => '1000',
-                    'enhancedSchemeData.itemDetailLine1.commodityCode' => null,
-                    'enhancedSchemeData.itemDetailLine1.quantity' => null,
-                    'enhancedSchemeData.itemDetailLine1.productCode' => null,
-                    'enhancedSchemeData.itemDetailLine1.totalAmount' => '1000',
-                ]
-            ]
-        ];
 
-        $this->assertEquals($expectedResult, $result);
+        $this->assertArrayHasKey('additionalData', $result['body']);
+        $this->assertArrayHasKey(AdditionalDataLevel23DataBuilder::ENHANCED_SCHEME_DATA_PREFIX . '.orderDate', $result['body']['additionalData']);
+        $this->assertArrayHasKey(AdditionalDataLevel23DataBuilder::ENHANCED_SCHEME_DATA_PREFIX . '.customerReference', $result['body']['additionalData']);
+        $this->assertArrayHasKey(AdditionalDataLevel23DataBuilder::ENHANCED_SCHEME_DATA_PREFIX . '.totalTaxAmount', $result['body']['additionalData']);
+
+        if (!$isVirtual) {
+            $this->assertArrayHasKey(AdditionalDataLevel23DataBuilder::ENHANCED_SCHEME_DATA_PREFIX . '.freightAmount', $result['body']['additionalData']);
+            $this->assertArrayHasKey(AdditionalDataLevel23DataBuilder::ENHANCED_SCHEME_DATA_PREFIX . '.destinationPostalCode', $result['body']['additionalData']);
+            $this->assertArrayHasKey(AdditionalDataLevel23DataBuilder::ENHANCED_SCHEME_DATA_PREFIX . '.destinationCountryCode', $result['body']['additionalData']);
+            $this->assertArrayHasKey(AdditionalDataLevel23DataBuilder::ENHANCED_SCHEME_DATA_PREFIX . '.destinationStateProvinceCode', $result['body']['additionalData']);
+        }
+
+        $itemArrayKey = AdditionalDataLevel23DataBuilder::ENHANCED_SCHEME_DATA_PREFIX . '.' .
+            AdditionalDataLevel23DataBuilder::ITEM_DETAIL_LINE_PREFIX;
+
+        $this->assertArrayHasKey($itemArrayKey . '1.productCode', $result['body']['additionalData']);
+        $this->assertArrayHasKey($itemArrayKey . '1.description', $result['body']['additionalData']);
+        $this->assertArrayHasKey($itemArrayKey . '1.quantity', $result['body']['additionalData']);
+        $this->assertArrayHasKey($itemArrayKey . '1.unitOfMeasure', $result['body']['additionalData']);
+        $this->assertArrayHasKey($itemArrayKey . '1.commodityCode', $result['body']['additionalData']);
+        $this->assertArrayHasKey($itemArrayKey . '1.totalAmount', $result['body']['additionalData']);
+        $this->assertArrayHasKey($itemArrayKey . '1.unitPrice', $result['body']['additionalData']);
+
+        // Index starts from 1
+        $this->assertArrayNotHasKey($itemArrayKey . '0.productCode', $result['body']['additionalData']);
+
+        // Only one line item is valid, others should be cleaned up
+        $this->assertArrayNotHasKey($itemArrayKey . '2.productCode', $result['body']['additionalData']);
+        $this->assertArrayNotHasKey($itemArrayKey . '3.productCode', $result['body']['additionalData']);
     }
 
+
     public function testLevel23DataConfigurationDisabled()
     {
         $storeId = 1;
-        $orderIncrementId = '000000123';
-        $customerId = 123;
-        $taxAmount = 10.00;
 
         $this->storeMock->method('getId')->willReturn($storeId);
         $this->configMock->method('sendLevel23AdditionalData')->with($storeId)->willReturn(false);
-        $itemMock1 = $this->createMock(Item::class);
-        $itemMock2 = $this->createMock(Item::class);
 
-        $orderMock = $this->createConfiguredMock(Order::class, [
-            'getCustomerId' => $customerId,
-            'getIncrementId' => $orderIncrementId,
-            'getTaxAmount' => $taxAmount,
-            'getItems' => [$itemMock1, $itemMock2]
-        ]);
+        $paymentDataObjectMock = $this->createMock(PaymentDataObject::class);
+        $orderMock = $this->createMock(Order::class);
+        $buildSubject = ['payment' => $paymentDataObjectMock, 'order' => $orderMock];
 
-        $orderAdapterMock = $this->createMock(OrderAdapterInterface::class);
-        $paymentMock = $this->createMock(Payment::class);
-        $paymentMock->method('getOrder')->willReturn($orderMock);
-        $paymentDataObject = new PaymentDataObject($orderAdapterMock, $paymentMock);
-        $buildSubject = ['payment' => $paymentDataObject, 'order' => $orderMock];
         $result = $this->additionalDataBuilder->build($buildSubject);
-        $expectedResult = [
-            'body' => []
-        ];
-
-        $this->assertEquals($expectedResult, $result);
+        $this->assertEmpty($result);
     }
 
-    public function testVirtualOrder()
+    protected static function taxAmountDataProvider(): array
     {
-        $storeId = 1;
-        $currencyCode = 'USD';
-        $customerId = 123;
-        $orderIncrementId = '000000123';
-        $shopperReference = '000123';
-        $taxAmount = 10.00;
-        $formattedTaxAmount = '1000';
-
-        $this->storeMock->method('getId')->willReturn($storeId);
-        $this->configMock->method('sendLevel23AdditionalData')->with($storeId)->willReturn(true);
-        $this->chargedCurrencyMock->method('getOrderAmountCurrency')->willReturn(new AdyenAmountCurrency(null, $currencyCode));
-        $this->adyenHelperMock->method('formatAmount')->willReturn($formattedTaxAmount);
-        $this->adyenRequestHelperMock->method('getShopperReference')->with($customerId, $orderIncrementId)->willReturn($shopperReference);
-
-        $orderMock = $this->createConfiguredMock(Order::class, [
-            'getCustomerId' => $customerId,
-            'getIncrementId' => $orderIncrementId,
-            'getTaxAmount' => $taxAmount,
-            'getItems' => [],
-            'getIsNotVirtual' => false,
-            'getShippingAddress' => null,
-            'getBaseShippingAmount' => 0.00
-        ]);
-
-        $orderAdapterMock = $this->createMock(OrderAdapterInterface::class);
-        $paymentMock = $this->createMock(Payment::class);
-        $paymentMock->method('getOrder')->willReturn($orderMock);
-        $paymentDataObject = new PaymentDataObject($orderAdapterMock, $paymentMock);
-        $buildSubject = ['payment' => $paymentDataObject, 'order' => $orderMock];
-        $result = $this->additionalDataBuilder->build($buildSubject);
-
-        $expectedResult = [
-            'body' => [
-                'additionalData' => [
-                    'enhancedSchemeData.totalTaxAmount' => '1000',
-                    'enhancedSchemeData.customerReference' => '000123'
-                ]
-            ]
+        return [
+            ['taxAmount' => 0],
+            ['taxAmount' => null],
+            ['taxAmount' => -1]
         ];
-
-        $this->assertEquals($expectedResult, $result);
     }
 
-    public function testNonVirtualOrder()
+    /**
+     * @dataProvider taxAmountDataProvider
+     *
+     * @param $taxAmount
+     * @return void
+     * @throws NoSuchEntityException
+     */
+    public function testLevel23DataInvalidTaxAmounts($taxAmount)
     {
         $storeId = 1;
         $currencyCode = 'USD';
-        $customerId = 123;
-        $orderIncrementId = '000000123';
-        $shopperReference = '000123';
-        $taxAmount = 10.00;
-        $shippingAmount = 5.00;
-        $formattedAmount = '1000';
-        $postalCode = '12345';
-        $countryId = 'US';
+
+        $this->chargedCurrencyMock->method('getOrderAmountCurrency')
+            ->willReturn(new AdyenAmountCurrency(null, $currencyCode));
 
         $this->storeMock->method('getId')->willReturn($storeId);
         $this->configMock->method('sendLevel23AdditionalData')->with($storeId)->willReturn(true);
-        $this->chargedCurrencyMock->method('getOrderAmountCurrency')->willReturn(new AdyenAmountCurrency(null, $currencyCode));
-        $this->adyenHelperMock->method('formatAmount')->willReturn($formattedAmount);
-        $this->adyenRequestHelperMock->method('getShopperReference')->with($customerId, $orderIncrementId)->willReturn($shopperReference);
-        $shippingAddressMock = $this->createMock(Address::class);
-        $shippingAddressMock->method('getPostcode')->willReturn($postalCode);
-        $shippingAddressMock->method('getCountryId')->willReturn($countryId);
 
-        $orderMock = $this->createConfiguredMock(Order::class, [
-            'getCustomerId' => $customerId,
-            'getIncrementId' => $orderIncrementId,
-            'getTaxAmount' => $taxAmount,
-            'getIsNotVirtual' => true,
-            'getShippingAddress' => $shippingAddressMock,
-            'getBaseShippingAmount' => $shippingAmount,
-            'getItems' => []
-        ]);
+        $orderMock = $this->createMock(Order::class);
+        $orderMock->method('getTaxAmount')->willReturn($taxAmount);
 
-        $orderAdapterMock = $this->createMock(OrderAdapterInterface::class);
         $paymentMock = $this->createMock(Payment::class);
         $paymentMock->method('getOrder')->willReturn($orderMock);
-        $paymentDataObject = new PaymentDataObject($orderAdapterMock, $paymentMock);
-        $buildSubject = ['payment' => $paymentDataObject, 'order' => $orderMock];
-        $result = $this->additionalDataBuilder->build($buildSubject);
-        $expectedResult = [
-            'body' => [
-                'additionalData' => [
-                    'enhancedSchemeData.totalTaxAmount' => $formattedAmount,
-                    'enhancedSchemeData.customerReference' => $shopperReference,
-                    'enhancedSchemeData.freightAmount' => $formattedAmount,
-                    'enhancedSchemeData.destinationPostalCode' => $postalCode,
-                    'enhancedSchemeData.destinationCountryCode' => $countryId
-                ]
-            ]
-        ];
-
-        $this->assertEquals($expectedResult, $result);
-    }
-
-    public function testOrderWithDiscount()
-    {
-        $storeId = 1;
-        $currencyCode = 'USD';
-        $customerId = 123;
-        $orderIncrementId = '000000123';
-        $shopperReference = '000123';
-        $taxAmount = 10.00;
-        $formattedAmount = '1000';
-        $discountAmount = 2.00;
-
-        $this->storeMock->method('getId')->willReturn($storeId);
-        $this->configMock->method('sendLevel23AdditionalData')->with($storeId)->willReturn(true);
-        $this->chargedCurrencyMock->method('getOrderAmountCurrency')->willReturn(new AdyenAmountCurrency(null, $currencyCode));
-        $this->adyenHelperMock->method('formatAmount')->willReturn($formattedAmount);
-        $this->adyenRequestHelperMock->method('getShopperReference')->with($customerId, $orderIncrementId)->willReturn($shopperReference);
-
-        $itemMock1 = $this->createConfiguredMock(Item::class, [
-            'getPrice' => 10.00,
-            'getDiscountAmount' => $discountAmount,
-            'getName' => 'Item 1',
-            'getQuoteItemId' => 101,
-            'getQtyOrdered' => 1,
-            'getSku' => 'sku-1',
-            'getRowTotal' => 8.00
-        ]);
 
-        $itemMock2 = $this->createConfiguredMock(Item::class, [
-            'getPrice' => 20.00,
-            'getDiscountAmount' => $discountAmount,
-            'getName' => 'Item 2',
-            'getQuoteItemId' => 102,
-            'getQtyOrdered' => 1,
-            'getSku' => 'sku-2',
-            'getRowTotal' => 18.00
-        ]);
+        $paymentDataObjectMock = $this->createMock(PaymentDataObject::class);
+        $paymentDataObjectMock->method('getPayment')->willReturn($paymentMock);
 
-        $orderMock = $this->createConfiguredMock(Order::class, [
-            'getCustomerId' => $customerId,
-            'getIncrementId' => $orderIncrementId,
-            'getTaxAmount' => $taxAmount,
-            'getItems' => [$itemMock1, $itemMock2]
-        ]);
+        $buildSubject = ['payment' => $paymentDataObjectMock, 'order' => $orderMock];
 
-        $orderAdapterMock = $this->createMock(OrderAdapterInterface::class);
-        $paymentMock = $this->createMock(Payment::class);
-        $paymentMock->method('getOrder')->willReturn($orderMock);
-        $paymentDataObject = new PaymentDataObject($orderAdapterMock, $paymentMock);
-        $buildSubject = ['payment' => $paymentDataObject, 'order' => $orderMock];
         $result = $this->additionalDataBuilder->build($buildSubject);
-        $expectedResult = [
-            'body' => [
-                'additionalData' => [
-                    'enhancedSchemeData.totalTaxAmount' => '1000',
-                    'enhancedSchemeData.customerReference' => '000123',
-                    'enhancedSchemeData.itemDetailLine0.description' => 'Item 1',
-                    'enhancedSchemeData.itemDetailLine0.unitPrice' => '1000',
-                    'enhancedSchemeData.itemDetailLine0.discountAmount' => '1000',
-                    'enhancedSchemeData.itemDetailLine0.commodityCode' => 101,
-                    'enhancedSchemeData.itemDetailLine0.quantity' => 1,
-                    'enhancedSchemeData.itemDetailLine0.productCode' => 'sku-1',
-                    'enhancedSchemeData.itemDetailLine0.totalAmount' => '1000',
-                    'enhancedSchemeData.itemDetailLine1.description' => 'Item 2',
-                    'enhancedSchemeData.itemDetailLine1.unitPrice' => '1000',
-                    'enhancedSchemeData.itemDetailLine1.discountAmount' => '1000',
-                    'enhancedSchemeData.itemDetailLine1.commodityCode' => 102,
-                    'enhancedSchemeData.itemDetailLine1.quantity' => 1,
-                    'enhancedSchemeData.itemDetailLine1.productCode' => 'sku-2',
-                    'enhancedSchemeData.itemDetailLine1.totalAmount' => '1000',
-                ]
-            ]
-        ];
-
-        $this->assertEquals($expectedResult, $result);
+        $this->assertEmpty($result);
     }
 }
diff --git a/Test/Unit/Model/Sales/OrderRepositoryTest.php b/Test/Unit/Model/Sales/OrderRepositoryTest.php
index 261640f068..a0e9714810 100644
--- a/Test/Unit/Model/Sales/OrderRepositoryTest.php
+++ b/Test/Unit/Model/Sales/OrderRepositoryTest.php
@@ -19,6 +19,8 @@
 use Magento\Framework\Api\Search\FilterGroupBuilder;
 use Magento\Framework\Api\SearchCriteria;
 use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\Api\SortOrder;
+use Magento\Framework\Api\SortOrderBuilder;
 use Magento\Sales\Api\Data\OrderInterface;
 use Magento\Sales\Api\Data\OrderSearchResultInterface;
 use ReflectionClass;
@@ -41,10 +43,15 @@ public function testGetOrderByQuoteId()
         $filterGroupBuilderMock->method('create')
             ->willReturn($this->createMock(FilterGroup::class));
 
+        $sortOrderBuilderMock = $this->createPartialMock(SortOrderBuilder::class, ['create']);
+        $sortOrderBuilderMock->method('create')
+            ->willReturn($this->createMock(SortOrder::class));
+
         $orderRepository = $this->buildOrderRepositoryClass(
             $searchCriteriaBuilderMock,
             $filterBuilderMock,
-            $filterGroupBuilderMock
+            $filterGroupBuilderMock,
+            $sortOrderBuilderMock
         );
 
         $order = $orderRepository->getOrderByQuoteId($quoteId);
@@ -54,7 +61,8 @@ public function testGetOrderByQuoteId()
     public function buildOrderRepositoryClass(
         $searchCriteriaBuilderMock = null,
         $filterBuilderMock = null,
-        $filterGroupBuilderMock = null
+        $filterGroupBuilderMock = null,
+        $sortOrderBuilderMock = null
     ): OrderRepository {
         if (is_null($searchCriteriaBuilderMock)) {
             $searchCriteriaBuilderMock = $this->createMock(SearchCriteriaBuilder::class);
@@ -68,6 +76,10 @@ public function buildOrderRepositoryClass(
             $filterGroupBuilderMock = $this->createMock(FilterGroupBuilder::class);
         }
 
+        if (is_null($sortOrderBuilderMock)) {
+            $sortOrderBuilderMock = $this->createMock(SortOrderBuilder::class);
+        }
+
         $orderRepositoryPartialMock = $this->getMockBuilder(OrderRepository::class)
             ->setMethods(['getList'])
             ->disableOriginalConstructor()
@@ -87,6 +99,10 @@ public function buildOrderRepositoryClass(
         $filterGroupBuilderProperty->setAccessible(true);
         $filterGroupBuilderProperty->setValue($orderRepositoryPartialMock, $filterGroupBuilderMock);
 
+        $sortOrderBuilderProperty = $reflection->getProperty('sortOrderBuilder');
+        $sortOrderBuilderProperty->setAccessible(true);
+        $sortOrderBuilderProperty->setValue($orderRepositoryPartialMock, $sortOrderBuilderMock);
+
         $orderSearchResultMock = $this->createConfiguredMock(OrderSearchResultInterface::class, [
             'getItems' => [$this->createMock(OrderInterface::class)]
         ]);
diff --git a/VERSION b/VERSION
index ea5a459926..69dd356299 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-9.11.0
+9.12.1
diff --git a/composer.json b/composer.json
index b49c34c77b..a9a2f6eeca 100755
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
   "name": "adyen/module-payment",
   "description": "Official Magento2 Plugin to connect to Payment Service Provider Adyen.",
   "type": "magento2-module",
-  "version": "9.11.0",
+  "version": "9.12.1",
   "license": "MIT",
   "repositories": [
     {
@@ -23,7 +23,7 @@
   "require-dev": {
     "phpunit/phpunit": "~9.6.1",
     "magento/magento-coding-standard": "*",
-    "squizlabs/php_codesniffer": "~3.8.0"
+    "squizlabs/php_codesniffer": "~3.11.0"
   },
   "autoload": {
     "files": [
diff --git a/etc/adminhtml/system/adyen_card_payments.xml b/etc/adminhtml/system/adyen_card_payments.xml
index b356ad22a9..f3daaa5609 100755
--- a/etc/adminhtml/system/adyen_card_payments.xml
+++ b/etc/adminhtml/system/adyen_card_payments.xml
@@ -58,13 +58,13 @@
             <config_path>payment/adyen_cc/installments</config_path>
         </field>
         <field id="send_level23_data" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
-            <label>Send Level 2/3 additional data</label>
+            <label>Send Level 2/3 enhanced scheme data</label>
             <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
             <config_path>payment/adyen_abstract/send_level23_data</config_path>
             <comment>
                 <![CDATA[
                 If enabled level 2/level 3 data will be sent for credit card payments. Refer to
-                <a target="_blank" href="https://docs.adyen.com/online-payments/classic-integrations/hosted-payment-pages/hpp-payments-with-l2l3-data">Adyen documentation</a>
+                <a target="_blank" href="https://docs.adyen.com/payment-methods/cards/enhanced-scheme-data/l2-l3/">Adyen documentation</a>
                 for more information.
                 ]]>
             </comment>
diff --git a/etc/config.xml b/etc/config.xml
index d61cff0b2c..b432bd83ff 100755
--- a/etc/config.xml
+++ b/etc/config.xml
@@ -2274,6 +2274,204 @@
                 <is_wallet>0</is_wallet>
                 <group>adyen-alternative-payment-method</group>
             </adyen_kcp_creditcard>
+            <adyen_doku_alfamart>
+                <active>0</active>
+                <model>AdyenPaymentDokuAlfamartFacade</model>
+                <title>Alfamart via DOKU</title>
+                <allowspecific>0</allowspecific>
+                <sort_order>0</sort_order>
+                <payment_action>authorize</payment_action>
+                <can_initialize>1</can_initialize>
+                <can_use_checkout>1</can_use_checkout>
+                <can_capture>1</can_capture>
+                <can_capture_partial>0</can_capture_partial>
+                <can_use_internal>0</can_use_internal>
+                <can_refund_partial_per_invoice>1</can_refund_partial_per_invoice>
+                <can_refund>1</can_refund>
+                <can_void>1</can_void>
+                <can_cancel>1</can_cancel>
+                <supports_recurring>0</supports_recurring>
+                <supports_manual_capture>0</supports_manual_capture>
+                <supports_auto_capture>1</supports_auto_capture>
+                <is_wallet>0</is_wallet>
+                <group>adyen-alternative-payment-method</group>
+            </adyen_doku_alfamart>
+            <adyen_doku_permata_lite_atm>
+                <active>0</active>
+                <model>AdyenPaymentDokuPermataLiteAtmFacade</model>
+                <title>ATM Permata VA LITE via DOKU</title>
+                <allowspecific>0</allowspecific>
+                <sort_order>0</sort_order>
+                <payment_action>authorize</payment_action>
+                <can_initialize>1</can_initialize>
+                <can_use_checkout>1</can_use_checkout>
+                <can_capture>1</can_capture>
+                <can_capture_partial>0</can_capture_partial>
+                <can_use_internal>0</can_use_internal>
+                <can_refund_partial_per_invoice>1</can_refund_partial_per_invoice>
+                <can_refund>1</can_refund>
+                <can_void>1</can_void>
+                <can_cancel>1</can_cancel>
+                <supports_recurring>0</supports_recurring>
+                <supports_manual_capture>0</supports_manual_capture>
+                <supports_auto_capture>1</supports_auto_capture>
+                <is_wallet>0</is_wallet>
+                <group>adyen-alternative-payment-method</group>
+            </adyen_doku_permata_lite_atm>
+            <adyen_doku_bca_va>
+                <active>0</active>
+                <model>AdyenPaymentDokuBcaVaFacade</model>
+                <title>ATM BCA VA via DOKU</title>
+                <allowspecific>0</allowspecific>
+                <sort_order>0</sort_order>
+                <payment_action>authorize</payment_action>
+                <can_initialize>1</can_initialize>
+                <can_use_checkout>1</can_use_checkout>
+                <can_capture>1</can_capture>
+                <can_capture_partial>0</can_capture_partial>
+                <can_use_internal>0</can_use_internal>
+                <can_refund_partial_per_invoice>1</can_refund_partial_per_invoice>
+                <can_refund>1</can_refund>
+                <can_void>1</can_void>
+                <can_cancel>1</can_cancel>
+                <supports_recurring>0</supports_recurring>
+                <supports_manual_capture>0</supports_manual_capture>
+                <supports_auto_capture>1</supports_auto_capture>
+                <is_wallet>0</is_wallet>
+                <group>adyen-alternative-payment-method</group>
+            </adyen_doku_bca_va>
+            <adyen_doku_bni_va>
+                <active>0</active>
+                <model>AdyenPaymentDokuBniVaFacade</model>
+                <title>BNI VA via DOKU</title>
+                <allowspecific>0</allowspecific>
+                <sort_order>0</sort_order>
+                <payment_action>authorize</payment_action>
+                <can_initialize>1</can_initialize>
+                <can_use_checkout>1</can_use_checkout>
+                <can_capture>1</can_capture>
+                <can_capture_partial>0</can_capture_partial>
+                <can_use_internal>0</can_use_internal>
+                <can_refund_partial_per_invoice>1</can_refund_partial_per_invoice>
+                <can_refund>1</can_refund>
+                <can_void>1</can_void>
+                <can_cancel>1</can_cancel>
+                <supports_recurring>0</supports_recurring>
+                <supports_manual_capture>0</supports_manual_capture>
+                <supports_auto_capture>1</supports_auto_capture>
+                <is_wallet>0</is_wallet>
+                <group>adyen-alternative-payment-method</group>
+            </adyen_doku_bni_va>
+            <adyen_doku_bri_va>
+                <active>0</active>
+                <model>AdyenPaymentDokuBriVaFacade</model>
+                <title>BRI VA via DOKU</title>
+                <allowspecific>0</allowspecific>
+                <sort_order>0</sort_order>
+                <payment_action>authorize</payment_action>
+                <can_initialize>1</can_initialize>
+                <can_use_checkout>1</can_use_checkout>
+                <can_capture>1</can_capture>
+                <can_capture_partial>0</can_capture_partial>
+                <can_use_internal>0</can_use_internal>
+                <can_refund_partial_per_invoice>1</can_refund_partial_per_invoice>
+                <can_refund>1</can_refund>
+                <can_void>1</can_void>
+                <can_cancel>1</can_cancel>
+                <supports_recurring>0</supports_recurring>
+                <supports_manual_capture>0</supports_manual_capture>
+                <supports_auto_capture>1</supports_auto_capture>
+                <is_wallet>0</is_wallet>
+                <group>adyen-alternative-payment-method</group>
+            </adyen_doku_bri_va>
+            <adyen_doku_cimb_va>
+                <active>0</active>
+                <model>AdyenPaymentDokuCimbVaFacade</model>
+                <title>CIMB VA via DOKU</title>
+                <allowspecific>0</allowspecific>
+                <sort_order>0</sort_order>
+                <payment_action>authorize</payment_action>
+                <can_initialize>1</can_initialize>
+                <can_use_checkout>1</can_use_checkout>
+                <can_capture>1</can_capture>
+                <can_capture_partial>0</can_capture_partial>
+                <can_use_internal>0</can_use_internal>
+                <can_refund_partial_per_invoice>1</can_refund_partial_per_invoice>
+                <can_refund>1</can_refund>
+                <can_void>1</can_void>
+                <can_cancel>1</can_cancel>
+                <supports_recurring>0</supports_recurring>
+                <supports_manual_capture>0</supports_manual_capture>
+                <supports_auto_capture>1</supports_auto_capture>
+                <is_wallet>0</is_wallet>
+                <group>adyen-alternative-payment-method</group>
+            </adyen_doku_cimb_va>
+            <adyen_doku_danamon_va>
+                <active>0</active>
+                <model>AdyenPaymentDokuDanamonVaFacade</model>
+                <title>Danamon VA via DOKU</title>
+                <allowspecific>0</allowspecific>
+                <sort_order>0</sort_order>
+                <payment_action>authorize</payment_action>
+                <can_initialize>1</can_initialize>
+                <can_use_checkout>1</can_use_checkout>
+                <can_capture>1</can_capture>
+                <can_capture_partial>0</can_capture_partial>
+                <can_use_internal>0</can_use_internal>
+                <can_refund_partial_per_invoice>1</can_refund_partial_per_invoice>
+                <can_refund>1</can_refund>
+                <can_void>1</can_void>
+                <can_cancel>1</can_cancel>
+                <supports_recurring>0</supports_recurring>
+                <supports_manual_capture>0</supports_manual_capture>
+                <supports_auto_capture>1</supports_auto_capture>
+                <is_wallet>0</is_wallet>
+                <group>adyen-alternative-payment-method</group>
+            </adyen_doku_danamon_va>
+            <adyen_doku_indomaret>
+                <active>0</active>
+                <model>AdyenPaymentDokuIndomaretFacade</model>
+                <title>Indomaret via DOKU</title>
+                <allowspecific>0</allowspecific>
+                <sort_order>0</sort_order>
+                <payment_action>authorize</payment_action>
+                <can_initialize>1</can_initialize>
+                <can_use_checkout>1</can_use_checkout>
+                <can_capture>1</can_capture>
+                <can_capture_partial>0</can_capture_partial>
+                <can_use_internal>0</can_use_internal>
+                <can_refund_partial_per_invoice>1</can_refund_partial_per_invoice>
+                <can_refund>1</can_refund>
+                <can_void>1</can_void>
+                <can_cancel>1</can_cancel>
+                <supports_recurring>0</supports_recurring>
+                <supports_manual_capture>0</supports_manual_capture>
+                <supports_auto_capture>1</supports_auto_capture>
+                <is_wallet>0</is_wallet>
+                <group>adyen-alternative-payment-method</group>
+            </adyen_doku_indomaret>
+            <adyen_doku_mandiri_va>
+                <active>0</active>
+                <model>AdyenPaymentDokuMandiriVaFacade</model>
+                <title>Mandiri VA via DOKU</title>
+                <allowspecific>0</allowspecific>
+                <sort_order>0</sort_order>
+                <payment_action>authorize</payment_action>
+                <can_initialize>1</can_initialize>
+                <can_use_checkout>1</can_use_checkout>
+                <can_capture>1</can_capture>
+                <can_capture_partial>0</can_capture_partial>
+                <can_use_internal>0</can_use_internal>
+                <can_refund_partial_per_invoice>1</can_refund_partial_per_invoice>
+                <can_refund>1</can_refund>
+                <can_void>1</can_void>
+                <can_cancel>1</can_cancel>
+                <supports_recurring>0</supports_recurring>
+                <supports_manual_capture>0</supports_manual_capture>
+                <supports_auto_capture>1</supports_auto_capture>
+                <is_wallet>0</is_wallet>
+                <group>adyen-alternative-payment-method</group>
+            </adyen_doku_mandiri_va>
         </payment>
     </default>
-</config>
+</config>
\ No newline at end of file
diff --git a/etc/di.xml b/etc/di.xml
index 32896b3ff2..aefb9b552a 100755
--- a/etc/di.xml
+++ b/etc/di.xml
@@ -4316,4 +4316,247 @@
             <argument name="methodCode" xsi:type="string">adyen_kcp_creditcard</argument>
         </arguments>
     </virtualType>
+    <virtualType name="AdyenPaymentDokuAlfamartFacade" type="Adyen\Payment\Model\Method\Adapter">
+        <arguments>
+            <argument name="code" xsi:type="string">adyen_doku_alfamart</argument>
+            <argument name="formBlockType" xsi:type="string">Magento\Payment\Block\Form</argument>
+            <argument name="infoBlockType" xsi:type="string">Adyen\Payment\Block\Info\PaymentMethodInfo</argument>
+            <argument name="valueHandlerPool" xsi:type="object">AdyenPaymentDokuAlfamartValueHandlerPool</argument>
+            <argument name="validatorPool" xsi:type="object">AdyenPaymentValidatorPool</argument>
+            <argument name="commandPool" xsi:type="object">AdyenPaymentCommandPool</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="AdyenPaymentDokuAlfamartValueHandlerPool" type="Magento\Payment\Gateway\Config\ValueHandlerPool">
+        <arguments>
+            <argument name="handlers" xsi:type="array">
+                <item name="default" xsi:type="string">AdyenPaymentDokuAlfamartConfigValueHandler</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="AdyenPaymentDokuAlfamartConfigValueHandler" type="Magento\Payment\Gateway\Config\ConfigValueHandler">
+        <arguments>
+            <argument name="configInterface" xsi:type="object">AdyenPaymentDokuAlfamartConfig</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="AdyenPaymentDokuAlfamartConfig" type="Magento\Payment\Gateway\Config\Config">
+        <arguments>
+            <argument name="methodCode" xsi:type="string">adyen_doku_alfamart</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="AdyenPaymentDokuPermataLiteAtmFacade" type="Adyen\Payment\Model\Method\Adapter">
+        <arguments>
+            <argument name="code" xsi:type="string">adyen_doku_permata_lite_atm</argument>
+            <argument name="formBlockType" xsi:type="string">Magento\Payment\Block\Form</argument>
+            <argument name="infoBlockType" xsi:type="string">Adyen\Payment\Block\Info\PaymentMethodInfo</argument>
+            <argument name="valueHandlerPool" xsi:type="object">AdyenPaymentDokuPermataLiteAtmValueHandlerPool</argument>
+            <argument name="validatorPool" xsi:type="object">AdyenPaymentValidatorPool</argument>
+            <argument name="commandPool" xsi:type="object">AdyenPaymentCommandPool</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="AdyenPaymentDokuPermataLiteAtmValueHandlerPool" type="Magento\Payment\Gateway\Config\ValueHandlerPool">
+        <arguments>
+            <argument name="handlers" xsi:type="array">
+                <item name="default" xsi:type="string">AdyenPaymentDokuPermataLiteAtmConfigValueHandler</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="AdyenPaymentDokuPermataLiteAtmConfigValueHandler" type="Magento\Payment\Gateway\Config\ConfigValueHandler">
+        <arguments>
+            <argument name="configInterface" xsi:type="object">AdyenPaymentDokuPermataLiteAtmConfig</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="AdyenPaymentDokuPermataLiteAtmConfig" type="Magento\Payment\Gateway\Config\Config">
+        <arguments>
+            <argument name="methodCode" xsi:type="string">adyen_doku_permata_lite_atm</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="AdyenPaymentDokuBcaVaFacade" type="Adyen\Payment\Model\Method\Adapter">
+        <arguments>
+            <argument name="code" xsi:type="string">adyen_doku_bca_va</argument>
+            <argument name="formBlockType" xsi:type="string">Magento\Payment\Block\Form</argument>
+            <argument name="infoBlockType" xsi:type="string">Adyen\Payment\Block\Info\PaymentMethodInfo</argument>
+            <argument name="valueHandlerPool" xsi:type="object">AdyenPaymentDokuBcaVaValueHandlerPool</argument>
+            <argument name="validatorPool" xsi:type="object">AdyenPaymentValidatorPool</argument>
+            <argument name="commandPool" xsi:type="object">AdyenPaymentCommandPool</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="AdyenPaymentDokuBcaVaValueHandlerPool" type="Magento\Payment\Gateway\Config\ValueHandlerPool">
+        <arguments>
+            <argument name="handlers" xsi:type="array">
+                <item name="default" xsi:type="string">AdyenPaymentDokuBcaVaConfigValueHandler</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="AdyenPaymentDokuBcaVaConfigValueHandler" type="Magento\Payment\Gateway\Config\ConfigValueHandler">
+        <arguments>
+            <argument name="configInterface" xsi:type="object">AdyenPaymentDokuBcaVaConfig</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="AdyenPaymentDokuBcaVaConfig" type="Magento\Payment\Gateway\Config\Config">
+        <arguments>
+            <argument name="methodCode" xsi:type="string">adyen_doku_bca_va</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="AdyenPaymentDokuBniVaFacade" type="Adyen\Payment\Model\Method\Adapter">
+        <arguments>
+            <argument name="code" xsi:type="string">adyen_doku_bni_va</argument>
+            <argument name="formBlockType" xsi:type="string">Magento\Payment\Block\Form</argument>
+            <argument name="infoBlockType" xsi:type="string">Adyen\Payment\Block\Info\PaymentMethodInfo</argument>
+            <argument name="valueHandlerPool" xsi:type="object">AdyenPaymentDokuBniVaValueHandlerPool</argument>
+            <argument name="validatorPool" xsi:type="object">AdyenPaymentValidatorPool</argument>
+            <argument name="commandPool" xsi:type="object">AdyenPaymentCommandPool</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="AdyenPaymentDokuBniVaValueHandlerPool" type="Magento\Payment\Gateway\Config\ValueHandlerPool">
+        <arguments>
+            <argument name="handlers" xsi:type="array">
+                <item name="default" xsi:type="string">AdyenPaymentDokuBniVaConfigValueHandler</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="AdyenPaymentDokuBniVaConfigValueHandler" type="Magento\Payment\Gateway\Config\ConfigValueHandler">
+        <arguments>
+            <argument name="configInterface" xsi:type="object">AdyenPaymentDokuBniVaConfig</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="AdyenPaymentDokuBniVaConfig" type="Magento\Payment\Gateway\Config\Config">
+        <arguments>
+            <argument name="methodCode" xsi:type="string">adyen_doku_bni_va</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="AdyenPaymentDokuBriVaFacade" type="Adyen\Payment\Model\Method\Adapter">
+        <arguments>
+            <argument name="code" xsi:type="string">adyen_doku_bri_va</argument>
+            <argument name="formBlockType" xsi:type="string">Magento\Payment\Block\Form</argument>
+            <argument name="infoBlockType" xsi:type="string">Adyen\Payment\Block\Info\PaymentMethodInfo</argument>
+            <argument name="valueHandlerPool" xsi:type="object">AdyenPaymentDokuBriVaValueHandlerPool</argument>
+            <argument name="validatorPool" xsi:type="object">AdyenPaymentValidatorPool</argument>
+            <argument name="commandPool" xsi:type="object">AdyenPaymentCommandPool</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="AdyenPaymentDokuBriVaValueHandlerPool" type="Magento\Payment\Gateway\Config\ValueHandlerPool">
+        <arguments>
+            <argument name="handlers" xsi:type="array">
+                <item name="default" xsi:type="string">AdyenPaymentDokuBriVaConfigValueHandler</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="AdyenPaymentDokuBriVaConfigValueHandler" type="Magento\Payment\Gateway\Config\ConfigValueHandler">
+        <arguments>
+            <argument name="configInterface" xsi:type="object">AdyenPaymentDokuBriVaConfig</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="AdyenPaymentDokuBriVaConfig" type="Magento\Payment\Gateway\Config\Config">
+        <arguments>
+            <argument name="methodCode" xsi:type="string">adyen_doku_bri_va</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="AdyenPaymentDokuCimbVaFacade" type="Adyen\Payment\Model\Method\Adapter">
+        <arguments>
+            <argument name="code" xsi:type="string">adyen_doku_cimb_va</argument>
+            <argument name="formBlockType" xsi:type="string">Magento\Payment\Block\Form</argument>
+            <argument name="infoBlockType" xsi:type="string">Adyen\Payment\Block\Info\PaymentMethodInfo</argument>
+            <argument name="valueHandlerPool" xsi:type="object">AdyenPaymentDokuCimbVaValueHandlerPool</argument>
+            <argument name="validatorPool" xsi:type="object">AdyenPaymentValidatorPool</argument>
+            <argument name="commandPool" xsi:type="object">AdyenPaymentCommandPool</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="AdyenPaymentDokuCimbVaValueHandlerPool" type="Magento\Payment\Gateway\Config\ValueHandlerPool">
+        <arguments>
+            <argument name="handlers" xsi:type="array">
+                <item name="default" xsi:type="string">AdyenPaymentDokuCimbVaConfigValueHandler</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="AdyenPaymentDokuCimbVaConfigValueHandler" type="Magento\Payment\Gateway\Config\ConfigValueHandler">
+        <arguments>
+            <argument name="configInterface" xsi:type="object">AdyenPaymentDokuCimbVaConfig</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="AdyenPaymentDokuCimbVaConfig" type="Magento\Payment\Gateway\Config\Config">
+        <arguments>
+            <argument name="methodCode" xsi:type="string">adyen_doku_cimb_va</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="AdyenPaymentDokuDanamonVaFacade" type="Adyen\Payment\Model\Method\Adapter">
+        <arguments>
+            <argument name="code" xsi:type="string">adyen_doku_danamon_va</argument>
+            <argument name="formBlockType" xsi:type="string">Magento\Payment\Block\Form</argument>
+            <argument name="infoBlockType" xsi:type="string">Adyen\Payment\Block\Info\PaymentMethodInfo</argument>
+            <argument name="valueHandlerPool" xsi:type="object">AdyenPaymentDokuDanamonVaValueHandlerPool</argument>
+            <argument name="validatorPool" xsi:type="object">AdyenPaymentValidatorPool</argument>
+            <argument name="commandPool" xsi:type="object">AdyenPaymentCommandPool</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="AdyenPaymentDokuDanamonVaValueHandlerPool" type="Magento\Payment\Gateway\Config\ValueHandlerPool">
+        <arguments>
+            <argument name="handlers" xsi:type="array">
+                <item name="default" xsi:type="string">AdyenPaymentDokuDanamonVaConfigValueHandler</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="AdyenPaymentDokuDanamonVaConfigValueHandler" type="Magento\Payment\Gateway\Config\ConfigValueHandler">
+        <arguments>
+            <argument name="configInterface" xsi:type="object">AdyenPaymentDokuDanamonVaConfig</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="AdyenPaymentDokuDanamonVaConfig" type="Magento\Payment\Gateway\Config\Config">
+        <arguments>
+            <argument name="methodCode" xsi:type="string">adyen_doku_danamon_va</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="AdyenPaymentDokuIndomaretFacade" type="Adyen\Payment\Model\Method\Adapter">
+        <arguments>
+            <argument name="code" xsi:type="string">adyen_doku_indomaret</argument>
+            <argument name="formBlockType" xsi:type="string">Magento\Payment\Block\Form</argument>
+            <argument name="infoBlockType" xsi:type="string">Adyen\Payment\Block\Info\PaymentMethodInfo</argument>
+            <argument name="valueHandlerPool" xsi:type="object">AdyenPaymentDokuIndomaretValueHandlerPool</argument>
+            <argument name="validatorPool" xsi:type="object">AdyenPaymentValidatorPool</argument>
+            <argument name="commandPool" xsi:type="object">AdyenPaymentCommandPool</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="AdyenPaymentDokuIndomaretValueHandlerPool" type="Magento\Payment\Gateway\Config\ValueHandlerPool">
+        <arguments>
+            <argument name="handlers" xsi:type="array">
+                <item name="default" xsi:type="string">AdyenPaymentDokuIndomaretConfigValueHandler</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="AdyenPaymentDokuIndomaretConfigValueHandler" type="Magento\Payment\Gateway\Config\ConfigValueHandler">
+        <arguments>
+            <argument name="configInterface" xsi:type="object">AdyenPaymentDokuIndomaretConfig</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="AdyenPaymentDokuIndomaretConfig" type="Magento\Payment\Gateway\Config\Config">
+        <arguments>
+            <argument name="methodCode" xsi:type="string">adyen_doku_indomaret</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="AdyenPaymentDokuMandiriVaFacade" type="Adyen\Payment\Model\Method\Adapter">
+        <arguments>
+            <argument name="code" xsi:type="string">adyen_doku_mandiri_va</argument>
+            <argument name="formBlockType" xsi:type="string">Magento\Payment\Block\Form</argument>
+            <argument name="infoBlockType" xsi:type="string">Adyen\Payment\Block\Info\PaymentMethodInfo</argument>
+            <argument name="valueHandlerPool" xsi:type="object">AdyenPaymentDokuMandiriVaValueHandlerPool</argument>
+            <argument name="validatorPool" xsi:type="object">AdyenPaymentValidatorPool</argument>
+            <argument name="commandPool" xsi:type="object">AdyenPaymentCommandPool</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="AdyenPaymentDokuMandiriVaValueHandlerPool" type="Magento\Payment\Gateway\Config\ValueHandlerPool">
+        <arguments>
+            <argument name="handlers" xsi:type="array">
+                <item name="default" xsi:type="string">AdyenPaymentDokuMandiriVaConfigValueHandler</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="AdyenPaymentDokuMandiriVaConfigValueHandler" type="Magento\Payment\Gateway\Config\ConfigValueHandler">
+        <arguments>
+            <argument name="configInterface" xsi:type="object">AdyenPaymentDokuMandiriVaConfig</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="AdyenPaymentDokuMandiriVaConfig" type="Magento\Payment\Gateway\Config\Config">
+        <arguments>
+            <argument name="methodCode" xsi:type="string">adyen_doku_mandiri_va</argument>
+        </arguments>
+    </virtualType>
 </config>
\ No newline at end of file
diff --git a/etc/events.xml b/etc/events.xml
index 1520613215..8953d82977 100644
--- a/etc/events.xml
+++ b/etc/events.xml
@@ -311,4 +311,31 @@
     <event name="payment_method_assign_data_adyen_kcp_creditcard">
         <observer name="adyen_kcp_creditcard_gateway_data_assign" instance="Adyen\Payment\Observer\AdyenPaymentMethodDataAssignObserver" />
     </event>
+    <event name="payment_method_assign_data_adyen_doku_alfamart">
+        <observer name="adyen_doku_alfamart_gateway_data_assign" instance="Adyen\Payment\Observer\AdyenPaymentMethodDataAssignObserver" />
+    </event>
+    <event name="payment_method_assign_data_adyen_doku_permata_lite_atm">
+        <observer name="adyen_doku_permata_lite_atm_gateway_data_assign" instance="Adyen\Payment\Observer\AdyenPaymentMethodDataAssignObserver" />
+    </event>
+    <event name="payment_method_assign_data_adyen_doku_bca_va">
+        <observer name="adyen_doku_bca_va_gateway_data_assign" instance="Adyen\Payment\Observer\AdyenPaymentMethodDataAssignObserver" />
+    </event>
+    <event name="payment_method_assign_data_adyen_doku_bni_va">
+        <observer name="adyen_doku_bni_va_gateway_data_assign" instance="Adyen\Payment\Observer\AdyenPaymentMethodDataAssignObserver" />
+    </event>
+    <event name="payment_method_assign_data_adyen_doku_bri_va">
+        <observer name="adyen_doku_bri_va_gateway_data_assign" instance="Adyen\Payment\Observer\AdyenPaymentMethodDataAssignObserver" />
+    </event>
+    <event name="payment_method_assign_data_adyen_doku_cimb_va">
+        <observer name="adyen_doku_cimb_va_gateway_data_assign" instance="Adyen\Payment\Observer\AdyenPaymentMethodDataAssignObserver" />
+    </event>
+    <event name="payment_method_assign_data_adyen_doku_danamon_va">
+        <observer name="adyen_doku_danamon_va_gateway_data_assign" instance="Adyen\Payment\Observer\AdyenPaymentMethodDataAssignObserver" />
+    </event>
+    <event name="payment_method_assign_data_adyen_doku_indomaret">
+        <observer name="adyen_doku_indomaret_gateway_data_assign" instance="Adyen\Payment\Observer\AdyenPaymentMethodDataAssignObserver" />
+    </event>
+    <event name="payment_method_assign_data_adyen_doku_mandiri_va">
+        <observer name="adyen_doku_mandiri_va_gateway_data_assign" instance="Adyen\Payment\Observer\AdyenPaymentMethodDataAssignObserver" />
+    </event>
 </config>
\ No newline at end of file
diff --git a/etc/frontend/di.xml b/etc/frontend/di.xml
index 34576cb772..9553e01b20 100755
--- a/etc/frontend/di.xml
+++ b/etc/frontend/di.xml
@@ -114,6 +114,15 @@
                 <item name="adyen_kcp_naverpay" xsi:type="string">kcp_naverpay</item>
                 <item name="adyen_kcp_payco" xsi:type="string">kcp_payco</item>
                 <item name="adyen_kcp_creditcard" xsi:type="string">kcp_creditcard</item>
+                <item name="adyen_doku_alfamart" xsi:type="string">doku_alfamart</item>
+                <item name="adyen_doku_permata_lite_atm" xsi:type="string">doku_permata_lite_atm</item>
+                <item name="adyen_doku_bca_va" xsi:type="string">doku_bca_va</item>
+                <item name="adyen_doku_bni_va" xsi:type="string">doku_bni_va</item>
+                <item name="adyen_doku_bri_va" xsi:type="string">doku_bri_va</item>
+                <item name="adyen_doku_cimb_va" xsi:type="string">doku_cimb_va</item>
+                <item name="adyen_doku_danamon_va" xsi:type="string">doku_danamon_va</item>
+                <item name="adyen_doku_indomaret" xsi:type="string">doku_indomaret</item>
+                <item name="adyen_doku_mandiri_va" xsi:type="string">doku_mandiri_va</item>
             </argument>
             <argument name="customMethodRenderers" xsi:type="array">
                 <item name="adyen_cc" xsi:type="string">Adyen_Payment/js/view/payment/method-renderer/adyen-cc-method</item>
@@ -121,6 +130,10 @@
                 <item name="adyen_applepay" xsi:type="string">Adyen_Payment/js/view/payment/method-renderer/adyen-applepay-method</item>
                 <item name="adyen_boleto" xsi:type="string">Adyen_Payment/js/view/payment/method-renderer/adyen-boleto-method</item>
                 <item name="adyen_facilypay_3x" xsi:type="string">Adyen_Payment/js/view/payment/method-renderer/adyen-facilypay-3x-method</item>
+                <item name="adyen_facilypay_4x" xsi:type="string">Adyen_Payment/js/view/payment/method-renderer/adyen-facilypay-method</item>
+                <item name="adyen_facilypay_6x" xsi:type="string">Adyen_Payment/js/view/payment/method-renderer/adyen-facilypay-method</item>
+                <item name="adyen_facilypay_10x" xsi:type="string">Adyen_Payment/js/view/payment/method-renderer/adyen-facilypay-method</item>
+                <item name="adyen_facilypay_12x" xsi:type="string">Adyen_Payment/js/view/payment/method-renderer/adyen-facilypay-method</item>
                 <item name="adyen_googlepay" xsi:type="string">Adyen_Payment/js/view/payment/method-renderer/adyen-googlepay-method</item>
                 <item name="adyen_paypal" xsi:type="string">Adyen_Payment/js/view/payment/method-renderer/adyen-paypal-method</item>
                 <item name="adyen_giftcard" xsi:type="string">Adyen_Payment/js/view/payment/method-renderer/adyen-giftcard-method</item>
diff --git a/etc/graphql/di.xml b/etc/graphql/di.xml
index ca8deea49d..ce48e3017e 100644
--- a/etc/graphql/di.xml
+++ b/etc/graphql/di.xml
@@ -95,6 +95,15 @@
                 <item name="adyen_kcp_naverpay" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
                 <item name="adyen_kcp_payco" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
                 <item name="adyen_kcp_creditcard" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
+                <item name="adyen_doku_alfamart" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
+                <item name="adyen_doku_permata_lite_atm" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
+                <item name="adyen_doku_bca_va" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
+                <item name="adyen_doku_bni_va" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
+                <item name="adyen_doku_bri_va" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
+                <item name="adyen_doku_cimb_va" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
+                <item name="adyen_doku_danamon_va" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
+                <item name="adyen_doku_indomaret" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
+                <item name="adyen_doku_mandiri_va" xsi:type="object">Adyen\Payment\Model\Cart\Payment\AdditionalDataProvider\AdyenPm</item>
             </argument>
         </arguments>
     </type>
diff --git a/etc/payment.xml b/etc/payment.xml
index 5c9920a180..e8efc7767d 100755
--- a/etc/payment.xml
+++ b/etc/payment.xml
@@ -272,5 +272,32 @@
         <method name="adyen_kcp_creditcard">
             <allow_multiple_address>1</allow_multiple_address>
         </method>
+        <method name="adyen_doku_alfamart">
+            <allow_multiple_address>1</allow_multiple_address>
+        </method>
+        <method name="adyen_doku_permata_lite_atm">
+            <allow_multiple_address>1</allow_multiple_address>
+        </method>
+        <method name="adyen_doku_bca_va">
+            <allow_multiple_address>1</allow_multiple_address>
+        </method>
+        <method name="adyen_doku_bni_va">
+            <allow_multiple_address>1</allow_multiple_address>
+        </method>
+        <method name="adyen_doku_bri_va">
+            <allow_multiple_address>1</allow_multiple_address>
+        </method>
+        <method name="adyen_doku_cimb_va">
+            <allow_multiple_address>1</allow_multiple_address>
+        </method>
+        <method name="adyen_doku_danamon_va">
+            <allow_multiple_address>1</allow_multiple_address>
+        </method>
+        <method name="adyen_doku_indomaret">
+            <allow_multiple_address>1</allow_multiple_address>
+        </method>
+        <method name="adyen_doku_mandiri_va">
+            <allow_multiple_address>1</allow_multiple_address>
+        </method>
     </methods>
 </payment>
\ No newline at end of file
diff --git a/view/adminhtml/templates/support/js.phtml b/view/adminhtml/templates/support/js.phtml
index 865b1b8ec3..175681cb4b 100644
--- a/view/adminhtml/templates/support/js.phtml
+++ b/view/adminhtml/templates/support/js.phtml
@@ -20,38 +20,38 @@ require([
     const linksMapping = {
         required_settings: [
             {
-                title: 'Magento plugin setup',
-                href: 'https://docs.adyen.com/plugins/magento-2/set-up-the-plugin-in-magento#step-3-configure-the-plugin-in-magento'
+                title: 'Adobe Commerce plugin setup',
+                href: 'https://docs.adyen.com/plugins/adobe-commerce/set-up-the-plugin-in-adobe-commerce/'
             },
             {
                 title: 'How to request a new merchant account',
                 href: 'https://www.adyen.com/education/europe/english/modules/customer-area'
             },
             {
-                title: 'Why Apple pay is not working',
-                href: 'https://www.adyen.help/hc/en-us/articles/4871941388444-how-can-i-handle-errors-with-my-applepay-payments'
+                title: 'Why is Apple pay not working',
+                href: 'https://help.adyen.com/knowledge/ecommerce-integrations/drop-in-and-components/why-do-i-receive-a-422-error-with-apple-pay-when-using-adyens-certificate'
             },
             {
                 title: 'Go-live checklist',
-                href: 'https://docs.adyen.com/plugins/magento-2/go-live-checklist'
+                href: 'https://docs.adyen.com/plugins/adobe-commerce/go-live-checklist'
             },
             {
                 title: 'Troubleshooting guide',
-                href: 'https://docs.adyen.com/plugins/magento-2/troubleshooting'
+                href: 'https://docs.adyen.com/plugins/adobe-commerce/troubleshooting/'
             },
             {
                 title: 'Why do I get the error 401 Unauthorized?',
-                href: 'https://www.adyen.help/hc/en-us/articles/5231709306652-why-do-i-get-the-error-401-unauthorized'
+                href: 'https://help.adyen.com/knowledge/ecommerce-integrations/error-codes/why-do-i-get-the-error-401-unauthorized'
             }
         ],
         card_payments: [
             {
                 title: 'How to configure card payments ',
-                href: 'https://docs.adyen.com/plugins/magento-2/set-up-the-payment-methods-in-magento#api-credit-card-payments'
+                href: 'https://docs.adyen.com/plugins/adobe-commerce/set-up-the-payment-methods-in-adobe-commerce'
             },
             {
                 title: 'What are supported schemes?',
-                href: 'https://docs.adyen.com/plugins/magento-2/supported-payment-methods#credit-and-debit-cards'
+                href: 'https://docs.adyen.com/plugins/adobe-commerce/supported-payment-methods'
             },
             {
                 title: '3D Secure 2 Component integration',
@@ -61,11 +61,11 @@ require([
         card_tokenization: [
             {
                 title: 'How to set up tokenization',
-                href: 'https://docs.adyen.com/plugins/magento-2/set-up-tokenization'
+                href: 'https://docs.adyen.com/plugins/adobe-commerce/set-up-tokenization'
             },
             {
                 title: 'Video: How to set up tokenization',
-                href: 'https://help.adyen.com/academy/how-to-videos/plugins/how-to-set-up-tokenization-in-your-magento-plugin'
+                href: 'https://help.adyen.com/knowledge/plugins/adobe-commerce/how-do-i-set-up-tokenization-in-adobe-commerce'
             },
             {
                 title: 'Difference between One-off, Subscription and Top-ups',
@@ -73,25 +73,25 @@ require([
             },
             {
                 title: 'Why do I receive a 800 Contract not found error?',
-                href: 'https://www.adyen.help/hc/en-us/articles/5231491632668-why-do-i-receive-a-800-contract-not-found-error'
+                href: 'https://help.adyen.com/knowledge/ecommerce-integrations/error-codes/why-do-i-receive-a-800-contract-not-found-error'
             },
             {
                 title: 'Why do I receive a 803 PaymentDetail not found error?',
-                href: 'https://www.adyen.help/hc/en-us/articles/5231662267420-why-do-i-receive-a-803-paymentdetail-not-found-error'
+                href: 'https://help.adyen.com/knowledge/ecommerce-integrations/error-codes/why-do-i-receive-a-803-paymentdetail-not-found-error'
             },
             {
                 title: 'Why does my recurring transaction give the error "invalid card number"?',
-                href: 'https://www.adyen.help/hc/en-us/articles/5234058320412-why-does-my-recurring-transaction-give-the-error-invalid-card-number'
+                href: 'https://help.adyen.com/knowledge/ecommerce-integrations/tokenization/why-does-my-recurring-transaction-give-the-error-invalid-card-number'
             }
         ],
         alt_payment_methods: [
             {
-                title: 'Why are Adyen alternative payment methods not showing up in Magento?',
-                href: 'https://www.adyen.help/hc/en-us/articles/5034154365340-Why-are-Adyen-alternative-payment-methods-not-showing-up-in-Magento-'
+                title: 'Why are Adyen alternative payment methods not showing up in Adobe Commerce?',
+                href: 'https://help.adyen.com/knowledge/plugins/adobe-commerce/why-arent-all-payment-methods-displayed-adobe-commerce'
             },
             {
                 title: 'Supported Payment Methods',
-                href: 'https://docs.adyen.com/plugins/magento-2/supported-payment-methods#credit-and-debit-cards'
+                href: 'https://docs.adyen.com/plugins/adobe-commerce/supported-payment-methods/'
             },
             {
                 title: 'How to add payment methods in Customer Area',
@@ -99,19 +99,15 @@ require([
             },
             {
                 title: 'How do I deactivate or delete a payment method?',
-                href: 'https://www.adyen.help/hc/en-us/articles/5439872869404-how-do-i-deactivate-or-delete-a-payment-method'
+                href: 'https://help.adyen.com/knowledge/payment-methods/manage-payment-methods/how-do-i-deactivate-or-delete-a-payment-method'
             },
             {
                 title: 'Video: How to add payment methods in Customer Area',
                 href: 'https://www.adyen.com/education/europe/english/modules/customer-area'
             },
             {
-                title: 'How do I change the order of payment methods on my checkout page?',
-                href: 'https://www.adyen.help/hc/en-us/articles/4871657923612-how-can-i-change-the-order-of-my-payment-methods'
-            },
-            {
-                title: 'How can we change the order of the payment methods inside Magento 2?',
-                href: 'https://www.adyen.help/hc/en-us/articles/5034413982876-how-can-we-change-the-order-of-the-payment-methods-inside-magento-2'
+                title: 'How can we change the order of the payment methods inside Adobe Commerce 2?',
+                href: 'https://help.adyen.com/knowledge/plugins/adobe-commerce/how-can-i-change-the-order-of-the-payment-methods-adobe-commerce'
             }
         ],
         pos_integration: [
@@ -127,123 +123,115 @@ require([
         pay_by_link: [
             {
                 title: 'How to set up Pay By Link in the plugin',
-                href: 'https://docs.adyen.com/plugins/magento-2/set-up-the-payment-methods-in-magento#pay-by-link'
+                href: 'https://docs.adyen.com/plugins/adobe-commerce/set-up-the-payment-methods-in-adobe-commerce/#pay-by-link'
             },
             {
                 title: 'Video: How to set up PayByLink',
-                href: 'https://help.adyen.com/academy/how-to-videos/plugins/how-to-set-up-pay-by-link-in-your-magento-plugin'
+                href: 'https://help.adyen.com/academy/how-to-videos/plugins/how-to-set-up-pay-by-link-in-your-adobe-commerce-plugin'
             }
         ],
         adyen_giving: [
             {
                 title: 'How to set up Donations in the plugin',
-                href: 'https://docs.adyen.com/plugins/magento-2/set-up-the-payment-methods-in-magento#donations'
+                href: 'https://docs.adyen.com/plugins/adobe-commerce/set-up-the-payment-methods-in-adobe-commerce/#donations'
             },
             {
                 title: 'Video: How to set up Adyen Giving',
-                href: 'https://help.adyen.com/academy/how-to-videos/plugins/how-to-set-up-giving-in-your-magento-plugin/'
+                href: 'https://help.adyen.com/academy/how-to-videos/plugins/how-to-set-up-giving-in-your-adobe-commerce-plugin'
             }
         ],
         advanced_settings: [
             {
-                title: 'Why does the order status in Magento remain on "Payment Review"?',
-                href: 'https://www.adyen.help/hc/en-us/articles/5033911246876-Why-does-the-order-status-in-Magento-remain-on-Payment-Review-'
+                title: 'Why does the order status in Adobe Commerce remain on "Payment Review"?',
+                href: 'https://help.adyen.com/knowledge/plugins/adobe-commerce/why-is-my-payment-pending-in-adobe-commerce'
             },
             {
-                title: 'Why is the text in Magento not being translated?',
-                href: 'https://www.adyen.help/hc/en-us/articles/5034181926300-Why-is-the-text-in-Magento-not-being-translated-'
+                title: 'Why is the text in Adobe Commerce not being translated?',
+                href: 'https://help.adyen.com/knowledge/plugins/adobe-commerce/why-is-the-text-in-adobe-commerce-not-being-translated'
             },
             {
-                title: 'How can we customise the Magento 2 plugin?',
-                href: 'https://www.adyen.help/hc/en-us/articles/5034486805532-How-can-we-customise-the-Magento-2-plugin-'
+                title: 'How can we customise the Adobe Commerce plugin?',
+                href: 'https://help.adyen.com/knowledge/plugins/adobe-commerce/how-can-we-customise-the-adobe-commerce-plugin'
             },
             {
-                title: 'Why is my order status Settled or SentForSettle after I refunded it on Magento?',
-                href: 'https://www.adyen.help/hc/en-us/articles/5034488629660-Why-is-my-order-status-Settled-or-SentForSettle-after-I-refunded-it-on-Magento-'
+                title: 'Why is my order status Settled or SentForSettle after I refunded it on Adobe Commerce?',
+                href: 'https://help.adyen.com/knowledge/plugins/adobe-commerce/why-is-my-order-status-settled-or-sentforsettle-after-i-refunded-it-on-adobe-commerce'
             },
             {
                 title: 'Why are Klarna payments stuck in Pending?',
-                href: 'https://www.adyen.help/hc/en-us/articles/5032453938460-why-are-klarna-payments-stuck-in-pending'
-            },
-            {
-                title: 'Why are the orders not created in Magento after a payment is processed in Adyen?',
-                href: 'https://www.adyen.help/hc/en-us/articles/5033911246876-why-does-the-order-status-in-magento-remain-on-payment-review'
+                href: 'https://help.adyen.com/knowledge/plugins/using-plugins/why-are-klarna-payments-still-pending'
             },
             {
                 title: 'How can I change the capture settings of my payment method?',
-                href: 'https://www.adyen.help/hc/en-us/articles/5003914234140-how-can-i-change-the-capture-settings-of-my-payment-method'
+                href: 'https://help.adyen.com/knowledge/payment-methods/manage-payment-methods/how-can-i-change-the-capture-settings-of-my-payment-method'
             }
         ],
         payment_status: [
             {
-                title: 'Why is my order status Settled or SentForSettle after I refunded it on Magento?',
-                href: 'https://www.adyen.help/hc/en-us/articles/5034488629660-Why-is-my-order-status-Settled-or-SentForSettle-after-I-refunded-it-on-Magento-'
+                title: 'Why is my order status Settled or SentForSettle after I refunded it on Adobe Commerce?',
+                href: 'https://help.adyen.com/knowledge/plugins/adobe-commerce/why-is-my-order-status-settled-or-sentforsettle-after-i-refunded-it-on-adobe-commerce'
             },
             {
                 title: 'Why are Klarna payments stuck in Pending?',
-                href: 'https://www.adyen.help/hc/en-us/articles/5032453938460-why-are-klarna-payments-stuck-in-pending'
+                href: 'https://help.adyen.com/knowledge/plugins/using-plugins/why-are-klarna-payments-still-pending'
             },
-            {
-                title: 'Why does the order status in Magento remain on "Payment Review"?',
-                href: 'https://www.adyen.help/hc/en-us/articles/5033911246876-Why-does-the-order-status-in-Magento-remain-on-Payment-Review-'
-            }
         ],
         failed_transaction: [
             {
                 title: 'What does it mean if a payment is refused because 3d-secure: Authentication failed?',
-                href: 'https://www.adyen.help/hc/en-us/articles/5295691501596-what-does-it-mean-if-a-payment-is-refused-because-3dsecure-authentication-failed'
+                href: 'https://help.adyen.com/knowledge/3d-secure/3ds-response-codes/what-does-it-mean-if-a-payment-is-refused-because-3d-secure-authentication-failed'
             },
             {
                 title: 'Why is my payment canceled?',
-                href: 'https://www.adyen.help/hc/en-us/articles/4545692297884-why-is-my-payment-canceled'
+                href: 'https://help.adyen.com/knowledge/payments/payment-statuses/why-is-my-payment-canceled'
             },
             {
                 title: 'Why do I receive a 905 Payment details are not supported error?',
-                href: 'https://www.adyen.help/hc/en-us/articles/5231655519004-why-do-i-receive-a-905-payment-details-are-not-supported-error'
+                href: 'https://help.adyen.com/knowledge/ecommerce-integrations/error-codes/why-do-i-receive-a-905-payment-details-are-not-supported-error'
             },
             {
                 title: 'Why do I receive a 403 or 010 Not Allowed error?',
-                href: 'https://www.adyen.help/hc/en-us/articles/5231707550364-why-do-i-receive-a-403-or-010-not-allowed-error'
+                href: 'https://help.adyen.com/knowledge/ecommerce-integrations/error-codes/why-do-i-receive-a-403-or-010-not-allowed-error'
             },
             {
                 title: 'Why do I receive the error 422 : Unable to Decrypt Data using the Card Component or Drop-In?',
-                href: 'https://www.adyen.help/hc/en-us/articles/5233146584988-why-do-i-receive-the-error-422-unable-to-decrypt-data-using-the-card-component-or-dropin'
+                href: 'https://help.adyen.com/knowledge/ecommerce-integrations/drop-in-and-components/why-do-i-receive-the-error-422-unable-to-decrypt-data-using-the-card-component-or-dropin'
             },
             {
                 title: 'Why do I receive a 807 Invalid combination of shopper interaction and recurring contract error?',
-                href: 'https://www.adyen.help/hc/en-us/articles/5231605902492-why-do-i-receive-a-807-invalid-combination-of-shopper-interaction-and-recurring-contract-error'
+                href: 'https://help.adyen.com/knowledge/ecommerce-integrations/error-codes/why-do-i-receive-a-807-invalid-combination-of-shopper-interaction-and-recurring-contract-error'
             },
             {
                 title: 'Why do I get errorCode 908: invalid request with HTTP status 500?',
-                href: 'https://www.adyen.help/hc/en-us/articles/5231513160220-why-do-i-get-errorcode-908-invalid-request-with-http-status-500'
+                href: 'https://help.adyen.com/knowledge/ecommerce-integrations/error-codes/why-do-i-get-errorcode-908-invalid-request-with-http-status-500'
             }
         ],
         offer: [
             {
-                title: 'Why does the order status in Magento remain on "Payment Review"?',
-                href: 'https://www.adyen.help/hc/en-us/articles/5033911246876-Why-does-the-order-status-in-Magento-remain-on-Payment-Review-'
+                title: 'Why does the order status in Adobe Commerce remain on "Payment Review"?',
+                href: 'https://docs.adyen.com/plugins/adobe-commerce/troubleshooting/#orders'
             }
         ],
         webhooks: [
             {
                 title: 'How to set up notifications in Customer Area',
-                href: 'https://docs.adyen.com/plugins/magento-2/set-up-adyen-customer-area'
+                href: 'https://docs.adyen.com/plugins/adobe-commerce/set-up-adyen-customer-area/?tab=manual_2#step-3-set-up-webhooks'
             },
             {
-                title: 'Why does the order status in Magento remain on "Payment Review"?',
-                href: 'https://www.adyen.help/hc/en-us/articles/5033911246876-Why-does-the-order-status-in-Magento-remain-on-Payment-Review-'
+                title: 'Why does the order status in Adobe Commerce remain on "Payment Review"?',
+                href: 'https://docs.adyen.com/plugins/adobe-commerce/troubleshooting/#orders'
             },
             {
-                title: 'Why does Magento 2 does not receive notifications?',
-                href: 'https://www.adyen.help/hc/en-us/articles/5034412585116-Why-does-Magento-2-does-not-receive-notifications-'
+                title: 'Why does Adobe Commerce not receive notifications?',
+                href: 'https://help.adyen.com/knowledge/plugins/adobe-commerce/why-does-adobe-commerce-does-not-receive-notifications'
             },
             {
-                title: 'I get a 301, 302 or 401 error in Magento when testing the notification endpoint',
-                href: 'https://www.adyen.help/hc/en-us/articles/5034799389980-I-get-a-301-302-or-401-error-in-Magento-when-testing-the-notification-endpoint'
+                title: 'I get a 301, 302 or 401 error in Adobe Commerce when testing the notification endpoint',
+                href: 'https://help.adyen.com/knowledge/plugins/adobe-commerce/why-am-i-receiving-301-302-or-401-error-in-adobe-commerce'
             },
             {
                 title: 'How can I get additional data in standard Notifications?',
-                href: 'https://www.adyen.help/hc/en-us/articles/5234558016540-how-can-i-get-additional-data-in-standard-notifications'
+                href: 'https://help.adyen.com/knowledge/ecommerce-integrations/webhooks/how-can-i-get-additional-data-in-standard-webhooks'
             }
         ]
     };
diff --git a/view/base/web/images/logos/doku_alfamart.svg b/view/base/web/images/logos/doku_alfamart.svg
new file mode 100644
index 0000000000..76f4a967e2
--- /dev/null
+++ b/view/base/web/images/logos/doku_alfamart.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40 26"><mask id="a" width="30.88" height=".5" x="4.24" y="16.76" maskUnits="userSpaceOnUse"><path fill="#fff" d="M35.11 17.26H4.24v-.5H35.1v.5z"/></mask><path fill="#e02529" d="M0 0h40v26H0z"/><rect width="34" height="15.45" x="3" y="5.45" fill="#fff" rx=".62"/><path fill="#eb2027" d="M35.1 12.84c.05 0 .18.75-1.1.76-.49 0-.8-.14-.91-.34-.28-.53.21-1.3.4-1.83h-.01a2.46 2.46 0 0 0-.75.08v-.01c-.08-.07-.03-.15 0-.23 0-.05.03-.1.04-.15.01-.06.13-.13.23-.16a2.66 2.66 0 0 1 .54-.03l.03.01a.09.09 0 0 0 .07-.05 2.19 2.19 0 0 0 .21-.74 1.16 1.16 0 0 0 0-.2c0-.03-.06-.07-.02-.1a2.6 2.6 0 0 1 1-.05c.03 0 .04.02.05.02a.24.24 0 0 1 .07.32l-.26.72c-.01.02-.01.08.04.09a.42.42 0 0 0 .06 0 4.01 4.01 0 0 0 .72-.02 1.2 1.2 0 0 1 .24-.04c.04 0-.04.33-.23.42a1.79 1.79 0 0 1-.69.14.9.9 0 0 1-.26-.03.1.1 0 0 0-.1.03c-.2.44-.57 1.2-.37 1.45a.4.4 0 0 0 .35.13c.21 0 .53-.2.65-.2"/><path fill="#243f8f" d="M14.5 9.93v.37a2.96 2.96 0 0 1 .47-.03c.47.08.38.7-.34.6-.05 0-.14-.05-.14-.03-.02.71 0 1.5-.02 2.15-.02.18-.38.3-.73.29-.45-.01-.75-.18-.75-.38 0-.67.04-1.33 0-1.98 0-.02-.04-.05-.09-.04a.74.74 0 0 1-.07.01c-.7.06-.85-.64-.05-.61h.19a.05.05 0 0 0 .02-.04c.02-.21-.1-.57.2-.73a3.3 3.3 0 0 1 1.7-.17c.2.01.33.06.36.16.03.08.05.32-.17.37a5.1 5.1 0 0 1-.59.06m-4.11 2.91V9.82c.04-.32.08-.54.76-.59.62.04.72.25.75.5l-.04 3.09c0 .24-.15.49-.7.48-.6 0-.71-.17-.77-.46"/><path fill="#eb2027" d="M32.02 11.57H32a.48.48 0 0 0-.25-.14.52.52 0 0 0-.36.14 6.5 6.5 0 0 0-.99 1.17c-.08.12-.27.44-.19.59a.16.16 0 0 1 .02.07c.02.12-.47.12-.63.1-.4-.04-.46-.21-.39-.38a13.2 13.2 0 0 0 .77-2.12.76.76 0 0 0 .04-.32c0-.04-.03-.14.07-.16.3-.07.91-.14 1.02.09.08.17-.13.58-.22.78l-.06.1v.02l.1-.13c.21-.22.82-.97 1.4-.93.18.01.28.07.3.15.07.26-.24.77-.6.97m-7.06 1.2a18.39 18.39 0 0 1 .58-1.75c.04-.1.17-.62-.24-.67-.99-.13-1.54.73-1.84 1.08a.04.04 0 0 1-.04.01c-.05 0-.03-.06-.03-.08.09-.19.44-.99-.18-1.03-.87-.05-1.54.92-1.72.87s.52-.68-.07-.83a1.34 1.34 0 0 0-.77.07 10.53 10.53 0 0 1-.78 2.45c-.07.15-.18.55.38.55a1.83 1.83 0 0 0 .55-.11c.02-.02 0-.04 0-.07a.85.85 0 0 1 .08-.44 1.54 1.54 0 0 1 .15-.23c.1-.16 1.16-1.62 1.44-1.59.24.03-.57 1.88-.63 2.03-.05.15-.09.31.25.37a2.08 2.08 0 0 0 .63 0 .1.1 0 0 0 .09-.12.5.5 0 0 1-.01-.24 5.65 5.65 0 0 1 1.57-1.98.14.14 0 0 1 .1-.03.07.07 0 0 1 .05.1 13.44 13.44 0 0 0-.57 1.75c-.01.13-.05.5.28.56.23.04.85-.04.82-.2s-.14-.3-.09-.47m3.36-1.6a7.76 7.76 0 0 1-1.44 1.59c-.03 0-.07.05-.12.03a.13.13 0 0 1-.07-.06 1.67 1.67 0 0 1 .72-1.79.65.65 0 0 1 .46-.08 4.58 4.58 0 0 1 .48.27c.01.01-.02.02-.03.04m1.22-.67c.01-.07-.25-.07-.4-.09a1.33 1.33 0 0 0-.5.04c-.06.03-.08.07-.16.08-.04 0-.44-.14-.6-.15a2.08 2.08 0 0 0-1.77.85c-.51.6-.93 1.4-.56 2.04a.52.52 0 0 0 .51.24 2.13 2.13 0 0 0 1.6-1.01.31.31 0 0 1 .05-.06l.02.01v.02a1.55 1.55 0 0 0-.03.67.42.42 0 0 0 .38.34c.27.05.75-.05.74-.2a.03.03 0 0 0 0-.02.7.7 0 0 1-.03-.11l-.02-.1v-.23a2.52 2.52 0 0 1 .22-1.03 4.6 4.6 0 0 0 .55-1.29"/><path fill="#243f8f" d="M7.55 11.56h-.93a5.21 5.21 0 0 1 .44-1.06s.02-.02.05-.02.04.03.04.04a10.94 10.94 0 0 1 .41 1.04zm2.25 1.29L8.2 9.62a1.1 1.1 0 0 0-1.02-.46 1.34 1.34 0 0 0-1.23.5l-1.23 2.41c-.18.36-.87 1.22.36 1.26 1.16.04 1.02-1.05 1.27-1.05h1.52c.15.37.16.98 1.15 1.04.6.04.89-.26.78-.47m7.96-.35a.47.47 0 0 1-.24.05c-.47.01-.57-.23-.6-.48a1.78 1.78 0 0 1 .03-.87.56.56 0 0 1 .51-.37.54.54 0 0 1 .6.39c.06.28.15 1.07-.3 1.29m1.65-2.16c-.01-.25-.96-.26-1.25-.12l-.13.08c-.16-.01-.35-.09-.53-.11a2.48 2.48 0 0 0-1.16.08c-1.2.48-1.54 2.65.25 2.96a3.53 3.53 0 0 0 1.41-.16c.04 0 .07.04.09.05a.7.7 0 0 0 .15.08 1.94 1.94 0 0 0 .64.08c.33-.02.56-.18.56-.33 0-.87.02-1.74-.03-2.6"/><path fill="#e02529" d="M4.24 16.44h30.98c.5-.37.52-1 .5-2.37H7.5c-1.59.01-2.83.02-3.26 2.37"/><g mask="url(#a)"><path fill="#f8d705" d="M4.24 16.76H35.1a1.68 1.68 0 0 1-1.27.5H4.24z"/></g></svg>
\ No newline at end of file
diff --git a/view/base/web/images/logos/doku_bca_va.svg b/view/base/web/images/logos/doku_bca_va.svg
new file mode 100644
index 0000000000..45f42f70ca
--- /dev/null
+++ b/view/base/web/images/logos/doku_bca_va.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40 26"><path fill="#0d60ac" d="M0 0h40v26H0z"/><g fill="#fff"><path d="M20.04 11.88h-.9l.26-1.29h1.02c.98.25.13 1.34-.38 1.29zm-.64 3.14h-1.07l.4-1.48h1.02c1.2.25.46 1.53-.35 1.48zm2.38-2.46c2.25-1.04 2.58-4.42-.61-4.42h-3.7l-1.36 2.73h.64l-1.63 6.52h4.28c3.13.03 4.53-3.72 2.38-4.83z"/><path d="M19.14 11.87h.9a.32.32 0 0 0 .04 0 .97.97 0 0 0 .78-.73c.04-.27-.11-.46-.44-.54H19.4zm.94.02a.37.37 0 0 1-.04 0h-.91l.27-1.3h1.02c.46.11.48.4.45.55a.99.99 0 0 1-.79.75zM18.34 15h1.06a.9.9 0 0 0 .64-.24.94.94 0 0 0 .33-.56c.04-.33-.18-.57-.62-.66h-1.01zm1.11.01h-1.13l.4-1.49h1.03c.45.1.68.34.63.69a.95.95 0 0 1-.33.57.94.94 0 0 1-.6.23zm-4.32 2.36h4.31a3.42 3.42 0 0 0 2.2-.76 3.23 3.23 0 0 0 1.1-1.73 2.28 2.28 0 0 0-.06-1.34 1.83 1.83 0 0 0-.9-.98l-.01-.01h.01a3.07 3.07 0 0 0 1.4-1.3 2.4 2.4 0 0 0 .29-1.64 1.7 1.7 0 0 0-.7-1.04 2.74 2.74 0 0 0-1.6-.43h-3.7l-1.35 2.71h.64zm4.3.02H15.1l.01-.01 1.63-6.52h-.64l1.37-2.74h3.7a2.76 2.76 0 0 1 1.62.43 1.7 1.7 0 0 1 .69 1.06 2.41 2.41 0 0 1-.3 1.65 3.09 3.09 0 0 1-1.38 1.29 1.85 1.85 0 0 1 .9.99 2.29 2.29 0 0 1 .05 1.34 3.25 3.25 0 0 1-1.1 1.74 3.43 3.43 0 0 1-2.21.77z"/><path d="m34 13.65 1.05-2.57.05 2.57zm3.56-5.51h-4.32l-1.37 2.65h.7l-3.24 6.6h3.14l.65-1.6h1.93l.05 1.6H38zm-7 3.48 1.4-2.52-1.9-1.01-.25.31c-1.02-.55-6.38.21-6.72 5.6.2 4.53 5.17 3.71 5.66 3.43l1.37-2.89c-1.34.9-4.08 1.33-4.2-1.37.24-2.22 2.82-3.06 4.64-1.55z"/><path d="M34 13.64h1.09l-.05-2.52zm1.1.02h-1.12v-.01l1.06-2.57h.02zm0 3.72H38l-.44-9.23h-4.3l-1.37 2.63h.7l-3.24 6.6h3.13l.64-1.6h1.95v.02zm2.9.02h-2.91v-.01l-.05-1.59h-1.92l-.64 1.6h-3.16v-.01l3.24-6.6h-.7l1.38-2.66h4.32zm-9.05-9.14a4.87 4.87 0 0 0-.65.04 6.46 6.46 0 0 0-2.29.78A5.76 5.76 0 0 0 23.1 14a3.47 3.47 0 0 0 1.7 3.12 4.94 4.94 0 0 0 2.45.54 4.19 4.19 0 0 0 1.5-.24l1.35-2.86a4.33 4.33 0 0 1-1.56.62 2.63 2.63 0 0 1-1.65-.17 1.64 1.64 0 0 1-.68-.66 2.6 2.6 0 0 1-.3-1.18 2.6 2.6 0 0 1 .51-1.31 2.5 2.5 0 0 1 1.04-.8 3.04 3.04 0 0 1 3.1.55l1.39-2.5-1.89-1.01-.25.31a1.96 1.96 0 0 0-.86-.15zm-1.8 9.42a4.89 4.89 0 0 1-2.35-.54A3.49 3.49 0 0 1 23.08 14a5.77 5.77 0 0 1 2.93-4.93 6.47 6.47 0 0 1 2.29-.78 2.9 2.9 0 0 1 1.51.1l.25-.3 1.9 1v.01l-1.4 2.53a3.03 3.03 0 0 0-3.1-.55 2.5 2.5 0 0 0-1.03.78 2.6 2.6 0 0 0-.5 1.31 2.6 2.6 0 0 0 .3 1.18 1.62 1.62 0 0 0 .67.65 2.62 2.62 0 0 0 1.64.17 4.3 4.3 0 0 0 1.57-.63l.03-.02-1.38 2.91a4.18 4.18 0 0 1-1.51.25zM9.1 17.25l.04.24a.13.13 0 0 0 .14-.17c-.02-.1-.11-.09-.18-.07zm-2.9-.55-.06.22c.09 0 .18.07.24-.06 0-.08 0-.15-.18-.16zm3.01.2c-.01-.06-.06-.11-.2-.07l.05.24c.1-.02.16-.09.15-.17zm-1.33 0-.04.24c.09-.01.19.06.23-.1 0-.13-.1-.14-.2-.14zm2.75.05.16-.05-.18-.26z"/><path d="M8.53 12.75c.82-2.35 2.69-1.94 3.1-.88.57 2.12-1.26 1.54-2.43 2.4a1.89 1.89 0 0 0-.68 1.54h-.2a10.11 10.11 0 0 1 .2-3.06zm.94 4.56c0 .13-.04.22-.12.25l-.37.08-.15-.9c.08-.02.45-.16.54.1a.25.25 0 0 1-.06.27.25.25 0 0 1 .16.2zm.33-.46.08.44c.05.1.09.08.16.07.1-.07.07-.13.06-.21l.15-.03c.04.32-.1.35-.21.37-.24.02-.28-.03-.35-.34-.03-.27-.1-.55.12-.6.36-.05.34.11.37.23l-.15.03c-.03-.1-.06-.14-.14-.14a.15.15 0 0 0-.09.18zm-.96-1.05h-.18c.15-2.1 2.73-1.64 2.97-2.37a1.19 1.19 0 0 1-.17 1.64c-1.06.77-2.07-.57-2.62.73zm1.83 1.5-.16.06-.05-.95.19-.05.45.79-.12.08-.15-.22-.18.06zm-2.5-1.5h-.23a10.4 10.4 0 0 0-.29-3.4c-.32-.84-1.12-1.22-1.3-1.89a1.75 1.75 0 0 1 1.81-2.3 1.74 1.74 0 0 1 1.6 2.28c-.41 1.02-.82.88-1.34 1.9a9.79 9.79 0 0 0-.26 3.4zm-.34 1.48-.03.4h-.14l.05-.95c.34.01.53.06.52.3-.02.33-.28.26-.4.25zm-2.47-.75a1.13 1.13 0 0 0-.15.45c-.02.19.16.15.2.13.03-.02.06-.17.06-.17l-.12-.04.04-.12.27.1-.13.45-.11-.03v-.07c-.13.06-.37.02-.4-.14a1.19 1.19 0 0 1 .2-.7c.14-.18.47 0 .48.1a.66.66 0 0 1-.03.23l-.13-.03.02-.1c.01-.06-.15-.12-.2-.06zm1.05 1-.16-.04c.02-.14.18-.42-.14-.42l-.1.37-.17-.03.19-.9c.48.05.52.19.53.34-.02.1-.05.19-.15.2.12.1 0 .32 0 .48zm.78-.17.08-.66.15.01-.07.72a.3.3 0 0 1-.59-.02l.08-.75.17.02-.07.63c0 .2.21.2.25.05zm-2.75-3.93c.24.5 1.75.58 2.28.96a1.56 1.56 0 0 1 .7 1.4h-.19c-.38-1.2-1.47-.24-2.33-.57a1.21 1.21 0 0 1-.46-1.79zm3.34 2.36h-.17a2.2 2.2 0 0 0-.4-1.18c-1.1-1.4-3.35-.35-2.77-2.74.3-1.23 3.73-1.95 3.34 3.92zm4.83-7.53a9.97 9.97 0 0 0-9-.06 10.34 10.34 0 0 0 0 9.18 9.81 9.81 0 0 0 9.02.06 10.64 10.64 0 0 0-.02-9.18z"/></g></svg>
\ No newline at end of file
diff --git a/view/base/web/images/logos/doku_bni_va.svg b/view/base/web/images/logos/doku_bni_va.svg
new file mode 100644
index 0000000000..e0bb021e63
--- /dev/null
+++ b/view/base/web/images/logos/doku_bni_va.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40 26"><path fill="#fff" d="M-.02-.04h40.07v25.99H-.02z"/><path fill="#58595b" d="m2.45 18.15-.5 1.38h-.2l-.5-1.38v1.38h-.2V18h.37l.44 1.26L2.3 18h.36v1.53h-.21zm.72.88c-.01.2.07.38.27.38a.23.23 0 0 0 .26-.21h.21a.42.42 0 0 1-.47.36c-.34 0-.48-.24-.48-.56 0-.3.16-.57.5-.57a.45.45 0 0 1 .47.5v.1zm.54-.14c0-.18-.07-.31-.27-.31a.28.28 0 0 0-.27.31zm.52.64h.2V18h-.2zm1.21-.66c0-.19 0-.3-.22-.3a.18.18 0 0 0-.2.18H4.8c.01-.24.2-.32.4-.32.23 0 .44.06.44.36v.51l.01.23h-.13c-.02 0-.06.01-.06-.01l-.01-.15a.34.34 0 0 1-.34.2c-.18 0-.37-.1-.37-.31 0-.3.27-.39.52-.39zm-.2.14c-.12 0-.29.05-.29.2a.19.19 0 0 0 .21.2c.24 0 .29-.2.28-.4zm1.09.93h-.2l.16-.41-.45-1.07h.23l.33.84.34-.84h.22zm1.47-1.07c0-.19 0-.3-.22-.3a.18.18 0 0 0-.2.18h-.21c.01-.24.2-.32.4-.32.22 0 .44.06.44.36v.74h-.13c-.02 0-.05.01-.06-.01v-.15H7.8a.34.34 0 0 1-.33.2c-.19 0-.38-.1-.38-.31 0-.3.27-.39.52-.39zm-.2.14c-.12 0-.28.05-.28.2a.19.19 0 0 0 .2.2c.25 0 .3-.2.29-.4zm.96-.39a.4.4 0 0 1 .74.17v.74h-.2v-.67c0-.18-.08-.28-.25-.28a.28.28 0 0 0-.2.08c-.03.03-.08.08-.08.29v.58h-.2v-1.07h.2zm1.09-.41h.24V18h-.24zm.02 1.32h.2v-1.07h-.2zM12.1 18v1.53h-.26l-.78-1.3v1.3h-.2V18h.3l.75 1.27V18zm.53 1.03c-.01.2.06.38.27.38a.22.22 0 0 0 .26-.21h.21a.42.42 0 0 1-.47.36c-.35 0-.48-.24-.48-.56 0-.3.16-.57.5-.57a.45.45 0 0 1 .47.5v.1zm.54-.14c0-.18-.07-.31-.27-.31a.28.28 0 0 0-.27.31zm1.25-.43h.2a2 2 0 0 0 0 .2v.74c0 .4-.17.56-.56.56-.23 0-.4-.1-.4-.35h.21c.01.14.11.2.25.2.29 0 .29-.24.3-.48h-.01a.39.39 0 0 1-.35.18c-.33 0-.46-.23-.46-.53a.5.5 0 0 1 .5-.55.34.34 0 0 1 .28.14s.04.07.04.05zm-.3.9c.21 0 .3-.18.3-.39 0-.2-.09-.4-.3-.4-.24 0-.3.23-.3.4s.06.4.3.4m1-.34c-.02.2.06.38.26.38a.23.23 0 0 0 .26-.21h.21a.42.42 0 0 1-.47.36c-.34 0-.48-.24-.48-.56 0-.3.16-.57.5-.57a.45.45 0 0 1 .47.5v.1zm.54-.14c0-.18-.08-.31-.28-.31a.28.28 0 0 0-.26.31zm.72.64h-.2v-1.07h.2v.2a.3.3 0 0 1 .31-.21h.07v.19a.23.23 0 0 0-.08-.01c-.26 0-.3.14-.3.37zm.6-1.32h.24V18h-.24zm.02 1.32h.2v-1.07H17zm.64-.25h.24l-.24.52h-.14zm1.13.25V18H19v.66l.64-.66h.29l-.69.68.77.85h-.3l-.71-.82v.82zm1.55-.5c-.02.2.06.38.26.38a.22.22 0 0 0 .26-.21h.22a.42.42 0 0 1-.48.36c-.34 0-.48-.24-.48-.56 0-.3.16-.57.5-.57a.45.45 0 0 1 .47.5v.1zm.54-.14c0-.18-.08-.31-.28-.31a.28.28 0 0 0-.26.31zm.7.64h-.21l.01-.17V18h.2v.6a.35.35 0 0 1 .34-.17c.33 0 .48.28.48.57 0 .27-.13.56-.44.56a.37.37 0 0 1-.37-.2v.01zm.3-.95c-.22 0-.3.22-.3.42 0 .2.06.41.3.41.23 0 .3-.21.3-.41 0-.2-.05-.42-.3-.42m1.44.29c0-.19-.02-.3-.23-.3a.18.18 0 0 0-.2.18h-.22c.01-.24.2-.32.4-.32.23 0 .44.06.44.36v.51l.01.23h-.13c-.02 0-.06.01-.06-.01l-.01-.15a.34.34 0 0 1-.34.2c-.18 0-.37-.1-.37-.31 0-.3.27-.39.52-.39zm-.21.14c-.12 0-.29.05-.29.2a.2.2 0 0 0 .21.2c.24 0 .29-.2.28-.4zm.96-.39a.4.4 0 0 1 .73.17v.74h-.2v-.67c0-.18-.07-.28-.25-.28a.28.28 0 0 0-.2.08c-.02.03-.08.08-.08.29v.58h-.2v-1.07h.2zm1.84-.16h.2a1.86 1.86 0 0 0 0 .2v.74c0 .4-.18.56-.57.56-.23 0-.4-.1-.4-.35h.22c0 .14.1.2.25.2.28 0 .28-.24.3-.48h-.02a.39.39 0 0 1-.35.18c-.32 0-.45-.23-.45-.53a.5.5 0 0 1 .5-.55.35.35 0 0 1 .28.14s.03.07.03.05zm-.3.9c.21 0 .3-.18.3-.39 0-.2-.09-.4-.3-.4-.24 0-.3.23-.3.4s.06.4.3.4m1.6-.91h.2a1.38 1.38 0 0 0 0 .2v.74c0 .4-.18.56-.57.56-.23 0-.4-.1-.4-.35h.22c0 .14.1.2.25.2.29 0 .29-.24.3-.48h-.01a.4.4 0 0 1-.36.18c-.32 0-.45-.23-.45-.53a.5.5 0 0 1 .5-.55.35.35 0 0 1 .28.14s.03.07.03.05zm-.31.9c.22 0 .3-.18.3-.39 0-.2-.08-.4-.3-.4-.23 0-.3.23-.3.4s.07.4.3.4m1.49-.5c0-.19 0-.3-.22-.3a.18.18 0 0 0-.2.18h-.21c0-.24.19-.32.4-.32.22 0 .44.06.44.36v.74h-.13c-.02 0-.06.01-.06-.01l-.01-.15a.34.34 0 0 1-.34.2c-.18 0-.37-.1-.37-.31 0-.3.27-.39.52-.39zm-.2.14c-.12 0-.29.05-.29.2a.19.19 0 0 0 .22.2c.23 0 .28-.2.27-.4zm1.39-.14c0-.19-.02-.3-.23-.3a.18.18 0 0 0-.2.18h-.21c0-.24.2-.32.4-.32.22 0 .44.06.44.36v.74h-.13c-.02 0-.05.01-.06-.01v-.15h-.01a.34.34 0 0 1-.33.2c-.19 0-.38-.1-.38-.31 0-.3.27-.39.52-.39zm-.2.14c-.13 0-.3.05-.3.2a.19.19 0 0 0 .22.2c.24 0 .28-.2.28-.4zm.95-.39a.4.4 0 0 1 .73.17v.74h-.2v-.67c0-.18-.07-.28-.24-.28a.29.29 0 0 0-.2.08c-.03.03-.08.08-.08.29v.58h-.2v-1.07h.2zm1.71.91V18h.55c.26 0 .5.1.5.4a.35.35 0 0 1-.27.32.38.38 0 0 1 .3.4.4.4 0 0 1-.27.38.7.7 0 0 1-.26.03zm.21-.89h.26c.2 0 .35-.03.35-.23s-.15-.24-.35-.23h-.26zm0 .7h.36c.16 0 .3-.06.3-.25s-.14-.27-.3-.27h-.36zm1.82-.47c0-.19-.01-.3-.23-.3a.18.18 0 0 0-.2.18h-.21c.01-.24.2-.32.4-.32.22 0 .44.06.44.36v.74h-.13c-.02 0-.05.01-.06-.01v-.15h-.01a.34.34 0 0 1-.33.2c-.19 0-.37-.1-.37-.31 0-.3.26-.39.51-.39zm-.2.14c-.13 0-.29.05-.29.2a.19.19 0 0 0 .2.2c.25 0 .3-.2.29-.4zm.95-.39h.01a.4.4 0 0 1 .73.17v.74h-.2v-.67c0-.18-.08-.28-.25-.28a.28.28 0 0 0-.2.08c-.02.03-.08.08-.08.29v.58h-.2v-1.07h.2zm1.84-.16h.21l-.01.2v.74c0 .4-.17.56-.56.56-.23 0-.4-.1-.4-.35h.21c.01.14.11.2.25.2.29 0 .29-.24.3-.48h-.01a.39.39 0 0 1-.35.18c-.33 0-.46-.23-.46-.53a.5.5 0 0 1 .5-.55.34.34 0 0 1 .28.14s.04.07.04.05zm-.3.9c.22 0 .3-.18.3-.39 0-.2-.08-.4-.3-.4-.24 0-.3.23-.3.4s.06.4.3.4m1.21-.94c.2 0 .43.09.41.33h-.21c0-.14-.1-.18-.21-.18-.11 0-.2.05-.2.17 0 .11.18.12.26.15.18.06.39.08.39.32 0 .26-.26.34-.47.34-.23 0-.42-.1-.41-.35h.21a.2.2 0 0 0 .22.2c.12 0 .24-.04.24-.18 0-.24-.65-.06-.65-.48 0-.22.22-.32.42-.32m1.35.44c0-.19-.02-.3-.23-.3a.18.18 0 0 0-.2.18h-.21c0-.24.19-.32.4-.32.22 0 .44.06.44.36v.74h-.13c-.02 0-.06.01-.06-.01l-.01-.15a.34.34 0 0 1-.34.2c-.18 0-.37-.1-.37-.31 0-.3.27-.39.52-.39zm-.2.14c-.13 0-.3.05-.3.2a.19.19 0 0 0 .21.2c.24 0 .29-.2.28-.4z"/><path fill="#fff" d="M11.35 16.5H.9V6.04h10.45z"/><g fill="#f15a22"><path d="m5.1 13.1 1.12-.9c-.2-.23-.37-.47-.54-.71-1.28-1.87-2.05-3.77-1.5-5.45H.9v1.82zm1.76-2.7a3.52 3.52 0 0 1 1.33-2.55 3.13 3.13 0 0 1 3.16-.4v-1.4h-5.8a5.53 5.53 0 0 0 1.3 4.34"/><path d="M8.27 8.69c-1.1.89-.83 2.28.19 3.53.78.96 1.83 1.64 2.9 1.12v-4.1c-.96-.99-2.12-1.35-3.1-.55"/></g><path fill="#f15a22" d="M.9 10v6.5l3.16-2.56zm5.75 2.72-1.12.91.41.52c.6.74 1.46 2.03 2.54 1.68l.04.05-.76.62h3.6v-2.47c-1.86 1-3.45.09-4.7-1.31M4.91 15l-.42-.53-2.54 2.03h4.03A8.12 8.12 0 0 0 4.91 15"/><path fill="#006885" d="M20.06 10.41a1.97 1.97 0 0 0 1.6-2.06c0-1.42-1.23-2.3-3.33-2.3H14.2v.04c.84.47.82 1.22.82 1.93v6.49c0 .73.02 1.48-.82 1.94v.05h2c1.95 0 3.44.03 4.56-.5a3.05 3.05 0 0 0 1.9-2.77 2.92 2.92 0 0 0-2.59-2.82m-3.42-3.4 1.31.02c.98 0 1.97.48 1.97 1.57 0 1.3-.88 1.65-2.13 1.65h-1.15V7.02zm1.27 8.41h-1.27v-4.18H18c1.59 0 2.9.59 2.9 2.13 0 1.5-1.38 2.05-3 2.05m7.94-.92c0 .9-.02 1.53.82 2.03v.04h-2.81v-.04c.84-.5.83-1.13.83-2.02V8.15c0-.88.01-1.58-.83-2.06v-.05h2.34v.02a1.34 1.34 0 0 0 .23.4l.23.31L32 14V8.1c0-.89.01-1.52-.83-2v-.05h2.8v.05c-.83.48-.83 1.11-.83 2v9a10.33 10.33 0 0 1-2.94-2.75L25.84 8.5zm10.74-6.56c0-.73-.01-1.38-.83-1.85v-.05h3.3v.05c-.82.45-.83 1.13-.83 1.85v6.68c0 .71-.02 1.44.82 1.9v.05h-3.29v-.05c.85-.47.83-1.18.83-1.9z"/></svg>
\ No newline at end of file
diff --git a/view/base/web/images/logos/doku_bri_va.svg b/view/base/web/images/logos/doku_bri_va.svg
new file mode 100644
index 0000000000..30951b99a2
--- /dev/null
+++ b/view/base/web/images/logos/doku_bri_va.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40 26"><path fill="#fff" d="M0 0h40v26H0z"/><path fill="#1e327f" d="M22.5 20.44h-1.21l-1.26 1.75v-1.75h-1.08v4.06h1.08v-1.88l1.27 1.88h1.35L21 22.3l1.49-1.86zM8.83 22.41a1.1 1.1 0 0 0 .57-.33.88.88 0 0 0 .2-.59.9.9 0 0 0-.38-.78 1.9 1.9 0 0 0-1.1-.27H6.44v4.06h1.58a2.28 2.28 0 0 0 1.26-.28.95.95 0 0 0 .4-.84.92.92 0 0 0-.22-.64 1.1 1.1 0 0 0-.64-.33zm-1.32-1.24h.38a.82.82 0 0 1 .47.11.37.37 0 0 1 .16.33.4.4 0 0 1-.17.35.92.92 0 0 1-.51.12h-.33zm.93 2.46a.85.85 0 0 1-.5.12H7.5v-.95H8a.78.78 0 0 1 .46.12.41.41 0 0 1 .16.35.42.42 0 0 1-.17.36zm8.76-.89q0 .2.03.46.02.25.07.55l-.17-.53q-.07-.21-.14-.35l-1.18-2.43h-1.35v4.06h.98v-2.14q0-.23-.03-.54l-.08-.66q.06.24.13.44a3.4 3.4 0 0 0 .15.38l1.22 2.52h1.35v-4.06h-.98zm-5.82-2.3L9.85 24.5h1.07l.3-.86h1.56l.29.86h1.16l-1.54-4.06zm.11 2.43.53-1.52.5 1.52zm19.53-.38a1.02 1.02 0 0 0 .6-.34 1 1 0 0 0 .2-.65.9.9 0 0 0-.39-.8 2.18 2.18 0 0 0-1.2-.26h-1.6v4.06h1.05v-1.58h.16a.82.82 0 0 1 .46.1.69.69 0 0 1 .23.37l.36 1.11h1.13l-.48-1.35a1 1 0 0 0-.52-.66zm-.43-.42a.9.9 0 0 1-.53.13h-.38v-1.05h.27a1.15 1.15 0 0 1 .62.13.45.45 0 0 1 .2.4.44.44 0 0 1-.18.39zM25.84 1.5H14.18a2.35 2.35 0 0 0-2.35 2.35V15.5a2.35 2.35 0 0 0 2.35 2.34h11.66a2.35 2.35 0 0 0 2.34-2.34V3.85a2.35 2.35 0 0 0-2.34-2.35zM15.83 16.25h-1.15A1.25 1.25 0 0 1 13.43 15V4.36a1.25 1.25 0 0 1 1.25-1.25h1.43c1.88 0 3.27 1.9 2.07 3.1l-3.49 3.5 3 3.13c1.45 1.52-.25 3.41-1.86 3.41zm2.81 0c1.46 0 2.37-2.45.82-4.07l-2.38-2.47 2.77-2.85a2.26 2.26 0 0 0-.64-3.75h1.2c1.89 0 3.28 1.9 2.07 3.1L19 9.72l6.4 6.54zM21.4 9.7l2.76-2.85a2.26 2.26 0 0 0-.63-3.75h1.8a1.25 1.25 0 0 1 1.26 1.25V15zm11.07 10.74h1.08v4.06h-1.08zm-5.35 1.97a1.1 1.1 0 0 0 .56-.33.88.88 0 0 0 .2-.59.9.9 0 0 0-.37-.78 1.9 1.9 0 0 0-1.11-.27h-1.66v4.06h1.58a2.28 2.28 0 0 0 1.26-.28.95.95 0 0 0 .4-.84.92.92 0 0 0-.22-.64 1.1 1.1 0 0 0-.64-.33zm-1.32-1.24h.38a.82.82 0 0 1 .47.11.37.37 0 0 1 .16.33.4.4 0 0 1-.17.35.92.92 0 0 1-.51.12h-.33zm.93 2.46a.85.85 0 0 1-.5.12h-.43v-.95h.47a.78.78 0 0 1 .47.12.41.41 0 0 1 .16.35.42.42 0 0 1-.17.36z"/></svg>
\ No newline at end of file
diff --git a/view/base/web/images/logos/doku_cimb_va.svg b/view/base/web/images/logos/doku_cimb_va.svg
new file mode 100644
index 0000000000..46e66acab1
--- /dev/null
+++ b/view/base/web/images/logos/doku_cimb_va.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40 26"><path fill="#e9332f" d="M0 0h40v26H0z"/><path fill="#fff" d="M12.88 15.48h13.38V1.9H12.88v13.6z"/><path fill="#eb3934" d="M21.88 4.6h-7.11l3.15 4.23h7.11L21.89 4.6z"/><path fill="#801327" d="M25.04 8.83h-7.12l-3.15 4.23h7.11z"/><path fill="#fff" d="M28.58 22.7H27.4v-1.42h1.18a.71.71 0 1 1 0 1.43zm-1.18-3.86h1.1a.67.67 0 1 1 0 1.33h-1.1zm2.35 1.86a1.43 1.43 0 0 0 .7-1.24 1.66 1.66 0 0 0-1.86-1.72h-2.4v6.07h2.5a1.67 1.67 0 0 0 1.84-1.76 1.43 1.43 0 0 0-.78-1.35zm-8.26.92-2.1-3.9H18.2v6.07h1.2v-3.62l2.1 3.67 2.07-3.67v3.62h1.2v-6.06H23.6l-2.1 3.89zm-5.97 2.19h1.2v-6.07h-1.2zm-2-1.47a1.94 1.94 0 0 1-3.17-1.57 1.95 1.95 0 0 1 1.94-2 1.93 1.93 0 0 1 1.23.43l.01.02.85-.86-.02-.02a3.13 3.13 0 0 0-2.07-.78 3.21 3.21 0 0 0 0 6.42 3.13 3.13 0 0 0 2.07-.78l.02-.02-.85-.85z"/></svg>
\ No newline at end of file
diff --git a/view/base/web/images/logos/doku_danamon_va.svg b/view/base/web/images/logos/doku_danamon_va.svg
new file mode 100644
index 0000000000..b5ee7fdfe5
--- /dev/null
+++ b/view/base/web/images/logos/doku_danamon_va.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40 26"><path fill="#fff" d="M-.23-.28h40.44v26.56H-.23z"/><path fill="#046148" d="M2.74 14.26h.39a.68.68 0 0 1 .6.25 1.66 1.66 0 0 1 .3 1.08 3.3 3.3 0 0 1-.04.62.94.94 0 0 1-1.08.85h-.17zm.44 3.28c1.16 0 1.69-.52 1.69-1.93a2.22 2.22 0 0 0-.46-1.4 1.54 1.54 0 0 0-1.23-.43h-1.3v3.76zm3.67-.97a.52.52 0 0 1-.13.41.5.5 0 0 1-.33.1.32.32 0 0 1-.34-.23.73.73 0 0 1-.02-.17.43.43 0 0 1 .39-.44 2.88 2.88 0 0 1 .43-.05zm0-.72-.42.04a1.67 1.67 0 0 0-.83.22.72.72 0 0 0-.32.63.81.81 0 0 0 .19.57.75.75 0 0 0 .57.22 1.16 1.16 0 0 0 .78-.24v.17h.71v-1.78a.82.82 0 0 0-.22-.68.69.69 0 0 0-.39-.18 1.68 1.68 0 0 0-.38-.04c-.47 0-.84.09-1.04.45a.84.84 0 0 0-.08.44h.65a.61.61 0 0 1 .09-.35.38.38 0 0 1 .32-.14.36.36 0 0 1 .32.14.65.65 0 0 1 .05.32v.2zm5.65.72a.51.51 0 0 1-.14.41.5.5 0 0 1-.32.1.31.31 0 0 1-.34-.23.71.71 0 0 1-.02-.17.43.43 0 0 1 .39-.44 2.87 2.87 0 0 1 .43-.05zm0-.72-.42.04a1.67 1.67 0 0 0-.83.22.73.73 0 0 0-.32.63.82.82 0 0 0 .18.57.75.75 0 0 0 .58.22 1.16 1.16 0 0 0 .78-.24v.17h.71v-1.78a.83.83 0 0 0-.22-.68.7.7 0 0 0-.4-.18 1.69 1.69 0 0 0-.37-.04c-.48 0-.84.09-1.04.45a.85.85 0 0 0-.08.44h.64a.6.6 0 0 1 .1-.35.38.38 0 0 1 .32-.14.36.36 0 0 1 .32.14.68.68 0 0 1 .05.32v.2zm10.69 1.61h-.74v-1.6l-.01-.27a.34.34 0 0 0-.35-.35.54.54 0 0 0-.2.04.4.4 0 0 0-.24.42v1.76h-.74v-2.6h.74v.29a1 1 0 0 1 .77-.35.74.74 0 0 1 .6.22.9.9 0 0 1 .17.61zm-12.8 0h-.74v-1.6a1.95 1.95 0 0 0-.01-.27.33.33 0 0 0-.36-.35.53.53 0 0 0-.2.04.4.4 0 0 0-.23.42v1.76H8.1v-2.6h.74v.29a1.01 1.01 0 0 1 .77-.35.75.75 0 0 1 .6.22.9.9 0 0 1 .17.61v1.83zm3.33-2.61h.75v.3a1.18 1.18 0 0 1 .83-.35.65.65 0 0 1 .69.4 1.07 1.07 0 0 1 .8-.4.91.91 0 0 1 .33.05.7.7 0 0 1 .41.74v1.87h-.75v-1.7a.77.77 0 0 0-.06-.37.3.3 0 0 0-.27-.15.64.64 0 0 0-.24.04.4.4 0 0 0-.22.41v1.77h-.74v-1.7c0-.2 0-.52-.33-.52a.7.7 0 0 0-.27.05c-.18.12-.19.28-.18.52v1.65h-.75zm6 1.25a4.03 4.03 0 0 1-.02.43.67.67 0 0 1-.27.56.46.46 0 0 1-.2.05c-.42 0-.45-.45-.46-.6a4.47 4.47 0 0 1 0-.78.66.66 0 0 1 .26-.53.48.48 0 0 1 .23-.05c.4 0 .43.42.44.58zm.75.01a1.45 1.45 0 0 0-.25-.96 1.14 1.14 0 0 0-.92-.37 1.35 1.35 0 0 0-.93.3 1.46 1.46 0 0 0-.37 1.14 1.11 1.11 0 0 0 .76 1.24 1.37 1.37 0 0 0 .47.07 1.21 1.21 0 0 0 .95-.37 1.56 1.56 0 0 0 .3-1.05"/><path fill="#ef9826" d="M7.62 11.12h6.85L8.4 9.25l-.77.42-2.63.68z"/><path fill="#eb712d" d="M1.89 8.46v2.66h5.73V9.67z"/><path fill="#fec02b" d="M14.48 11.12 7.62 8.46v1.2z"/><path fill="#ef9826" d="M38.11 16.12v-5h-9.23l-1.92 1.38 1.92 1.67z"/><path fill="#fec02b" d="M28.88 14.17 26.37 12l-11.9-.88 14.4 5z"/><path fill="#eb712d" d="m14.48 11.12 14.4 3.05v-3.05z"/></svg>
\ No newline at end of file
diff --git a/view/base/web/images/logos/doku_indomaret.svg b/view/base/web/images/logos/doku_indomaret.svg
new file mode 100644
index 0000000000..8d792a9560
--- /dev/null
+++ b/view/base/web/images/logos/doku_indomaret.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40 26"><path fill="#fff" d="M1.3 6.09a.8.8 0 0 0-.8.8v12.22a.8.8 0 0 0 .8.8h37.4a.8.8 0 0 0 .8-.8V6.89a.8.8 0 0 0-.8-.8H1.3z"/><path fill="#d51c24" d="M2.04 6.88a.9.9 0 0 0-.9.9v2.92h37.72V7.78a.9.9 0 0 0-.9-.9z"/><path fill="#ffce21" d="M1.14 15.3v2.92a.9.9 0 0 0 .9.9h35.92a.9.9 0 0 0 .9-.9V15.3z"/><path fill="#006ab3" d="M1.14 11.09v3.82h37.72V11.1z"/><path fill="#fff" d="M20.02 7.49A42.84 42.84 0 0 0 6.85 9.42a1.56 1.56 0 0 0-1.17 1.4v4.36a1.58 1.58 0 0 0 1.25 1.44 45 45 0 0 0 13.09 1.93 46.12 46.12 0 0 0 13.07-1.91c.92-.37 1.24-.88 1.25-1.46v-4.32A1.6 1.6 0 0 0 33.1 9.4a41.59 41.59 0 0 0-13.07-1.91z"/><path fill="#d51c24" d="M20.02 8.2a43.57 43.57 0 0 0-12.88 1.9c-.52.16-.73.5-.73.77v4.32c0 .26.21.6.73.77a44.8 44.8 0 0 0 12.88 1.88 45.5 45.5 0 0 0 12.87-1.88c.52-.16.73-.5.73-.77v-4.32c0-.27-.21-.61-.73-.77a45.5 45.5 0 0 0-12.87-1.88zm0 1.13a54.9 54.9 0 0 1 12.16 1.33.84.84 0 0 1 .7.7v3.31a.73.73 0 0 1-.63.67 60.5 60.5 0 0 1-12.23 1.36A52.18 52.18 0 0 1 7.8 15.35a.8.8 0 0 1-.66-.78v-3.2a.84.84 0 0 1 .7-.7 57.65 57.65 0 0 1 12.17-1.34z"/><path fill="#006ab3" d="m12.45 10.67-1.74.3c-.32.1-1.62.3-1.56 1.3a.88.88 0 0 0 .85.78.72.72 0 0 0 .63-.49s-.55-.02-.55-.5c0-.29.34-.44.64-.54a8.67 8.67 0 0 1 .86-.21l-.78 1.92a1.6 1.6 0 0 1-1.46 1.15.93.93 0 0 1-.88-.78.75.75 0 0 0-.38.59c0 .36.61.77 1.2.77a1.8 1.8 0 0 0 1.23-.4l1.16-.95c.32-.22.43-.22.49-.2s.14.11.03.3l-.45 1.24h.72l.52-1.31c.1-.18.15-.26.27-.24s.11.14.07.28l-.22.58a.53.53 0 0 0 .15.64.38.38 0 0 0 .4-.04l.82-.41a.55.55 0 0 0 .6.5.76.76 0 0 0 .62-.25c-.01.17.07.25.2.25a.93.93 0 0 0 .35-.09l.95-.45a1.45 1.45 0 0 1-.11-.25l-.4.16c-.3.08-.3-.06-.24-.17l1.05-2.8h-.65l-.48 1.3a1.42 1.42 0 0 0-1.65.74 1.47 1.47 0 0 0-.25.77l-.3.14c-.27.15-.32-.05-.25-.2l.33-.86c.08-.26.07-.52-.1-.61-.21-.12-.54-.03-.95.33-.11-.37-.4-.52-.89-.24l-.87.54zm3.38 2.49a.16.16 0 0 1 .03 0c.22.03.07.47.02.55-.2.45-.47.67-.6.67-.31-.05.01-.66.07-.76.1-.18.3-.45.48-.46zm15.47-1.82-.45 1.24h-.33l-.22.56h.34l-.28.71a.87.87 0 0 1-.83.7c-.28 0-.48-.07-.55-.25 1.23-.63 1.31-1.67.5-1.73-.38 0-.76.27-1.08.82a1.21 1.21 0 0 0-.1.93c-.25.15-.42.25-.65.2-.11-.04-.13-.17-.05-.37a2.73 2.73 0 0 1 .36-.71l-.06-.37c-.37 0-.52-.08-.59-.2l.37-.36c-.07-.02-.18 0-.33-.03s-.2-.1-.32-.22l-.4.55a1.37 1.37 0 0 1-.4 1 1.56 1.56 0 0 1-.53.45c-.11.06-.3.12-.25-.08l.6-1.6h-.48a.26.26 0 0 0-.23.16.4.4 0 0 0-.34-.15 1.52 1.52 0 0 0-1.15.8 1.73 1.73 0 0 0-.31.77l-.35.17c-.26.15-.32-.04-.24-.18l.32-.87c.08-.26.08-.55-.1-.64-.18-.1-.45-.05-.88.32a.5.5 0 0 0-.42-.39 1.18 1.18 0 0 0-.77.37c.04-.22-.05-.36-.22-.36a1.03 1.03 0 0 0-.45.13l-.82.34a1.45 1.45 0 0 1 .1.3l.64-.2-.66 1.8h.72l.5-1.27c.07-.22.22-.3.31-.28s.1.15.03.32l-.47 1.23h.78l.48-1.27c.1-.2.17-.28.3-.28s.1.17.06.28l-.22.6c-.1.47.06.81.57.58l.81-.42a.62.62 0 0 0 .6.5.78.78 0 0 0 .62-.24c.03.18.1.25.3.25a1.6 1.6 0 0 0 .65-.26 3.25 3.25 0 0 0 1.02-1.08c.09-.15.25-.28.36-.25s.07.16.04.22a3.75 3.75 0 0 0-.3.65c-.09.33-.11.72.6.72a1.82 1.82 0 0 0 .99-.36.97.97 0 0 0 .78.36 1.7 1.7 0 0 0 .95-.27.64.64 0 0 0 .6.27 1.44 1.44 0 0 0 .71-.2 2.72 2.72 0 0 0 .43-.36.22.22 0 0 0-.23-.12.98.98 0 0 1-.64.28c-.2-.02-.16-.17-.11-.44l.36-.97h.33l.21-.56h-.33l.46-1.24zm-1.9 1.75h.01c.14.04-.03.31-.11.39-.2.2-.28.32-.4.3-.13-.03.07-.36.18-.46.08-.1.23-.23.32-.23zm-4.45.07c.22.03.06.46.02.55-.2.45-.46.67-.6.67-.27 0-.08-.52.07-.76.12-.21.33-.47.5-.46z"/><path fill="#d51c24" d="M18.38 12.28A1.4 1.4 0 0 0 17 13.7a1.38 1.38 0 1 0 2.76 0 1.4 1.4 0 0 0-1.38-1.42zm0 .19a1.22 1.22 0 0 1 1.2 1.23 1.22 1.22 0 0 1-1.2 1.24 1.22 1.22 0 0 1-1.2-1.24 1.22 1.22 0 0 1 1.2-1.23zm0 .14a1.07 1.07 0 0 0-1.05 1.1 1.06 1.06 0 1 0 2.1 0 1.07 1.07 0 0 0-1.05-1.1zm0 .2a.89.89 0 0 1 .87.9.89.89 0 0 1-.87.9.89.89 0 0 1-.87-.9.89.89 0 0 1 .87-.9zm0 .14a.74.74 0 0 0-.73.75.73.73 0 1 0 .73-.75zm0 .19a.56.56 0 0 1 .55.56.56.56 0 0 1-.55.57.57.57 0 0 1 0-1.13z"/></svg>
\ No newline at end of file
diff --git a/view/base/web/images/logos/doku_mandiri_va.svg b/view/base/web/images/logos/doku_mandiri_va.svg
new file mode 100644
index 0000000000..c223e79269
--- /dev/null
+++ b/view/base/web/images/logos/doku_mandiri_va.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40 26"><defs><mask id="a" width="43.34" height="27.34" x="-1.41" y="-1.11" maskUnits="userSpaceOnUse"><rect width="43.34" height="27.34" x="-1.41" y="-1.11" fill="#fff" rx="2.67" ry="2.67"/></mask><mask id="b" width="3.9" height="4.73" x="9.82" y="13.31" maskUnits="userSpaceOnUse"><path fill="#fff" d="M9.82 18.04h3.9V13.3h-3.9v4.72z"/></mask><mask id="c" width="4.5" height="6.44" x="19.04" y="11.59" maskUnits="userSpaceOnUse"><path fill="#fff" d="M19.04 18.04h4.5v-6.45h-4.5v6.45z"/></mask><mask id="d" width="35.96" height="10.48" x="2.59" y="7.55" maskUnits="userSpaceOnUse"><path fill="#fff" d="M2.6 18.04h35.95V7.55H2.6v10.48z"/></mask><linearGradient id="e" x1="-1038.23" x2="-1038.84" y1="-1219.54" y2="-1220.05" gradientTransform="matrix(33.04985 0 0 -6.89329 34352.26 -8398.69)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#f8a731"/><stop offset=".41" stop-color="#fdc730"/><stop offset=".68" stop-color="#f8a831"/><stop offset="1" stop-color="#fdc630"/></linearGradient></defs><path fill="#093f6d" d="M0 0h40v26H0z"/><g mask="url(#a)"><path fill="#fff" d="M2.63 14.76c0-.52 0-.96-.04-1.35h.99l.05.67h.02a1.57 1.57 0 0 1 1.4-.77 1.3 1.3 0 0 1 1.25.83h.02a1.72 1.72 0 0 1 .56-.56 1.52 1.52 0 0 1 .91-.27c.75 0 1.52.5 1.52 1.96v2.66H8.19v-2.5c0-.75-.26-1.2-.8-1.2a.87.87 0 0 0-.8.61 1.61 1.61 0 0 0-.06.38v2.71H5.4v-2.62c0-.63-.25-1.07-.78-1.07a.9.9 0 0 0-.82.65.97.97 0 0 0-.06.37v2.67H2.63v-3.17z"/><g mask="url(#b)"><path fill="#fff" d="M13.65 16.85a7.24 7.24 0 0 0 .07 1.08h-1.04l-.07-.5h-.03a1.68 1.68 0 0 1-1.34.6 1.34 1.34 0 0 1-1.42-1.34c0-1.14 1.01-1.72 2.69-1.71v-.07c0-.3-.12-.8-.92-.8a2.4 2.4 0 0 0-1.22.34l-.22-.74a3.26 3.26 0 0 1 1.63-.4 1.7 1.7 0 0 1 1.87 1.9zm-1.11-1.13c-.81-.02-1.58.16-1.58.85a.6.6 0 0 0 .65.65.93.93 0 0 0 .89-.62.83.83 0 0 0 .04-.25z"/></g><path fill="#fff" d="M14.44 14.76c0-.52 0-.96-.03-1.35h1l.05.68h.03a1.63 1.63 0 0 1 1.44-.78c.8 0 1.61.5 1.61 1.94v2.68H17.4v-2.55c0-.65-.24-1.14-.87-1.14a.96.96 0 0 0-.89.67 1.18 1.18 0 0 0-.04.37v2.65h-1.16z"/><g mask="url(#c)"><path fill="#fff" d="M23.5 11.6v5.06c0 .46.02.97.04 1.27H22.5l-.04-.71h-.02a1.63 1.63 0 0 1-1.48.82 2.07 2.07 0 0 1-1.93-2.32 2.15 2.15 0 0 1 2.02-2.41 1.44 1.44 0 0 1 1.28.6h.02v-2.32zm-1.14 3.7a1.67 1.67 0 0 0-.03-.3 1 1 0 0 0-.99-.8c-.73 0-1.14.64-1.14 1.49 0 .82.4 1.43 1.13 1.43a1 1 0 0 0 .99-.81 1.29 1.29 0 0 0 .04-.34z"/></g><g mask="url(#d)"><path fill="#fff" d="M24.3 17.93h1.16v-4.52h-1.15v4.52z"/></g><g mask="url(#d)"><path fill="#fff" d="M26.27 14.87c0-.61 0-1.05-.04-1.46h1l.03.86h.04a1.24 1.24 0 0 1 1.24-.86 1.27 1.27 0 0 1 .27 0v1a1.6 1.6 0 0 0-.34-.03 1 1 0 0 0-1.02.86 2.01 2.01 0 0 0-.04.35v2.34h-1.14z"/></g><g mask="url(#d)"><path fill="#fff" d="M29.34 17.93h1.15v-4.52h-1.15v4.52z"/></g><g mask="url(#d)"><path fill="url(#e)" d="M37.6 8.63c-.56-.64-1.17-.35-1.65-.11-.2.1-.93.58-1.66.92a1.42 1.42 0 0 1-1.67-.33l-.75-.92a1.86 1.86 0 0 0-1.45-.64 2.72 2.72 0 0 0-1.35.4l-2.94 1.68a1.43 1.43 0 0 1-1.72-.39l-.67-.83a1.7 1.7 0 0 0-1.35-.66 2.97 2.97 0 0 0-1.47.37L18 9.78l-1.49.86.77.94a1.52 1.52 0 0 0 1.88.4l2.62-1.52a3.03 3.03 0 0 1 2.57-.39 3.07 3.07 0 0 1 .97.77l.7.85a.89.89 0 0 0 .89.25 1.45 1.45 0 0 0 .51-.2l2.53-1.47a3.43 3.43 0 0 1 1.91-.52c1.18.1 1.54.93 2.06 1.5a1.22 1.22 0 0 0 .98.52 1.49 1.49 0 0 0 .63-.2l3.02-1.74a12.78 12.78 0 0 0-.94-1.2"/></g></g></svg>
\ No newline at end of file
diff --git a/view/base/web/images/logos/doku_permata_lite_atm.svg b/view/base/web/images/logos/doku_permata_lite_atm.svg
new file mode 100644
index 0000000000..d9747002da
--- /dev/null
+++ b/view/base/web/images/logos/doku_permata_lite_atm.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40 26"><mask id="a" width="36.23" height="9.42" x="2.42" y="8.28" maskUnits="userSpaceOnUse"><path fill="#fff" d="M2.42 17.7h36.22V8.3H2.42v9.42z"/></mask><mask id="b" width="3.76" height="5.32" x="30.67" y="10.23" maskUnits="userSpaceOnUse"><path fill="#fff" d="m30.69 11.22-.01.18 3.53 4.12.12.02h.02l.06-.12-1.5-5.01-.26-.18z"/></mask><mask id="c" width="4.01" height="7.05" x="34.63" y="10.13" maskUnits="userSpaceOnUse"><path fill="#fff" d="m36.15 10.24-1.5 6.78.05.13.02.01.17-.04 3.74-5.65v-.3l-2.28-1.04z"/></mask><mask id="d" width="3.21" height="4.91" x="32.86" y="8.32" maskUnits="userSpaceOnUse"><path fill="#fff" d="m32.96 8.36-.1.17 1.62 4.63.1.06.09-.05 1.4-4.65-.2-.2z"/></mask><path fill="#fff" d="M0 0h40v26H0z"/><g mask="url(#a)"><path fill="#3a3a3a" d="M21.49 16.82V13.9a.22.22 0 0 0-.02-.05.19.19 0 0 0-.11-.12.66.66 0 0 0-.24-.03v-.08h1.34a3.38 3.38 0 0 1 .52.04 1.5 1.5 0 0 1 .38.1.68.68 0 0 1 .42.67c0 .45-.3.74-.91.81l-.1.02a2.48 2.48 0 0 1 .4.07 1.08 1.08 0 0 1 .26.1.81.81 0 0 1 .49.78.83.83 0 0 1-.65.86 2.21 2.21 0 0 1-.36.07 4.54 4.54 0 0 1-.48.02h-1.3v-.08a.42.42 0 0 0 .3-.08.17.17 0 0 0 .04-.06.43.43 0 0 0 .02-.12zm.41-3.1v1.48h.52c.6 0 .92-.25.93-.75 0-.49-.33-.73-.97-.72zm1.55 2.45a.76.76 0 0 0-.38-.72 1.05 1.05 0 0 0-.29-.1 2.2 2.2 0 0 0-.38-.02h-.5v1.72h.5a1.2 1.2 0 0 0 .8-.2.64.64 0 0 0 .18-.28 1.13 1.13 0 0 0 .07-.4zm2.38.89a.64.64 0 0 1-.06-.28v-.05l-.03.04a1.2 1.2 0 0 1-.11.11 1.47 1.47 0 0 1-.13.1 1.1 1.1 0 0 1-.3.16 1.04 1.04 0 0 1-.34.05.74.74 0 0 1-.49-.15.6.6 0 0 1-.15-.22.75.75 0 0 1-.06-.3c0-.37.24-.61.71-.72q.2-.05.4-.07l.48-.05.02-.33a1.78 1.78 0 0 0-.01-.28.64.64 0 0 0-.06-.18.43.43 0 0 0-.42-.2.46.46 0 0 0-.54.47.46.46 0 0 1-.01.1.09.09 0 0 1-.04.05.3.3 0 0 1-.16.04c-.16 0-.22-.05-.22-.13a.43.43 0 0 1 .09-.25.75.75 0 0 1 .24-.2 1.48 1.48 0 0 1 .71-.16.82.82 0 0 1 .65.2.56.56 0 0 1 .1.22 1.32 1.32 0 0 1 .04.33v.5l-.01.47v.51c.01.09.04.19.11.21a.77.77 0 0 0 .29.04.65.65 0 0 0 .23-.03.2.2 0 0 0 .1-.16 1.71 1.71 0 0 0 .03-.34v-1.32a.63.63 0 0 0-.07-.38.33.33 0 0 0-.27-.09v-.07l.7-.05v.56l.04-.06a1.04 1.04 0 0 1 .36-.4.94.94 0 0 1 .5-.11.67.67 0 0 1 .63.3.68.68 0 0 1 .1.24 1.83 1.83 0 0 1 .03.36v1.02a1.78 1.78 0 0 0 .02.34.2.2 0 0 0 .11.16.98.98 0 0 0 .26.03.6.6 0 0 0 .22-.03.2.2 0 0 0 .1-.16 1.8 1.8 0 0 0 .02-.34v-2.4a1.53 1.53 0 0 0-.02-.31.17.17 0 0 0-.1-.14.74.74 0 0 0-.23-.02v-.07l.74-.04q-.02.24-.02.5l-.01.47v1.61l.81-.88a.56.56 0 0 0 .18-.32c0-.12-.11-.18-.31-.19v-.07h1.06v.08a.8.8 0 0 0-.17.03.81.81 0 0 0-.16.08q-.08.04-.13.09a1.22 1.22 0 0 0-.14.11l-.22.24-.27.29.7 1.1a1.04 1.04 0 0 0 .23.27.53.53 0 0 0 .25.1v.07h-.65l-.07-.14-.1-.18-.08-.14-.52-.85-.4.46-.01.25a1.79 1.79 0 0 0 .02.34.2.2 0 0 0 .1.16.65.65 0 0 0 .24.03v.07h-2.18v-.07c.15 0 .25-.03.3-.08a.23.23 0 0 0 .03-.07.42.42 0 0 0 .02-.1 4.84 4.84 0 0 0 .01-.28v-1a1.3 1.3 0 0 0-.08-.53.46.46 0 0 0-.45-.28.65.65 0 0 0-.58.34 1.1 1.1 0 0 0-.13.3 1.22 1.22 0 0 0-.04.32v.85a1.78 1.78 0 0 0 .02.34.2.2 0 0 0 .1.16.68.68 0 0 0 .24.03v.07h-1.44l-.22-.01c-.08-.02-.1-.04-.13-.1m-1.26-.54a.62.62 0 0 0 .12.4.4.4 0 0 0 .31.15.77.77 0 0 0 .38-.1.75.75 0 0 0 .28-.27.82.82 0 0 0 .09-.27 2.5 2.5 0 0 0 .02-.41v-.26a4.61 4.61 0 0 0-.53.07 1.32 1.32 0 0 0-.33.11.6.6 0 0 0-.34.58m-20.91-.84v.88a1.27 1.27 0 0 0 .02.31.18.18 0 0 0 .12.14.92.92 0 0 0 .28.04v.12H2.7v-.12a.82.82 0 0 0 .27-.04.18.18 0 0 0 .1-.14 1.36 1.36 0 0 0 .03-.31v-2.32a1.41 1.41 0 0 0-.02-.31.18.18 0 0 0-.11-.14.76.76 0 0 0-.25-.04v-.12h1.32a1.61 1.61 0 0 1 .99.23.88.88 0 0 1 .3.75.9.9 0 0 1-.56.95 1.73 1.73 0 0 1-.38.09 3.71 3.71 0 0 1-.5.03zm0-.14h.23a.84.84 0 0 0 .6-.2.72.72 0 0 0 .17-.29 1.43 1.43 0 0 0 .05-.4q0-.88-.77-.89h-.28zm3.9.29H5.94a3.03 3.03 0 0 0 .03.43 1.36 1.36 0 0 0 .1.32.66.66 0 0 0 .62.47.73.73 0 0 0 .43-.14 1.05 1.05 0 0 0 .32-.4l.12.07a1.22 1.22 0 0 1-.42.5 1.07 1.07 0 0 1-.6.15 1.26 1.26 0 0 1-.91-.35 1.36 1.36 0 0 1-.33-.94 1.42 1.42 0 0 1 .32-.96 1.18 1.18 0 0 1 .88-.36 1.16 1.16 0 0 1 .62.16.93.93 0 0 1 .36.47 1.17 1.17 0 0 1 .06.23 3.17 3.17 0 0 1 .02.35m-1.61-.14h1.01q0-.22-.02-.35a1.16 1.16 0 0 0-.06-.24q-.13-.37-.4-.37-.29 0-.44.42a1.52 1.52 0 0 0-.06.23 3.09 3.09 0 0 0-.03.31m1.71-1 .9-.06a16.87 16.87 0 0 1 .02.38v.15a.85.85 0 0 1 .7-.54.43.43 0 0 1 .3.1.34.34 0 0 1 .1.26.27.27 0 0 1-.09.21.38.38 0 0 1-.25.08.2.2 0 0 1-.22-.15.4.4 0 0 0-.05-.13.1.1 0 0 0-.09-.04q-.15.01-.27.23a.9.9 0 0 0-.1.23 1.36 1.36 0 0 0-.02.3v.87a1.41 1.41 0 0 0 .02.31.17.17 0 0 0 .1.13.83.83 0 0 0 .26.04v.11H7.65v-.11a.66.66 0 0 0 .24-.03.17.17 0 0 0 .1-.14 1.45 1.45 0 0 0 .02-.3v-1.32a.7.7 0 0 0-.06-.39q-.07-.08-.29-.08zm3.09-.06v.47a.93.93 0 0 1 .84-.48.62.62 0 0 1 .68.5 1.08 1.08 0 0 1 .35-.38.88.88 0 0 1 .47-.12.72.72 0 0 1 .62.28.65.65 0 0 1 .11.25 1.82 1.82 0 0 1 .03.39v1.04a1.44 1.44 0 0 0 .02.31.17.17 0 0 0 .1.14.66.66 0 0 0 .25.03v.11h-1.3v-.11a.61.61 0 0 0 .23-.03.17.17 0 0 0 .1-.14 1.47 1.47 0 0 0 .02-.3v-1.05a1.14 1.14 0 0 0-.1-.54.32.32 0 0 0-.3-.16.49.49 0 0 0-.42.26.84.84 0 0 0-.15.48v1a1.46 1.46 0 0 0 .02.31.17.17 0 0 0 .1.14.63.63 0 0 0 .23.03v.11h-1.28v-.11a.61.61 0 0 0 .24-.03.17.17 0 0 0 .1-.14 1.47 1.47 0 0 0 .01-.3v-1.05q0-.7-.38-.7a.52.52 0 0 0-.41.23.93.93 0 0 0-.17.55v.96a1.49 1.49 0 0 0 .02.31.17.17 0 0 0 .1.14.63.63 0 0 0 .23.03v.11H9.8v-.11a.68.68 0 0 0 .24-.03.17.17 0 0 0 .1-.14 1.46 1.46 0 0 0 .03-.3v-1.33a.67.67 0 0 0-.06-.37q-.07-.1-.3-.08v-.12zm6.85.22v1.58a2.34 2.34 0 0 0 .02.26.77.77 0 0 0 .04.17.28.28 0 0 0 .09.13.23.23 0 0 0 .14.05.57.57 0 0 0 .33-.15l.07.12a.98.98 0 0 1-.65.24.58.58 0 0 1-.54-.27.55.55 0 0 1-.05-.12 1.26 1.26 0 0 1-.02-.2v-1.81h-.28v-.15a.6.6 0 0 0 .27-.06.53.53 0 0 0 .19-.19.98.98 0 0 0 .1-.21 1.98 1.98 0 0 0 .07-.3l.24-.02v.2l-.01.23v.34h.58v.16zm-.85 2.22v.1l-.34.01a.98.98 0 0 1-.34-.04.32.32 0 0 1-.14-.1.27.27 0 0 1-.06-.19 1.26 1.26 0 0 1-.39.3 1 1 0 0 1-.43.09.76.76 0 0 1-.54-.19.68.68 0 0 1-.2-.51q0-.61.77-.76a5.84 5.84 0 0 1 .78-.09v-.3a1.1 1.1 0 0 0-.08-.52.3.3 0 0 0-.3-.14.33.33 0 0 0-.31.16.42.42 0 0 0-.05.13 1.58 1.58 0 0 0-.03.2.23.23 0 0 1-.07.19.35.35 0 0 1-.22.05q-.33 0-.33-.22a.43.43 0 0 1 .08-.24.7.7 0 0 1 .21-.2 1.47 1.47 0 0 1 .79-.18 1.02 1.02 0 0 1 .7.2.53.53 0 0 1 .14.23 1.18 1.18 0 0 1 .05.36v.4l-.01.42v.26a2.51 2.51 0 0 0 .01.37.2.2 0 0 0 .08.16.43.43 0 0 0 .23.05m-.89-.9v-.37a1.46 1.46 0 0 0-.73.19.54.54 0 0 0-.2.48.72.72 0 0 0 .1.4.33.33 0 0 0 .28.16.48.48 0 0 0 .27-.08.56.56 0 0 0 .2-.23.73.73 0 0 0 .06-.22 2.2 2.2 0 0 0 .02-.33m5 .9v.1l-.34.01a.98.98 0 0 1-.34-.04.32.32 0 0 1-.14-.09.27.27 0 0 1-.06-.2 1.26 1.26 0 0 1-.39.3 1 1 0 0 1-.43.09.76.76 0 0 1-.54-.19.68.68 0 0 1-.2-.5q0-.62.77-.77a5.84 5.84 0 0 1 .78-.09v-.3a1.1 1.1 0 0 0-.08-.52.3.3 0 0 0-.3-.14.33.33 0 0 0-.31.16.42.42 0 0 0-.05.13 1.58 1.58 0 0 0-.03.21.23.23 0 0 1-.07.18.35.35 0 0 1-.22.05q-.33 0-.33-.22a.43.43 0 0 1 .08-.24.7.7 0 0 1 .21-.2 1.47 1.47 0 0 1 .79-.18 1.02 1.02 0 0 1 .7.2.53.53 0 0 1 .14.23 1.18 1.18 0 0 1 .05.36v.4l-.01.42v.26a2.51 2.51 0 0 0 .01.37.2.2 0 0 0 .08.16.42.42 0 0 0 .23.05m-.89-.9v-.37a1.46 1.46 0 0 0-.73.19.54.54 0 0 0-.2.48.72.72 0 0 0 .1.4.33.33 0 0 0 .28.16.48.48 0 0 0 .27-.08.56.56 0 0 0 .2-.23.73.73 0 0 0 .06-.22 2.19 2.19 0 0 0 .02-.33"/><path fill="#0097b9" d="m30.69 11.22-.01.18 3.53 4.12.12.02h.02l.06-.12-1.5-5.01-.26-.18z"/></g><g mask="url(#b)"><path fill="#005874" d="m31.73 11.6 2.61 3.95-.14-.02-3.53-4.13z"/><path fill="#2fb8e7" d="m32.66 10.23.25.17-.8 1.05-.36-.16.9-1.06z"/><path fill="#007592" d="m31.75 11.29-.02.31-1.06-.2.01-.18zm.37.16.8-1.05 1.51 5.02-.07.13z"/></g><g mask="url(#a)"><path fill="#80b13a" d="m36.35 10.13 2.28 1.05v.3l-3.74 5.64-.17.04-.02-.01-.06-.13 1.51-6.78.2-.1z"/></g><g mask="url(#c)"><path fill="#6e9123" d="m38.64 11.47-3.74 5.66-.19.05 2.4-5.58z"/><path fill="#3f7937" d="m36.68 11.37-2 5.8-.05-.15 1.52-6.78z"/><path fill="#a5c550" d="m38.63 11.18.01.3-1.53.12-.08-.4z"/><path fill="#5d8b27" d="m37.03 11.2-.35.17-.53-1.13.2-.11z"/></g><g mask="url(#a)"><path fill="#d81936" d="m32.87 8.53.09-.17 2.92-.04.18.2-1.4 4.65-.08.05-.1-.06z"/></g><g mask="url(#d)"><path fill="#af2c35" d="m34.2 8.84-.2.25-1.15-.57.1-.17 1.26.5z"/><path fill="#762624" d="M32.85 8.52 34 9.1l.58 4.14-.1-.07-1.63-4.64z"/><path fill="#b22b37" d="m34.55 9.1 1.52-.58-1.4 4.66-.1.05-.02-4.14z"/><path fill="#dc505e" d="m34.2 8.84.34.25 1.53-.57-.2-.2-1.66.52z"/></g></svg>
\ No newline at end of file
diff --git a/view/frontend/layout/checkout_index_index.xml b/view/frontend/layout/checkout_index_index.xml
index 076a3d1ca0..d592dcf8f5 100755
--- a/view/frontend/layout/checkout_index_index.xml
+++ b/view/frontend/layout/checkout_index_index.xml
@@ -326,6 +326,33 @@
                                                                         <item name="adyen_kcp_creditcard" xsi:type="array">
                                                                             <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
                                                                         </item>
+                                                                        <item name="adyen_doku_alfamart" xsi:type="array">
+                                                                            <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
+                                                                        </item>
+                                                                        <item name="adyen_doku_permata_lite_atm" xsi:type="array">
+                                                                            <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
+                                                                        </item>
+                                                                        <item name="adyen_doku_bca_va" xsi:type="array">
+                                                                            <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
+                                                                        </item>
+                                                                        <item name="adyen_doku_bni_va" xsi:type="array">
+                                                                            <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
+                                                                        </item>
+                                                                        <item name="adyen_doku_bri_va" xsi:type="array">
+                                                                            <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
+                                                                        </item>
+                                                                        <item name="adyen_doku_cimb_va" xsi:type="array">
+                                                                            <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
+                                                                        </item>
+                                                                        <item name="adyen_doku_danamon_va" xsi:type="array">
+                                                                            <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
+                                                                        </item>
+                                                                        <item name="adyen_doku_indomaret" xsi:type="array">
+                                                                            <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
+                                                                        </item>
+                                                                        <item name="adyen_doku_mandiri_va" xsi:type="array">
+                                                                            <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
+                                                                        </item>
                                                                     </item>
                                                                 </item>
                                                             </item>
diff --git a/view/frontend/layout/multishipping_checkout_billing.xml b/view/frontend/layout/multishipping_checkout_billing.xml
index 64d663f2be..5841e52395 100644
--- a/view/frontend/layout/multishipping_checkout_billing.xml
+++ b/view/frontend/layout/multishipping_checkout_billing.xml
@@ -104,6 +104,15 @@
                     <item name="adyen_kcp_naverpay" xsi:type="string">Adyen_Payment::form/multishipping/abstract-form.phtml</item>
                     <item name="adyen_kcp_payco" xsi:type="string">Adyen_Payment::form/multishipping/abstract-form.phtml</item>
                     <item name="adyen_kcp_creditcard" xsi:type="string">Adyen_Payment::form/multishipping/abstract-form.phtml</item>
+                    <item name="adyen_doku_alfamart" xsi:type="string">Adyen_Payment::form/multishipping/abstract-form.phtml</item>
+                    <item name="adyen_doku_permata_lite_atm" xsi:type="string">Adyen_Payment::form/multishipping/abstract-form.phtml</item>
+                    <item name="adyen_doku_bca_va" xsi:type="string">Adyen_Payment::form/multishipping/abstract-form.phtml</item>
+                    <item name="adyen_doku_bni_va" xsi:type="string">Adyen_Payment::form/multishipping/abstract-form.phtml</item>
+                    <item name="adyen_doku_bri_va" xsi:type="string">Adyen_Payment::form/multishipping/abstract-form.phtml</item>
+                    <item name="adyen_doku_cimb_va" xsi:type="string">Adyen_Payment::form/multishipping/abstract-form.phtml</item>
+                    <item name="adyen_doku_danamon_va" xsi:type="string">Adyen_Payment::form/multishipping/abstract-form.phtml</item>
+                    <item name="adyen_doku_indomaret" xsi:type="string">Adyen_Payment::form/multishipping/abstract-form.phtml</item>
+                    <item name="adyen_doku_mandiri_va" xsi:type="string">Adyen_Payment::form/multishipping/abstract-form.phtml</item>
                 </argument>
                 <argument name="cacheable" xsi:type="boolean">false</argument>
             </arguments>
diff --git a/view/frontend/web/js/view/payment/method-renderer/adyen-facilypay-3x-method.js b/view/frontend/web/js/view/payment/method-renderer/adyen-facilypay-3x-method.js
index cc4bf208c1..11e2d4ef15 100644
--- a/view/frontend/web/js/view/payment/method-renderer/adyen-facilypay-3x-method.js
+++ b/view/frontend/web/js/view/payment/method-renderer/adyen-facilypay-3x-method.js
@@ -6,6 +6,9 @@
  * See LICENSE.txt for license details.
  *
  * Author: Adyen <magento@adyen.com>
+ *
+ * @deprecated This file will be removed on V10. Use `adyen-facilypay-method.js` instead.
+ *
  */
 define(
     [
diff --git a/view/frontend/web/js/view/payment/method-renderer/adyen-facilypay-method.js b/view/frontend/web/js/view/payment/method-renderer/adyen-facilypay-method.js
new file mode 100644
index 0000000000..7eb71c71d3
--- /dev/null
+++ b/view/frontend/web/js/view/payment/method-renderer/adyen-facilypay-method.js
@@ -0,0 +1,80 @@
+/**
+ *
+ * Adyen Payment module (https://www.adyen.com/)
+ *
+ * Copyright (c) 2024 Adyen N.V. (https://www.adyen.com/)
+ * See LICENSE.txt for license details.
+ *
+ * Author: Adyen <magento@adyen.com>
+ */
+define(
+    [
+        'Magento_Checkout/js/model/quote',
+        'Adyen_Payment/js/view/payment/method-renderer/adyen-pm-method',
+    ],
+    function(
+        quote,
+        adyenPaymentMethod,
+    ) {
+        return adyenPaymentMethod.extend({
+            initialize: function () {
+                this._super();
+            },
+            buildComponentConfiguration: function (paymentMethod, paymentMethodsExtraInfo) {
+                let baseComponentConfiguration = this._super();
+                let self = this;
+                let formattedShippingAddress = {};
+                let formattedBillingAddress = {};
+                let shopperDateOfBirth = '';
+                let email = {};
+
+                if (!!customerData.dob){
+                    shopperDateOfBirth = customerData.dob;
+                }
+
+                if (!!customerData.email) {
+                    email = customerData.email;
+                } else if (!!quote.guestEmail) {
+                    email = quote.guestEmail;
+                };
+
+                if (!quote.isVirtual() && !!quote.shippingAddress()) {
+                    formattedShippingAddress = self.getFormattedAddress(quote.shippingAddress());
+                }
+
+                if (!quote.isVirtual() && !!quote.billingAddress()) {
+                    formattedBillingAddress = self.getFormattedAddress(quote.billingAddress());
+                }
+
+                if (formattedShippingAddress) {
+                    baseComponentConfiguration.data.deliveryAddress = {
+                        city: formattedShippingAddress.city,
+                        country: formattedShippingAddress.country,
+                        houseNumberOrName: formattedShippingAddress.houseNumber,
+                        postalCode: formattedShippingAddress.postalCode,
+                        street: formattedShippingAddress.street
+                    }
+                }
+
+                if (formattedBillingAddress){
+                    baseComponentConfiguration.data.personalDetails = {
+                        firstName: formattedBillingAddress.firstName,
+                        lastName: formattedBillingAddress.lastName,
+                        telephoneNumber: formattedBillingAddress.telephone,
+                        shopperEmail: email,
+                        dateOfBirth: shopperDateOfBirth,
+                    }
+                    baseComponentConfiguration.data.billingAddress = {
+                        city: formattedBillingAddress.city,
+                        country: formattedBillingAddress.country,
+                        houseNumberOrName: formattedBillingAddress.houseNumber,
+                        postalCode: formattedBillingAddress.postalCode,
+                        street: formattedBillingAddress.street,
+                    }
+                }
+
+                return baseComponentConfiguration;
+            }
+        })
+    }
+);
diff --git a/view/frontend/web/template/payment/cc-form.html b/view/frontend/web/template/payment/cc-form.html
index b93b74ee04..a0df9a907b 100755
--- a/view/frontend/web/template/payment/cc-form.html
+++ b/view/frontend/web/template/payment/cc-form.html
@@ -63,7 +63,7 @@
                 <legend class="legend">
                     <span><!-- ko text: $t('Credit Card Information')--><!-- /ko --></span>
                 </legend>
-                <br/>
+                <br>
                 <!-- /ko -->
 
                 <!-- ko if: (areComboCardsEnabled())-->
diff --git a/view/frontend/web/template/payment/cc-vault-form.html b/view/frontend/web/template/payment/cc-vault-form.html
index ddc824d3c9..515ed6ba91 100644
--- a/view/frontend/web/template/payment/cc-vault-form.html
+++ b/view/frontend/web/template/payment/cc-vault-form.html
@@ -21,7 +21,7 @@
                     value: getId(),
                     click: selectPaymentMethod,
                     checked: isChecked,
-                    visible: isRadioButtonVisible()"/>
+                    visible: isRadioButtonVisible()">
         <label class="label" data-bind="attr: {'for': getId()}">
             <img data-bind="attr: {
             'src': getIcons(getCardType()).url,
@@ -94,7 +94,7 @@
                 </select>
             </div>
         </div>
-        <br/>
+        <br>
 
         <!-- /ko -->
 
diff --git a/view/frontend/web/template/payment/pm-vault-form.html b/view/frontend/web/template/payment/pm-vault-form.html
index 0ad8083569..dc8e9351fd 100644
--- a/view/frontend/web/template/payment/pm-vault-form.html
+++ b/view/frontend/web/template/payment/pm-vault-form.html
@@ -14,7 +14,7 @@
                     value: getId(),
                     click: selectPaymentMethod,
                     checked: isChecked,
-                    visible: isRadioButtonVisible()"/>
+                    visible: isRadioButtonVisible()">
         <label class="label" data-bind="attr: {'for': getId()}">
             <img data-bind="attr: {
             'src': getIcons(getPaymentMethodType()).url,
@@ -22,7 +22,7 @@
             'height': getIcons(getPaymentMethodType()).height,
             'alt': getIcons(getPaymentMethodType()).title
             }" class="payment-icon">
-            <span text="getLabel()"></span></span>
+            <span text="getLabel()"></span>
         </label>
     </div>