diff --git a/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html b/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html
index 9005e4816b43f..083c594996d59 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
  */
 -->
 <div if="isAddressDetailsVisible() && currentBillingAddress()" class="billing-address-details">
@@ -12,7 +12,11 @@
         <text args="currentBillingAddress().company"></text><br>
     </if>
     <text args="_.values(_.compact(currentBillingAddress().street)).join(', ')"></text><br>
-    <text args="currentBillingAddress().city "></text>, <span text="currentBillingAddress().region"></span>
+
+    <if args="currentBillingAddress().city">
+    <text args="currentBillingAddress().city "></text>,
+    </if>
+    <span text="currentBillingAddress().region"></span>
     <text args="currentBillingAddress().postcode"></text><br>
     <text args="getCountryName(currentBillingAddress().countryId)"></text><br>
     <a if="currentBillingAddress().telephone" attr="'href': 'tel:' + currentBillingAddress().telephone" text="currentBillingAddress().telephone"></a><br>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html b/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html
index c5cc997d8cc85..f760fd0eb8e67 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
  */
 -->
 <div class="shipping-address-item" css="'selected-item' : isSelected() , 'not-selected-item':!isSelected()">
@@ -11,7 +11,10 @@
         <text args="address().company"></text><br>
     </if>
     <text args="_.values(_.compact(address().street)).join(', ')"></text><br>
-    <text args="address().city "></text>, <span text="address().region"></span> <text args="address().postcode"></text><br>
+    <if args="address().city">
+        <text args="address().city "></text>,
+    </if>
+    <span text="address().region"></span> <text args="address().postcode"></text><br>
     <text args="getCountryName(address().countryId)"></text><br>
     <a if="address().telephone" attr="'href': 'tel:' + address().telephone" text="address().telephone"></a><br>
     <if args="address().vatId">
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/shipping-information/address-renderer/default.html b/app/code/Magento/Checkout/view/frontend/web/template/shipping-information/address-renderer/default.html
index 292edbc13708c..c803d7950f5ee 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/shipping-information/address-renderer/default.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/shipping-information/address-renderer/default.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
  */
 -->
 <if args="visible()">
@@ -11,7 +11,10 @@
         <text args="address().company"></text><br>
     </if>
     <text args="_.values(_.compact(address().street)).join(', ')"></text><br>
-    <text args="address().city "></text>, <span text="address().region"></span> <text args="address().postcode"></text><br>
+    <if args="address().city">
+        <text args="address().city "></text>,
+    </if>
+    <span text="address().region"></span> <text args="address().postcode"></text><br>
     <text args="getCountryName(address().countryId)"></text><br>
     <a if="address().telephone" attr="'href': 'tel:' + address().telephone" text="address().telephone"></a><br>
     <if args="address().vatId">
