diff --git a/config/sync/field.storage.paragraph.field_office_visits.yml b/config/sync/field.storage.paragraph.field_office_visits.yml
index 28c9646201..eef6c7f6a7 100644
--- a/config/sync/field.storage.paragraph.field_office_visits.yml
+++ b/config/sync/field.storage.paragraph.field_office_visits.yml
@@ -18,8 +18,8 @@ settings:
       value: yes_appointment_only
       label: 'Yes, by appointment only'
     -
-      value: yes_first_come_first_served_basis
-      label: 'Yes, on a first-come, first-served basis'
+      value: yes_walk_in_visits_only
+      label: 'Yes, walk-in visits only'
     -
       value: yes_with_or_without_appointment
       label: 'Yes, with or without an appointment'
@@ -30,4 +30,4 @@ cardinality: 1
 translatable: true
 indexes: {  }
 persist_with_no_fields: false
-custom_storage: false
+custom_storage: false
\ No newline at end of file
diff --git a/config/sync/field.storage.paragraph.field_virtual_support.yml b/config/sync/field.storage.paragraph.field_virtual_support.yml
index bc694e0ff3..6b4f24874b 100644
--- a/config/sync/field.storage.paragraph.field_virtual_support.yml
+++ b/config/sync/field.storage.paragraph.field_virtual_support.yml
@@ -18,11 +18,11 @@ settings:
       value: yes_appointment_only
       label: 'Yes, by appointment only'
     -
-      value: yes_first_come_first_served_basis
-      label: 'Yes, on a first-come, first-served basis'
+      value: yes_veterans_can_call
+      label: 'Yes, Veterans can call at their convenience'
     -
-      value: yes_with_or_without_appointment
-      label: 'Yes, with or without an appointment'
+      value: virtual_visits_may_be_available
+      label: 'Virtual visits may be available'
   allowed_values_function: ''
 module: options
 locked: false
diff --git a/docroot/modules/custom/va_gov_post_api/src/Service/PostFacilityServiceVamc.php b/docroot/modules/custom/va_gov_post_api/src/Service/PostFacilityServiceVamc.php
index 3034c72cdd..402deecbe6 100644
--- a/docroot/modules/custom/va_gov_post_api/src/Service/PostFacilityServiceVamc.php
+++ b/docroot/modules/custom/va_gov_post_api/src/Service/PostFacilityServiceVamc.php
@@ -380,7 +380,7 @@ protected function chooseBestOfficeVisitOption(string $office_visits) {
         $text = $office_visits;
         break;
 
-      case 'yes_first_come_first_served_basis':
+      case 'yes_walk_in_visits_only':
       case 'yes_appointment_only':
         $text = ($this->officeVisits === 'yes_with_or_without_appointment')
           ? $this->officeVisits
@@ -389,7 +389,7 @@ protected function chooseBestOfficeVisitOption(string $office_visits) {
 
       case 'no':
         $text = ($this->officeVisits === 'yes_with_or_without_appointment'
-        || $this->officeVisits === 'yes_first_come_first_served_basis'
+        || $this->officeVisits === 'yes_walk_in_visits_only'
         || $this->officeVisits === 'yes_appointment_only')
         ? $this->officeVisits
         : $office_visits;