diff --git a/app/code/Magento/Captcha/Block/CheckoutLayoutProcessor.php b/app/code/Magento/Captcha/Block/CheckoutLayoutProcessor.php
new file mode 100644
index 0000000000000..36c5df123a152
--- /dev/null
+++ b/app/code/Magento/Captcha/Block/CheckoutLayoutProcessor.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright 2025 Adobe.
+ * All Rights Reserved.
+ */
+
+declare(strict_types=1);
+namespace Magento\Captcha\Block;
+
+use Magento\Checkout\Block\Checkout\LayoutProcessorInterface;
+use Magento\Captcha\Helper\Data as HelperCaptcha;
+
+class CheckoutLayoutProcessor implements LayoutProcessorInterface
+{
+    /**
+     * @param HelperCaptcha $helper
+     */
+    public function __construct(
+        private readonly HelperCaptcha $helper
+    ) {
+    }
+
+    /**
+     * Remove captcha from checkout page if it is disabled
+     *
+     * @param array $jsLayout
+     * @return array
+     */
+    public function process($jsLayout): array
+    {
+        if ($this->helper->getConfig('enable')) {
+            $captcha = [
+                'component' => 'Magento_Captcha/js/view/checkout/loginCaptcha',
+                'displayArea'   => 'additional-login-form-fields',
+                'formId' => 'user_login',
+                'configSource' => 'checkoutConfig'
+            ];
+            $jsLayout['components']['checkout']['children']['authentication']['children']['captcha'] = $captcha;
+            $jsLayout['components']['checkout']['children']['steps']['children']['shipping-step']['children']
+            ['shippingAddress']['children']['customer-email']['children']['additional-login-form-fields']
+            ['children']['captcha'] = $captcha;
+        }
+        return $jsLayout;
+    }
+}
diff --git a/app/code/Magento/Captcha/Block/Customer/AuthenticationPopup/LayoutProcessor.php b/app/code/Magento/Captcha/Block/Customer/AuthenticationPopup/LayoutProcessor.php
new file mode 100644
index 0000000000000..927118fb8d1b3
--- /dev/null
+++ b/app/code/Magento/Captcha/Block/Customer/AuthenticationPopup/LayoutProcessor.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright 2025 Adobe.
+ * All Rights Reserved.
+ */
+
+declare(strict_types=1);
+namespace Magento\Captcha\Block\Customer\AuthenticationPopup;
+
+use Magento\Captcha\Helper\Data as HelperCaptcha;
+use Magento\Checkout\Block\Checkout\LayoutProcessorInterface;
+
+class LayoutProcessor implements LayoutProcessorInterface
+{
+    /**
+     * @param HelperCaptcha $helper
+     */
+    public function __construct(
+        private readonly HelperCaptcha $helper
+    ) {
+    }
+
+    /**
+     * Process jsLayout of checkout page
+     *
+     * @param array $jsLayout
+     * @return array
+     */
+    public function process($jsLayout): array
+    {
+        if ($this->helper->getConfig('enable')) {
+            $jsLayout['components']['authenticationPopup']['children']['captcha'] = [
+                'component' => 'Magento_Captcha/js/view/checkout/loginCaptcha',
+                'displayArea' => 'additional-login-form-fields',
+                'formId' => 'user_login',
+                'configSource' => 'checkout'
+            ];
+        }
+        return $jsLayout;
+    }
+}
diff --git a/app/code/Magento/Captcha/etc/frontend/di.xml b/app/code/Magento/Captcha/etc/frontend/di.xml
index 6ecbb156b44f1..71987e5003afd 100644
--- a/app/code/Magento/Captcha/etc/frontend/di.xml
+++ b/app/code/Magento/Captcha/etc/frontend/di.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
@@ -37,4 +37,18 @@
     <type name="Magento\Sales\Api\OrderManagementInterface">
         <plugin name="reset_payment_attempts_after_order_is_placed_plugin" type="Magento\Captcha\Plugin\ResetPaymentAttemptsAfterOrderIsPlacedPlugin"/>
     </type>
