diff --git a/CHANGELOG.md b/CHANGELOG.md
index dfc50fd28..ce7149af6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Stanford Profile
 
+11.0.4
+-------------------------------------------------------------------------------
+- D8CORE-7051 Use display field copy instead of token fields
+
 11.0.3
 -------------------------------------------------------------------------------
 - Next site settings and config ignores (#735)
diff --git a/stanford_profile.info.yml b/stanford_profile.info.yml
index 66ec6cf63..1d48f3dff 100644
--- a/stanford_profile.info.yml
+++ b/stanford_profile.info.yml
@@ -1,6 +1,6 @@
 name: 'Stanford Profile'
 description: 'Jumpstart Website Profile'
-version: 11.0.3
+version: 11.0.4
 type: profile
 project: Stanford
 core_version_requirement: ^9 || ^10
diff --git a/tests/codeception/acceptance/Content/SearchBlockCest.php b/tests/codeception/acceptance/Content/SearchBlockCest.php
index 5dbdfcb5d..573d4f9f5 100644
--- a/tests/codeception/acceptance/Content/SearchBlockCest.php
+++ b/tests/codeception/acceptance/Content/SearchBlockCest.php
@@ -40,7 +40,7 @@ public function testHideSearchBlock(AcceptanceTester $I) {
     $I->fillField('Site Owner Contact (value 1)', $this->faker->email);
     $I->fillField('Technical Contact (value 1)', $this->faker->email);
     $I->fillField('Accessibility Contact (value 1)', $this->faker->email);
-    $I->selectOption('Organization', $org_term->id());
+    $I->selectOption('[name="su_site_org[0][target_id]"]', $org_term->id());
     $I->click('Save');
     // The settings might have been created or updated.
     $I->see('Site Settings has been', '.messages-list');
diff --git a/tests/codeception/acceptance/SystemSiteConfigCest.php b/tests/codeception/acceptance/SystemSiteConfigCest.php
index af847bdb5..5d729ce22 100644
--- a/tests/codeception/acceptance/SystemSiteConfigCest.php
+++ b/tests/codeception/acceptance/SystemSiteConfigCest.php
@@ -51,7 +51,7 @@ public function testBasicSiteSettings(AcceptanceTester $I) {
     $I->fillField('Site Owner Contact (value 1)', $this->faker->email);
     $I->fillField('Technical Contact (value 1)', $this->faker->email);
     $I->fillField('Accessibility Contact (value 1)', $this->faker->email);
-    $I->selectOption('Organization', $org_term->id());
+    $I->selectOption('[name="su_site_org[0][target_id]"]', $org_term->id());
     $I->click('Save');
     $I->canSee('Site Settings has been', '.messages-list');
 
@@ -104,7 +104,7 @@ public function testSitePages(AcceptanceTester $I) {
     $I->fillField('Site Owner Contact (value 1)', $this->faker->email);
     $I->fillField('Technical Contact (value 1)', $this->faker->email);
     $I->fillField('Accessibility Contact (value 1)', $this->faker->email);
-    $I->selectOption('Organization', $org_term->id());
+    $I->selectOption('[name="su_site_org[0][target_id]"]', $org_term->id());
     $I->click('Save');
     $I->canSee('Site Settings has been', '.messages-list');
 
@@ -145,7 +145,7 @@ protected function experimentalTestGoogleAnalytics(AcceptanceTester $I) {
     $I->fillField('Site Owner Contact (value 1)', $this->faker->email);
     $I->fillField('Technical Contact (value 1)', $this->faker->email);
     $I->fillField('Accessibility Contact (value 1)', $this->faker->email);
-    $I->selectOption('Org Code', $org_term->id());
+    $I->selectOption('[name="su_site_org[0][target_id]"]', $org_term->id());
 
     $I->click('Save');
     $I->canSee('1 error has been found: Google Analytics Account');
diff --git a/tests/codeception/functional/Contrib/ExtLinkCest.php b/tests/codeception/functional/Contrib/ExtLinkCest.php
index 9a5d90a4d..4df16dfb3 100644
--- a/tests/codeception/functional/Contrib/ExtLinkCest.php
+++ b/tests/codeception/functional/Contrib/ExtLinkCest.php
@@ -64,7 +64,7 @@ public function testExtLink(FunctionalTester $I) {
     $I->fillField('Site Owner Contact (value 1)', $this->faker->email);
     $I->fillField('Technical Contact (value 1)', $this->faker->email);
     $I->fillField('Accessibility Contact (value 1)', $this->faker->email);
-    $I->selectOption('Org Code', $org_term->id());
+    $I->selectOption('.js-form-item-su-site-org-0-target-id select.simpler-select', $org_term->id());
     $I->click('Save');
     $I->canSee('Site Settings has been', '.messages-list');
 
diff --git a/tests/codeception/functional/Navigation/NavigationDropDownsCest.php b/tests/codeception/functional/Navigation/NavigationDropDownsCest.php
index d47e5315c..ccd2d27dd 100644
--- a/tests/codeception/functional/Navigation/NavigationDropDownsCest.php
+++ b/tests/codeception/functional/Navigation/NavigationDropDownsCest.php
@@ -62,7 +62,7 @@ public function testDropdownMenus(FunctionalTester $I) {
     $I->fillField('Site Owner Contact (value 1)', $this->faker->email);
     $I->fillField('Technical Contact (value 1)', $this->faker->email);
     $I->fillField('Accessibility Contact (value 1)', $this->faker->email);
-    $I->selectOption('Org Code', $org_term->id());
+    $I->selectOption('.js-form-item-su-site-org-0-target-id select.simpler-select', $org_term->id());
     $I->click('Save');
     $I->canSee('Site Settings has been', '.messages-list');