diff --git a/app/code/Magento/Customer/Block/Widget/City.php b/app/code/Magento/Customer/Block/Widget/City.php
new file mode 100644
index 0000000000000..e64485cda5faf
--- /dev/null
+++ b/app/code/Magento/Customer/Block/Widget/City.php
@@ -0,0 +1,182 @@
+<?php
+/**
+ * Copyright 2024 Adobe.
+ * All Rights Reserved.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Customer\Block\Widget;
+
+use Magento\Customer\Api\AddressMetadataInterface;
+use Magento\Customer\Api\CustomerMetadataInterface;
+use Magento\Customer\Api\Data\AttributeMetadataInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Helper\Address as AddressHelper;
+use Magento\Customer\Model\Options;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\View\Element\Template\Context;
+
+/**
+ * Widget for showing customer city.
+ *
+ * @method CustomerInterface getObject()
+ * @method Name setObject(CustomerInterface $customer)
+ *
+ * @SuppressWarnings(PHPMD.DepthOfInheritance)
+ */
+class City extends AbstractWidget
+{
+
+    /**
+     * the attribute code
+     */
+    public const ATTRIBUTE_CODE = 'city';
+
+    /**
+     * @var AddressMetadataInterface
+     */
+    private $addressMetadata;
+
+    /**
+     * @var Options
+     */
+    private $options;
+
+    /**
+     * @param Context $context
+     * @param AddressHelper $addressHelper
+     * @param CustomerMetadataInterface $customerMetadata
+     * @param Options $options
+     * @param AddressMetadataInterface $addressMetadata
+     * @param array $data
+     */
+    public function __construct(
+        Context $context,
+        AddressHelper $addressHelper,
+        CustomerMetadataInterface $customerMetadata,
+        Options $options,
+        AddressMetadataInterface $addressMetadata,
+        array $data = []
+    ) {
+        $this->options = $options;
+        parent::__construct($context, $addressHelper, $customerMetadata, $data);
+        $this->addressMetadata = $addressMetadata;
+        $this->_isScopePrivate = true;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function _construct()
+    {
+        parent::_construct();
+
+        // default city location
+        $this->setTemplate('Magento_Customer::widget/city.phtml');
+    }
+
+    /**
+     * Can show prefix
+     *
+     * @return bool
+     */
+    public function showCity()
+    {
+        return $this->isAttributeVisible(self::ATTRIBUTE_CODE);
+    }
+
+    /**
+     * Retrieve customer attribute instance
+     *
+     * @param string $attributeCode
+     *
+     * @return AttributeMetadataInterface|null
+     * @throws LocalizedException
+     */
+    //@codingStandardsIgnoreStart
+    protected function _getAttribute($attributeCode)
+    {
+        //@codingStandardsIgnoreEnd
+        if ($this->getForceUseCustomerAttributes() || $this->getObject() instanceof CustomerInterface) {
+            return parent::_getAttribute($attributeCode);
+        }
+
+        try {
+            $attribute = $this->addressMetadata->getAttributeMetadata($attributeCode);
+        } catch (NoSuchEntityException $e) {
+            return null;
+        }
+
+        if ($this->getForceUseCustomerRequiredAttributes() && $attribute && !$attribute->isRequired()) {
+            $customerAttribute = parent::_getAttribute($attributeCode);
+            if ($customerAttribute && $customerAttribute->isRequired()) {
+                $attribute = $customerAttribute;
+            }
+        }
+
+        return $attribute;
+    }
+
+    /**
+     * Retrieve store attribute label
+     *
+     * @param string $attributeCode
+     *
+     * @return string
+     */
+    public function getStoreLabel(string $attributeCode)
+    {
+        $attribute = $this->_getAttribute($attributeCode);
+        return $attribute ? __($attribute->getStoreLabel()) : '';
+    }
+
+    /**
+     * Get string with frontend validation classes for attribute
+     *
+     * @param string $attributeCode
+     *
+     * @return string
+     * @throws LocalizedException
+     */
+    public function getAttributeValidationClass(string $attributeCode)
+    {
+        return $this->_addressHelper->getAttributeValidationClass($attributeCode);
+    }
+
+    /**
+     * Checks is attribute visible
+     *
+     * @param string $attributeCode
+     *
+     * @return bool
+     */
+    private function isAttributeVisible(string $attributeCode)
+    {
+        $attributeMetadata = $this->_getAttribute($attributeCode);
+        return $attributeMetadata ? (bool)$attributeMetadata->isVisible() : false;
+    }
+
+    /**
+     * Check if city attribute enabled in system
+     *
+     * @return bool
+     */
+    public function isEnabled()
+    {
+        return $this->_getAttribute(self::ATTRIBUTE_CODE)
+            ? (bool)$this->_getAttribute(self::ATTRIBUTE_CODE)->isVisible() : false;
+    }
+
+    /**
+     * Check if city attribute marked as required
+     *
+     * @return bool
+     */
+    public function isRequired(): bool
+    {
+        return $this->_getAttribute(self::ATTRIBUTE_CODE)
+            ? (bool)$this->_getAttribute(self::ATTRIBUTE_CODE)->isRequired() : false;
+    }
+}
diff --git a/app/code/Magento/Customer/Model/Address/Validator/General.php b/app/code/Magento/Customer/Model/Address/Validator/General.php
index 23c6d687328f3..3329fa490383d 100644
--- a/app/code/Magento/Customer/Model/Address/Validator/General.php
+++ b/app/code/Magento/Customer/Model/Address/Validator/General.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Customer\Model\Address\Validator;
 
@@ -75,10 +75,6 @@ private function checkRequiredFields(AbstractAddress $address)
             $errors[] = __('"%fieldName" is required. Enter and try again.', ['fieldName' => 'street']);
         }
 
-        if (!ValidatorChain::is($address->getCity(), NotEmpty::class)) {
-            $errors[] = __('"%fieldName" is required. Enter and try again.', ['fieldName' => 'city']);
-        }
-
         return $errors;
     }
 