+    <type name="Magento\Checkout\Block\Onepage">
+        <arguments>
+            <argument name="layoutProcessors" xsi:type="array">
+                <item name="captcha_processor" xsi:type="object">Magento\Captcha\Block\CheckoutLayoutProcessor</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Customer\Block\Account\AuthenticationPopup">
+        <arguments>
+            <argument name="layoutProcessors" xsi:type="array">
+                <item name="authentication_popup_processor" xsi:type="object">Magento\Captcha\Block\Customer\AuthenticationPopup\LayoutProcessor</item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/Captcha/view/frontend/layout/checkout_index_index.xml b/app/code/Magento/Captcha/view/frontend/layout/checkout_index_index.xml
deleted file mode 100644
index 7180372f004e5..0000000000000
--- a/app/code/Magento/Captcha/view/frontend/layout/checkout_index_index.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-    <body>
-        <referenceBlock name="checkout.root">
-            <arguments>
-                <argument name="jsLayout" xsi:type="array">
-                    <item name="components" xsi:type="array">
-                        <item name="checkout" xsi:type="array">
-                            <item name="children" xsi:type="array">
-                                <item name="authentication" xsi:type="array">
-                                    <item name="children" xsi:type="array">
-                                        <item name="captcha" xsi:type="array">
-                                            <item name="component" xsi:type="string">Magento_Captcha/js/view/checkout/loginCaptcha</item>
-                                            <item name="displayArea" xsi:type="string">additional-login-form-fields</item>
-                                            <item name="formId" xsi:type="string">user_login</item>
-                                            <item name="configSource" xsi:type="string">checkoutConfig</item>
-                                        </item>
-                                    </item>
-                                </item>
-                                <item name="steps" xsi:type="array">
-                                    <item name="children" xsi:type="array">
-                                        <item name="shipping-step" xsi:type="array">
-                                            <item name="children" xsi:type="array">
-                                                <item name="shippingAddress" xsi:type="array">
-                                                    <item name="children" xsi:type="array">
-                                                        <item name="customer-email" xsi:type="array">
-                                                            <item name="children" xsi:type="array">
-                                                                <item name="additional-login-form-fields" xsi:type="array">
-                                                                    <item name="children" xsi:type="array">
-                                                                        <item name="captcha" xsi:type="array">
-                                                                            <item name="component" xsi:type="string">Magento_Captcha/js/view/checkout/loginCaptcha</item>
-                                                                            <item name="displayArea" xsi:type="string">additional-login-form-fields</item>
-                                                                            <item name="formId" xsi:type="string">user_login</item>
-                                                                            <item name="configSource" xsi:type="string">checkoutConfig</item>
-                                                                        </item>
-                                                                    </item>
-                                                                </item>
-                                                            </item>
-                                                        </item>
-                                                    </item>
-                                                </item>
-                                            </item>
-                                        </item>
-                                    </item>
-                                </item>
-                            </item>
-                        </item>
-                    </item>
-                </argument>
-            </arguments>
-        </referenceBlock>
-    </body>
-</page>
diff --git a/app/code/Magento/Captcha/view/frontend/layout/default.xml b/app/code/Magento/Captcha/view/frontend/layout/default.xml
deleted file mode 100644
index 5015d6b021cd9..0000000000000
--- a/app/code/Magento/Captcha/view/frontend/layout/default.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-    <body>
-        <referenceBlock name="authentication-popup">
-            <arguments>
-                <argument name="jsLayout" xsi:type="array">
-                    <item name="components" xsi:type="array">
-                        <item name="authenticationPopup" xsi:type="array">
-                            <item name="children" xsi:type="array">
-                                <item name="captcha" xsi:type="array">
-                                    <item name="component" xsi:type="string">Magento_Captcha/js/view/checkout/loginCaptcha</item>
-                                    <item name="displayArea" xsi:type="string">additional-login-form-fields</item>
-                                    <item name="formId" xsi:type="string">user_login</item>
-                                    <item name="configSource" xsi:type="string">checkout</item>
-                                </item>
-                            </item>
-                        </item>
-                    </item>
-                </argument>
-            </arguments>
-        </referenceBlock>
-    </body>
-</page>
diff --git a/app/code/Magento/Customer/Block/Account/AuthenticationPopup.php b/app/code/Magento/Customer/Block/Account/AuthenticationPopup.php
index fce84885d55f4..66e3d644a4f14 100644
--- a/app/code/Magento/Customer/Block/Account/AuthenticationPopup.php
+++ b/app/code/Magento/Customer/Block/Account/AuthenticationPopup.php
@@ -1,12 +1,15 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe.
+ * All Rights Reserved.
  */
 namespace Magento\Customer\Block\Account;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Customer\Model\Form;
 use Magento\Store\Model\ScopeInterface;
+use Magento\Customer\Model\Context;
+use Magento\Framework\App\Http\Context as HttpContext;
 
 /**
  * @api
@@ -24,21 +27,29 @@ class AuthenticationPopup extends \Magento\Framework\View\Element\Template
      */
     private $serializer;
 
+    /**
+     * @var array
+     */
+    private $layoutProcessors;
+
     /**
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param array $data
      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
+     * @param array $layoutProcessors
      * @throws \RuntimeException
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
         array $data = [],
-        ?\Magento\Framework\Serialize\Serializer\Json $serializer = null
+        ?\Magento\Framework\Serialize\Serializer\Json $serializer = null,
+        array $layoutProcessors = []
     ) {
         parent::__construct($context, $data);
         $this->jsLayout = isset($data['jsLayout']) && is_array($data['jsLayout']) ? $data['jsLayout'] : [];
         $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
             ->get(\Magento\Framework\Serialize\Serializer\Json::class);
+        $this->layoutProcessors = $layoutProcessors;
     }
 
     /**
@@ -48,6 +59,9 @@ public function __construct(
      */
     public function getJsLayout()
     {
+        foreach ($this->layoutProcessors as $processor) {
+            $this->jsLayout = $processor->process($this->jsLayout);
+        }
         return $this->serializer->serialize($this->jsLayout);
     }
 
diff --git a/app/code/Magento/Customer/Model/Form.php b/app/code/Magento/Customer/Model/Form.php
index 807e684c1fab4..12aaaafd0628a 100644
--- a/app/code/Magento/Customer/Model/Form.php
+++ b/app/code/Magento/Customer/Model/Form.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe.
+ * All Rights Reserved.
  */
 
 namespace Magento\Customer\Model;