@@ -88,6 +84,8 @@ private function checkRequiredFields(AbstractAddress $address)
      * @param AbstractAddress $address
      * @return array
      * @throws LocalizedException|ValidateException
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     private function checkOptionalFields(AbstractAddress $address)
     {
@@ -111,6 +109,12 @@ private function checkOptionalFields(AbstractAddress $address)
             $errors[] = __('"%fieldName" is required. Enter and try again.', ['fieldName' => 'company']);
         }
 
+        if ($this->isCityRequired()
+            && !ValidatorChain::is($address->getCity(), NotEmpty::class)
+        ) {
+            $errors[] = __('"%fieldName" is required. Enter and try again.', ['fieldName' => 'city']);
+        }
+
         $havingOptionalZip = $this->directoryData->getCountriesWithOptionalZip();
         if (!in_array($address->getCountryId(), $havingOptionalZip)
             && !ValidatorChain::is($address->getPostcode(), NotEmpty::class)
@@ -154,6 +158,17 @@ private function isFaxRequired()
         return $this->eavConfig->getAttribute('customer_address', 'fax')->getIsRequired();
     }
 
+    /**
+     * Check if city field required in configuration.
+     *
+     * @return bool
+     * @throws LocalizedException
+     */
+    private function isCityRequired()
+    {
+        return $this->eavConfig->getAttribute('customer_address', 'city')->getIsRequired();
+    }
+
     /**
      * Reload address attributes for the certain store
      *
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCustomerShowCityActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCustomerShowCityActionGroup.xml
new file mode 100644
index 0000000000000..03d9c9cabcc3a
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCustomerShowCityActionGroup.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright 2024 Adobe
+  * All Rights Reserved.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminCustomerShowCityActionGroup">
+        <annotations>
+            <description>Goes to the customer configuration. Set "Show City" with provided value.</description>
+        </annotations>
+        <arguments>
+            <argument name="value" type="string" defaultValue="{{ShowCity.optional}}"/>
+        </arguments>
+        <amOnPage url="{{AdminCustomerConfigPage.url('#customer_address-link')}}" stepKey="openCustomerConfigPage"/>
+        <waitForPageLoad stepKey="waitCustomerConfigPage"/>
+        <scrollTo selector="{{AdminCustomerConfigSection.showCity}}" x="0" y="-100" stepKey="scrollToShowCity"/>
+        <uncheckOption selector="{{AdminCustomerConfigSection.showCityInherit}}" stepKey="uncheckUseSystem"/>
+        <selectOption selector="{{AdminCustomerConfigSection.showCity}}" userInput="{{value}}" stepKey="fillShowCity"/>
+        <click selector="{{AdminMainActionsSection.save}}" stepKey="clickSave"/>
+        <seeElement selector="{{AdminMessagesSection.success}}" stepKey="seeSuccessMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/Data/AdminCustomerConfigData.xml b/app/code/Magento/Customer/Test/Mftf/Data/AdminCustomerConfigData.xml
index 47b37a4a8e264..8a9690a88c86f 100644
--- a/app/code/Magento/Customer/Test/Mftf/Data/AdminCustomerConfigData.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Data/AdminCustomerConfigData.xml
@@ -18,6 +18,11 @@
         <data key="optional">Optional</data>
         <data key="required">Required</data>
     </entity>
+    <entity name="ShowCity">
+        <data key="no">No</data>
+        <data key="optional">Optional</data>
+        <data key="required">Required</data>
+    </entity>
     <entity name="ShowCompany">
         <data key="no">No</data>
         <data key="optional">Optional</data>
diff --git a/app/code/Magento/Customer/Test/Mftf/Data/CustomerConfigData.xml b/app/code/Magento/Customer/Test/Mftf/Data/CustomerConfigData.xml
index 3eb14604220e9..ba3c8ee0a9757 100644
--- a/app/code/Magento/Customer/Test/Mftf/Data/CustomerConfigData.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Data/CustomerConfigData.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
+  * Copyright 2024 Adobe
+  * All Rights Reserved.
   */
 -->
 
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerConfigSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerConfigSection.xml
index 671bdde86432f..92fe75714d49b 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerConfigSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerConfigSection.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
+  * Copyright 2024 Adobe
+  * All Rights Reserved.
   */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
@@ -17,6 +17,7 @@
         <element name="showTelephoneInherit" type="checkbox" selector="#customer_address_telephone_show_inherit"/>
         <element name="showCompany" type="select" selector="#customer_address_company_show"/>
         <element name="showCompanyInherit" type="select" selector="#customer_address_company_show_inherit"/>
+        <element name="showCity" type="select" selector="#customer_address_city_show"/>
         <element name="passwordOptions" type="select" selector="#customer_password-head"/>
         <element name="passwordResetProtectionType" type="select" selector="#customer_password_password_reset_protection_type"/>
         <element name="passwordResetProtectionTypeOptions" type="select" selector="#customer_password_password_reset_protection_type option:nth-child({{option}})" parameterized="true"/>
diff --git a/app/code/Magento/Customer/etc/adminhtml/system.xml b/app/code/Magento/Customer/etc/adminhtml/system.xml
index ec76e09fdf459..8ae8641d3d099 100644
--- a/app/code/Magento/Customer/etc/adminhtml/system.xml
+++ b/app/code/Magento/Customer/etc/adminhtml/system.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
@@ -266,6 +266,11 @@
                     <source_model>Magento\Config\Model\Config\Source\Nooptreq</source_model>
                     <backend_model>Magento\Customer\Model\Config\Backend\Show\AddressOnly</backend_model>
                 </field>
+                <field id="city_show" translate="label" type="select" sortOrder="130" showInDefault="1" showInWebsite="1" canRestore="1">
+                    <label>Show City</label>
+                    <source_model>Magento\Config\Model\Config\Source\Nooptreq</source_model>
+                    <backend_model>Magento\Customer\Model\Config\Backend\Show\AddressOnly</backend_model>
+                </field>
             </group>
             <group id="startup" translate="label" sortOrder="90" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Login Options</label>
diff --git a/app/code/Magento/Customer/etc/config.xml b/app/code/Magento/Customer/etc/config.xml
index 23a7c9ebb4034..46ac5921e3d10 100644
--- a/app/code/Magento/Customer/etc/config.xml
+++ b/app/code/Magento/Customer/etc/config.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
@@ -59,6 +59,7 @@
                 <telephone_show>req</telephone_show>
                 <company_show>opt</company_show>
                 <fax_show/>
+                <city_show>req</city_show>
             </address>
             <startup>
                 <redirect_dashboard>0</redirect_dashboard>
@@ -71,7 +72,7 @@
 {{depend street2}}{{var street2}}{{/depend}}
 {{depend street3}}{{var street3}}{{/depend}}
 {{depend street4}}{{var street4}}{{/depend}}
-{{if city}}{{var city}},  {{/if}}{{if region}}{{var region}}, {{/if}}{{if postcode}}{{var postcode}}{{/if}}
+{{depend city}}{{var city}},{{/depend}}  {{if region}}{{var region}}, {{/if}}{{if postcode}}{{var postcode}}{{/if}}
 {{var country}}
 {{depend telephone}}T: {{var telephone}}{{/depend}}
 {{depend fax}}F: {{var fax}}{{/depend}}
@@ -83,7 +84,7 @@
 {{depend street2}}{{var street2}}<br />{{/depend}}
 {{depend street3}}{{var street3}}<br />{{/depend}}
 {{depend street4}}{{var street4}}<br />{{/depend}}
-{{if city}}{{var city}},  {{/if}}{{if region}}{{var region}}, {{/if}}{{if postcode}}{{var postcode}}{{/if}}<br />
+{{depend city}}{{var city}},{{/depend}}  {{if region}}{{var region}}, {{/if}}{{if postcode}}{{var postcode}}{{/if}}<br />
 {{var country}}<br />
 {{depend telephone}}T: <a href="tel:{{var telephone}}">{{var telephone}}</a>{{/depend}}
 {{depend fax}}<br />F: {{var fax}}{{/depend}}
@@ -94,7 +95,7 @@
 {{depend street2}}{{var street2}}|{{/depend}}
 {{depend street3}}{{var street3}}|{{/depend}}
 {{depend street4}}{{var street4}}|{{/depend}}
-{{if city}}{{var city}}, {{/if}}{{if region}}{{var region}}, {{/if}}{{if postcode}}{{var postcode}}{{/if}}|
+{{depend city}}{{var city}},|{{/depend}} {{if region}}{{var region}}, {{/if}}{{if postcode}}{{var postcode}}{{/if}}|
 {{var country}}|
 {{depend telephone}}T: {{var telephone}}|{{/depend}}
 {{depend fax}}F: {{var fax}}|{{/depend}}|
diff --git a/app/code/Magento/Customer/view/adminhtml/ui_component/customer_address_form.xml b/app/code/Magento/Customer/view/adminhtml/ui_component/customer_address_form.xml
index 517d8151b5f10..a634425abdf32 100644
--- a/app/code/Magento/Customer/view/adminhtml/ui_component/customer_address_form.xml
+++ b/app/code/Magento/Customer/view/adminhtml/ui_component/customer_address_form.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
  */
 -->
 <form xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd" component="Magento_Customer/js/form/components/form">
@@ -207,9 +207,6 @@
                 <dataType>text</dataType>
                 <label translate="true">City</label>
                 <visible>true</visible>
-                <validation>
-                    <rule name="required-entry" xsi:type="boolean">true</rule>
-                </validation>
             </settings>
         </field>
         <field name="postcode" component="Magento_Ui/js/form/element/post-code" sortOrder="120" formElement="input">
diff --git a/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml b/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
index a958f831e18a8..d272d14602ec6 100644
--- a/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
@@ -1,35 +1,45 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
  */
 
-/** @var \Magento\Customer\Block\Address\Edit $block */
-/** @var \Magento\Customer\ViewModel\Address $viewModel */
-/** @var \Magento\Framework\Escaper $escaper */
-/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
-/** @var \Magento\Customer\ViewModel\Address\RegionProvider $regionProvider */
+use Magento\Customer\Block\Address\Edit;
+use Magento\Customer\Block\Widget\City;
+use Magento\Customer\Block\Widget\Company;
+use Magento\Customer\Block\Widget\Fax;
+use Magento\Customer\Block\Widget\Telephone;
+use Magento\Customer\ViewModel\Address;
+use Magento\Customer\ViewModel\Address\RegionProvider;
+use Magento\Framework\Escaper;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+
+/** @var Edit $block */
+/** @var Address $viewModel */
+/** @var Escaper $escaper */
+/** @var SecureHtmlRenderer $secureRenderer */
+/** @var RegionProvider $regionProvider */
 $viewModel = $block->getViewModel();
 $regionProvider = $block->getRegionProvider();
 ?>
-<?php $_company = $block->getLayout()->createBlock(\Magento\Customer\Block\Widget\Company::class) ?>
-<?php $_telephone = $block->getLayout()->createBlock(\Magento\Customer\Block\Widget\Telephone::class) ?>
-<?php $_fax = $block->getLayout()->createBlock(\Magento\Customer\Block\Widget\Fax::class) ?>
-<?php $_country_id = $block->getAttributeData()->getFrontendLabel('country_id'); ?>
-<?php $_street = $block->getAttributeData()->getFrontendLabel('street'); ?>
-<?php $_city = $block->getAttributeData()->getFrontendLabel('city'); ?>
-<?php $_region = $block->getAttributeData()->getFrontendLabel('region'); ?>
-<?php $_selectRegion = 'Please select a region, state or province.'; ?>
-<?php $_displayAll = $block->getConfig('general/region/display_all'); ?>
+<?php $company = $block->getLayout()->createBlock(Company::class) ?>
+<?php $telephone = $block->getLayout()->createBlock(Telephone::class) ?>
+<?php $fax = $block->getLayout()->createBlock(Fax::class) ?>
+<?php $country_id = $block->getAttributeData()->getFrontendLabel('country_id'); ?>
+<?php $street = $block->getAttributeData()->getFrontendLabel('street'); ?>
+<?php $city = $block->getLayout()->createBlock(City::class); ?>
+<?php $region = $block->getAttributeData()->getFrontendLabel('region'); ?>
+<?php $selectRegion = 'Please select a region, state or province.'; ?>
+<?php $displayAll = $block->getConfig('general/region/display_all'); ?>
 
-<?php $_vatidValidationClass = $viewModel->addressGetAttributeValidationClass('vat_id'); ?>
-<?php $_cityValidationClass = $viewModel->addressGetAttributeValidationClass('city'); ?>
-<?php $_postcodeValidationClass_value = $viewModel->addressGetAttributeValidationClass('postcode'); ?>
-<?php $_postcodeValidationClass = $_postcodeValidationClass_value; ?>
-<?php $_streetValidationClass = $viewModel->addressGetAttributeValidationClass('street'); ?>
-<?php $_streetValidationClassNotRequired = $_streetValidationClass !== null ?
-    trim(str_replace('required-entry', '', $_streetValidationClass)) : ''; ?>
-<?php $_regionValidationClass = $viewModel->addressGetAttributeValidationClass('region'); ?>
+<?php $vatIdValidationClass = $viewModel->addressGetAttributeValidationClass('vat_id'); ?>
+<?php $cityValidationClass = $viewModel->addressGetAttributeValidationClass('city'); ?>
+<?php $postcodeValidationClass_value = $viewModel->addressGetAttributeValidationClass('postcode'); ?>
+<?php $postcodeValidationClass = $postcodeValidationClass_value; ?>
+<?php $streetValidationClass = $viewModel->addressGetAttributeValidationClass('street'); ?>
+<?php $streetValidationClassNotRequired = $streetValidationClass !== null ?
+    trim(str_replace('required-entry', '', $streetValidationClass)) : ''; ?>
+<?php $regionValidationClass = $viewModel->addressGetAttributeValidationClass('region'); ?>
 <form class="form-address-edit"
       action="<?= $escaper->escapeUrl($block->getSaveUrl()) ?>"
       method="post"
@@ -43,23 +53,23 @@ $regionProvider = $block->getRegionProvider();
         <input type="hidden" name="error_url" value="<?= $escaper->escapeUrl($block->getErrorUrl()) ?>">
         <?= $block->getNameBlockHtml() ?>
 
-        <?php if ($_company->isEnabled()): ?>
-            <?= $_company->setCompany($block->getAddress()->getCompany())->toHtml() ?>
+        <?php if ($company->isEnabled()): ?>
+            <?= $company->setCompany($block->getAddress()->getCompany())->toHtml() ?>
         <?php endif ?>
 
-        <?php if ($_telephone->isEnabled()): ?>
-            <?= $_telephone->setTelephone($block->getAddress()->getTelephone())->toHtml() ?>
+        <?php if ($telephone->isEnabled()): ?>
+            <?= $telephone->setTelephone($block->getAddress()->getTelephone())->toHtml() ?>
         <?php endif ?>
 
-        <?php if ($_fax->isEnabled()): ?>
-            <?= $_fax->setFax($block->getAddress()->getFax())->toHtml() ?>
+        <?php if ($fax->isEnabled()): ?>
+            <?= $fax->setFax($block->getAddress()->getFax())->toHtml() ?>
         <?php endif ?>
 
     </fieldset>
     <fieldset class="fieldset">
         <legend class="legend"><span><?= $escaper->escapeHtml(__('Address')) ?></span></legend><br>
         <div class="field street required">
-            <label for="street_1" class="label"><span><?= /* @noEscape */ $_street ?></span></label>
+            <label for="street_1" class="label"><span><?= /* @noEscape */ $street ?></span></label>
             <div class="control">
                 <div class="field primary">
                     <label for="street_1" class="label">
@@ -71,9 +81,9 @@ $regionProvider = $block->getRegionProvider();
                 <input type="text"
                        name="street[0]"
                        value="<?= $escaper->escapeHtmlAttr($block->getStreetLine(1)) ?>"
-                       title="<?= /* @noEscape */ $_street ?>"
+                       title="<?= /* @noEscape */ $street ?>"
                        id="street_1"
-                       class="input-text <?= $escaper->escapeHtmlAttr($_streetValidationClass) ?>"/>
+                       class="input-text <?= $escaper->escapeHtmlAttr($streetValidationClass) ?>"/>
                 <div class="nested">
                     <?php for ($_i = 1, $_n = $viewModel->addressGetStreetLines(); $_i < $_n; $_i++): ?>
                         <div class="field additional">
@@ -86,7 +96,7 @@ $regionProvider = $block->getRegionProvider();
                                        title="<?= $escaper->escapeHtmlAttr(__('Street Address %1', $_i + 1)) ?>"
                                        id="street_<?= /* @noEscape */ $_i + 1 ?>"
                                        class="input-text
-                                        <?= $escaper->escapeHtmlAttr($_streetValidationClassNotRequired) ?>">
+                                        <?= $escaper->escapeHtmlAttr($streetValidationClassNotRequired) ?>">
                             </div>
                         </div>
                     <?php endfor; ?>
@@ -104,7 +114,7 @@ $regionProvider = $block->getRegionProvider();
                            name="vat_id"
                            value="<?= $escaper->escapeHtmlAttr($block->getAddress()->getVatId()) ?>"
                            title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('vat_id') ?>"
-                           class="input-text <?= $escaper->escapeHtmlAttr($_vatidValidationClass) ?>"
+                           class="input-text <?= $escaper->escapeHtmlAttr($vatIdValidationClass) ?>"
                            id="vat_id">
                 </div>
             </div>
@@ -119,38 +129,30 @@ $regionProvider = $block->getRegionProvider();
         </div>
         <div class="field region required">
             <label class="label" for="region_id">
-                <span><?= /* @noEscape */ $_region ?></span>
+                <span><?= /* @noEscape */ $region ?></span>
             </label>
             <div class="control">
                 <select id="region_id" name="region_id"
-                        title="<?= /* @noEscape */ $_region ?>"
+                        title="<?= /* @noEscape */ $region ?>"
                         class="validate-select region_id"
-                        <?= /* @noEscape */ !$_displayAll ? ' disabled="disabled"' : '' ?>>
-                    <option value=""><?= $escaper->escapeHtml(__($_selectRegion)) ?></option>
+                        <?= /* @noEscape */ !$displayAll ? ' disabled="disabled"' : '' ?>>
+                    <option value=""><?= $escaper->escapeHtml(__($selectRegion)) ?></option>
                 </select>
                 <input type="text"
                        id="region"
                        name="region"
                        value="<?= $escaper->escapeHtmlAttr($block->getRegion()) ?>"
-                       title="<?= /* @noEscape */ $_region ?>"
+                       title="<?= /* @noEscape */ $region ?>"
                        class="input-text validate-not-number-first
-                        <?= $escaper->escapeHtmlAttr($_regionValidationClass) ?>"
-                        <?= !$_displayAll ? ' disabled="disabled"' : '' ?>/>
-            </div>
-        </div>
-        <div class="field city required">
-            <label class="label" for="city">
-                <span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('city') ?></span>
-            </label>
-            <div class="control">
-                <input type="text"
-                       name="city"
-                       value="<?= $escaper->escapeHtmlAttr($block->getAddress()->getCity()) ?>"
-                       title="<?= $escaper->escapeHtmlAttr(__('City')) ?>"
-                       class="input-text <?= $escaper->escapeHtmlAttr($_cityValidationClass) ?>"
-                       id="city">
+                        <?= $escaper->escapeHtmlAttr($regionValidationClass) ?>"
+                        <?= !$displayAll ? ' disabled="disabled"' : '' ?>/>
             </div>
         </div>
+
+        <?php if ($city->isEnabled()): ?>
+            <?= $city->setCity($block->getAddress()->getCity())->toHtml() ?>
+        <?php endif ?>
+
         <div class="field zip required">
             <label class="label" for="zip">
                 <span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('postcode') ?></span>
@@ -162,7 +164,7 @@ $regionProvider = $block->getRegionProvider();
                        title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('postcode') ?>"
                        id="zip"
                        class="input-text validate-zip-international
-                        <?= $escaper->escapeHtmlAttr($_postcodeValidationClass) ?>">
+                        <?= $escaper->escapeHtmlAttr($postcodeValidationClass) ?>">
                 <div role="alert" class="message warning">
                     <span></span>
                 </div>
@@ -226,7 +228,7 @@ $regionProvider = $block->getRegionProvider();
         },
         "#country": {
             "directoryRegionUpdater": {
-                "optionalRegionAllowed": <?= /* @noEscape */ $_displayAll ? 'true' : 'false' ?>,
+                "optionalRegionAllowed": <?= /* @noEscape */ $displayAll ? 'true' : 'false' ?>,
                 "regionListId": "#region_id",
                 "regionInputId": "#region",
                 "postcodeId": "#zip",
diff --git a/app/code/Magento/Customer/view/frontend/templates/form/register.phtml b/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
index c12ad2b11dc1b..55945a79407f8 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
@@ -1,12 +1,23 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
  */
 
-use Magento\Customer\Helper\Address;
+use Magento\Customer\Block\Form\Register;
+use Magento\Customer\Block\Widget\City;
+use Magento\Customer\Block\Widget\Company;
+use Magento\Customer\Block\Widget\Fax;
+use Magento\Customer\Block\Widget\Telephone;
+use Magento\Customer\ViewModel\Address\RegionProvider;
+use Magento\Directory\Helper\Data;
+use Magento\Framework\Escaper;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+
+/** @var Register $block */
+/** @var Escaper $escaper */
+/** @var SecureHtmlRenderer $secureRenderer */
 
-/** @var \Magento\Customer\Block\Form\Register $block */
 if (!$block->getButtonLockManager()) {
     $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
     $block->setButtonLockManager(
@@ -18,9 +29,9 @@ if (!$block->getButtonLockManager()) {
 
 /** @var Magento\Customer\Helper\Address $addressHelper */
 $addressHelper = $block->getData('addressHelper');
-/** @var \Magento\Directory\Helper\Data $directoryHelper */
+/** @var Data $directoryHelper */
 $directoryHelper = $block->getData('directoryHelper');
-/** @var \Magento\Customer\ViewModel\Address\RegionProvider $regionProvider */
+/** @var RegionProvider $regionProvider */
 $regionProvider = $block->getRegionProvider();
 $formData = $block->getFormData();
 ?>
@@ -85,17 +96,17 @@ $formData = $block->getFormData();
             <legend class="legend"><span><?= $escaper->escapeHtml(__('Address Information')) ?></span></legend><br>
             <input type="hidden" name="create_address" value="1" />
 
-            <?php $_company = $block->getLayout()->createBlock(\Magento\Customer\Block\Widget\Company::class) ?>
+            <?php $_company = $block->getLayout()->createBlock(Company::class) ?>
             <?php if ($_company->isEnabled()): ?>
                 <?= $_company->setCompany($formData->getCompany())->toHtml() ?>
             <?php endif ?>
 
-            <?php $_telephone = $block->getLayout()->createBlock(\Magento\Customer\Block\Widget\Telephone::class) ?>
+            <?php $_telephone = $block->getLayout()->createBlock(Telephone::class) ?>
             <?php if ($_telephone->isEnabled()): ?>
                 <?= $_telephone->setTelephone($formData->getTelephone())->toHtml() ?>
             <?php endif ?>
 
-            <?php $_fax = $block->getLayout()->createBlock(\Magento\Customer\Block\Widget\Fax::class) ?>
+            <?php $_fax = $block->getLayout()->createBlock(Fax::class) ?>
             <?php if ($_fax->isEnabled()): ?>
                 <?= $_fax->setFax($formData->getFax())->toHtml() ?>
             <?php endif ?>
@@ -190,19 +201,10 @@ $formData = $block->getFormData();
                 </div>
             </div>
 
-            <div class="field required">
-                <label for="city" class="label">
-                    <span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('city') ?></span>
-                </label>
-                <div class="control">
-                    <input type="text"
-                           name="city"
-                           value="<?= $escaper->escapeHtmlAttr($formData->getCity()) ?>"
-                           title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('city') ?>"
-                           class="input-text <?= $escaper->escapeHtmlAttr($cityValidationClass) ?>"
-                           id="city">
-                </div>
-            </div>
+            <?php $_city = $block->getLayout()->createBlock(City::class) ?>
+            <?php if ($_city->isEnabled()): ?>
+                <?= $_city->setCity($formData->getCity())->toHtml() ?>
+            <?php endif ?>
 
             <div class="field zip required">
                 <label for="zip" class="label">
diff --git a/app/code/Magento/Customer/view/frontend/templates/widget/city.phtml b/app/code/Magento/Customer/view/frontend/templates/widget/city.phtml
new file mode 100644
index 0000000000000..d6430d8541f75
--- /dev/null
+++ b/app/code/Magento/Customer/view/frontend/templates/widget/city.phtml
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ */
+
+use Magento\Customer\Block\Widget\City;
+use Magento\Framework\Escaper;
+
+/** @var City $block */
+/** @var Escaper $escaper */
+?>
+
+<div class="field city <?= $block->isRequired() ? 'required' : '' ?>">
+    <label for="city" class="label">
+        <span>
+            <?= $escaper->escapeHtml(__('City')) ?>
+        </span>
+    </label>
+    <div class="control">
+        <input type="text"
+               name="city"
+               id="city"
+               value="<?= $escaper->escapeHtmlAttr($block->getCity()) ?>"
+               title="<?= $escaper->escapeHtmlAttr(__('City')) ?>"
+               class="input-text <?= $escaper->escapeHtmlAttr(
+                   $block->getAttributeValidationClass('city')
+               ) ?>"
+        >
+    </div>
+</div>