diff --git a/pkg/gen/primev3api/embedded_spec.go b/pkg/gen/primev3api/embedded_spec.go
index 15de952a6ae..ebf4567cbcd 100644
--- a/pkg/gen/primev3api/embedded_spec.go
+++ b/pkg/gen/primev3api/embedded_spec.go
@@ -3102,6 +3102,22 @@ func init() {
               "$ref": "#/definitions/StorageFacility"
             }
           ]
+        },
+        "tertiaryDeliveryAddress": {
+          "description": "A third delivery address for this shipment, if the customer entered one. An optional field.",
+          "allOf": [
+            {
+              "$ref": "#/definitions/Address"
+            }
+          ]
+        },
+        "tertiaryPickupAddress": {
+          "description": "A third pickup address for this shipment, if the customer entered one. An optional field.",
+          "allOf": [
+            {
+              "$ref": "#/definitions/Address"
+            }
+          ]
         }
       }
     },
@@ -3156,6 +3172,16 @@ func init() {
           "x-nullable": true,
           "x-omitempty": false
         },
+        "hasTertiaryDestinationAddress": {
+          "type": "boolean",
+          "x-nullable": true,
+          "x-omitempty": false
+        },
+        "hasTertiaryPickupAddress": {
+          "type": "boolean",
+          "x-nullable": true,
+          "x-omitempty": false
+        },
         "pickupAddress": {
           "description": "The address of the origin location where goods are being moved from.\n",
           "allOf": [
@@ -3222,6 +3248,22 @@ func init() {
           "description": "The estimated weight of the pro-gear being moved belonging to a spouse.",
           "type": "integer",
           "x-nullable": true
+        },
+        "tertiaryDestinationAddress": {
+          "description": "An optional third address near the destination where goods will be dropped off.\n",
+          "allOf": [
+            {
+              "$ref": "#/definitions/Address"
+            }
+          ]
+        },
+        "tertiaryPickupAddress": {
+          "description": "An optional third pickup location near the origin where additional goods exist.\n",
+          "allOf": [
+            {
+              "$ref": "#/definitions/Address"
+            }
+          ]
         }
       }
     },
@@ -6548,6 +6590,22 @@ func init() {
               "$ref": "#/definitions/StorageFacility"
             }
           ]
+        },
+        "tertiaryDeliveryAddress": {
+          "description": "A third delivery address for this shipment, if the customer entered one. An optional field.",
+          "allOf": [
+            {
+              "$ref": "#/definitions/Address"
+            }
+          ]
+        },
+        "tertiaryPickupAddress": {
+          "description": "A third pickup address for this shipment, if the customer entered one. An optional field.",
+          "allOf": [
+            {
+              "$ref": "#/definitions/Address"
+            }
+          ]
         }
       }
     },
@@ -6602,6 +6660,16 @@ func init() {
           "x-nullable": true,
           "x-omitempty": false
         },
+        "hasTertiaryDestinationAddress": {
+          "type": "boolean",
+          "x-nullable": true,
+          "x-omitempty": false
+        },
+        "hasTertiaryPickupAddress": {
+          "type": "boolean",
+          "x-nullable": true,
+          "x-omitempty": false
+        },
         "pickupAddress": {
           "description": "The address of the origin location where goods are being moved from.\n",
           "allOf": [
@@ -6668,6 +6736,22 @@ func init() {
           "description": "The estimated weight of the pro-gear being moved belonging to a spouse.",
           "type": "integer",
           "x-nullable": true
+        },
+        "tertiaryDestinationAddress": {
+          "description": "An optional third address near the destination where goods will be dropped off.\n",
+          "allOf": [
+            {
+              "$ref": "#/definitions/Address"
+            }
+          ]
+        },
+        "tertiaryPickupAddress": {
+          "description": "An optional third pickup location near the origin where additional goods exist.\n",
+          "allOf": [
+            {
+              "$ref": "#/definitions/Address"
+            }
+          ]
         }
       }
     },
diff --git a/pkg/gen/primev3messages/update_m_t_o_shipment.go b/pkg/gen/primev3messages/update_m_t_o_shipment.go
index 037dbf4557f..df0c18d8763 100644
--- a/pkg/gen/primev3messages/update_m_t_o_shipment.go
+++ b/pkg/gen/primev3messages/update_m_t_o_shipment.go
@@ -112,6 +112,16 @@ type UpdateMTOShipment struct {
 
 	// storage facility
 	StorageFacility *StorageFacility `json:"storageFacility,omitempty"`
+
+	// A third delivery address for this shipment, if the customer entered one. An optional field.
+	TertiaryDeliveryAddress struct {
+		Address
+	} `json:"tertiaryDeliveryAddress,omitempty"`
+
+	// A third pickup address for this shipment, if the customer entered one. An optional field.
+	TertiaryPickupAddress struct {
+		Address
+	} `json:"tertiaryPickupAddress,omitempty"`
 }
 
 // Validate validates this update m t o shipment
@@ -178,6 +188,14 @@ func (m *UpdateMTOShipment) Validate(formats strfmt.Registry) error {
 		res = append(res, err)
 	}
 
+	if err := m.validateTertiaryDeliveryAddress(formats); err != nil {
+		res = append(res, err)
+	}
+
+	if err := m.validateTertiaryPickupAddress(formats); err != nil {
+		res = append(res, err)
+	}
+
 	if len(res) > 0 {
 		return errors.CompositeValidationError(res...)
 	}
@@ -374,6 +392,22 @@ func (m *UpdateMTOShipment) validateStorageFacility(formats strfmt.Registry) err
 	return nil
 }
 
+func (m *UpdateMTOShipment) validateTertiaryDeliveryAddress(formats strfmt.Registry) error {
+	if swag.IsZero(m.TertiaryDeliveryAddress) { // not required
+		return nil
+	}
+
+	return nil
+}
+
+func (m *UpdateMTOShipment) validateTertiaryPickupAddress(formats strfmt.Registry) error {
+	if swag.IsZero(m.TertiaryPickupAddress) { // not required
+		return nil
+	}
+
+	return nil
+}
+
 // ContextValidate validate this update m t o shipment based on the context it is used
 func (m *UpdateMTOShipment) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
 	var res []error
@@ -410,6 +444,14 @@ func (m *UpdateMTOShipment) ContextValidate(ctx context.Context, formats strfmt.
 		res = append(res, err)
 	}
 
+	if err := m.contextValidateTertiaryDeliveryAddress(ctx, formats); err != nil {
+		res = append(res, err)
+	}
+
+	if err := m.contextValidateTertiaryPickupAddress(ctx, formats); err != nil {
+		res = append(res, err)
+	}
+
 	if len(res) > 0 {
 		return errors.CompositeValidationError(res...)
 	}
@@ -517,6 +559,16 @@ func (m *UpdateMTOShipment) contextValidateStorageFacility(ctx context.Context,
 	return nil
 }
 
+func (m *UpdateMTOShipment) contextValidateTertiaryDeliveryAddress(ctx context.Context, formats strfmt.Registry) error {
+
+	return nil
+}
+
+func (m *UpdateMTOShipment) contextValidateTertiaryPickupAddress(ctx context.Context, formats strfmt.Registry) error {
+
+	return nil
+}
+
 // MarshalBinary interface implementation
 func (m *UpdateMTOShipment) MarshalBinary() ([]byte, error) {
 	if m == nil {
diff --git a/pkg/gen/primev3messages/update_p_p_m_shipment.go b/pkg/gen/primev3messages/update_p_p_m_shipment.go
index 6778ab0cb05..ead98493601 100644
--- a/pkg/gen/primev3messages/update_p_p_m_shipment.go
+++ b/pkg/gen/primev3messages/update_p_p_m_shipment.go
@@ -44,6 +44,12 @@ type UpdatePPMShipment struct {
 	// has secondary pickup address
 	HasSecondaryPickupAddress *bool `json:"hasSecondaryPickupAddress"`
 
+	// has tertiary destination address
+	HasTertiaryDestinationAddress *bool `json:"hasTertiaryDestinationAddress"`
+
+	// has tertiary pickup address
+	HasTertiaryPickupAddress *bool `json:"hasTertiaryPickupAddress"`
+
 	// The address of the origin location where goods are being moved from.
 	//
 	PickupAddress struct {
@@ -88,6 +94,18 @@ type UpdatePPMShipment struct {
 
 	// The estimated weight of the pro-gear being moved belonging to a spouse.
 	SpouseProGearWeight *int64 `json:"spouseProGearWeight,omitempty"`
+
+	// An optional third address near the destination where goods will be dropped off.
+	//
+	TertiaryDestinationAddress struct {
+		Address
+	} `json:"tertiaryDestinationAddress,omitempty"`
+
+	// An optional third pickup location near the origin where additional goods exist.
+	//
+	TertiaryPickupAddress struct {
+		Address
+	} `json:"tertiaryPickupAddress,omitempty"`
 }
 
 // Validate validates this update p p m shipment
@@ -126,6 +144,14 @@ func (m *UpdatePPMShipment) Validate(formats strfmt.Registry) error {
 		res = append(res, err)
 	}
 
+	if err := m.validateTertiaryDestinationAddress(formats); err != nil {
+		res = append(res, err)
+	}
+
+	if err := m.validateTertiaryPickupAddress(formats); err != nil {
+		res = append(res, err)
+	}
+
 	if len(res) > 0 {
 		return errors.CompositeValidationError(res...)
 	}
@@ -219,6 +245,22 @@ func (m *UpdatePPMShipment) validateSitLocation(formats strfmt.Registry) error {
 	return nil
 }
 
+func (m *UpdatePPMShipment) validateTertiaryDestinationAddress(formats strfmt.Registry) error {
+	if swag.IsZero(m.TertiaryDestinationAddress) { // not required
+		return nil
+	}
+
+	return nil
+}
+
+func (m *UpdatePPMShipment) validateTertiaryPickupAddress(formats strfmt.Registry) error {
+	if swag.IsZero(m.TertiaryPickupAddress) { // not required
+		return nil
+	}
+
+	return nil
+}
+
 // ContextValidate validate this update p p m shipment based on the context it is used
 func (m *UpdatePPMShipment) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
 	var res []error
@@ -243,6 +285,14 @@ func (m *UpdatePPMShipment) ContextValidate(ctx context.Context, formats strfmt.
 		res = append(res, err)
 	}
 
+	if err := m.contextValidateTertiaryDestinationAddress(ctx, formats); err != nil {
+		res = append(res, err)
+	}
+
+	if err := m.contextValidateTertiaryPickupAddress(ctx, formats); err != nil {
+		res = append(res, err)
+	}
+
 	if len(res) > 0 {
 		return errors.CompositeValidationError(res...)
 	}
@@ -290,6 +340,16 @@ func (m *UpdatePPMShipment) contextValidateSitLocation(ctx context.Context, form
 	return nil
 }
 
+func (m *UpdatePPMShipment) contextValidateTertiaryDestinationAddress(ctx context.Context, formats strfmt.Registry) error {
+
+	return nil
+}
+
+func (m *UpdatePPMShipment) contextValidateTertiaryPickupAddress(ctx context.Context, formats strfmt.Registry) error {
+
+	return nil
+}
+
 // MarshalBinary interface implementation
 func (m *UpdatePPMShipment) MarshalBinary() ([]byte, error) {
 	if m == nil {
diff --git a/pkg/handlers/primeapiv3/payloads/payload_to_model.go b/pkg/handlers/primeapiv3/payloads/payload_to_model.go
index 28be5539b61..50588acfb28 100644
--- a/pkg/handlers/primeapiv3/payloads/payload_to_model.go
+++ b/pkg/handlers/primeapiv3/payloads/payload_to_model.go
@@ -341,6 +341,14 @@ func MTOShipmentModelFromUpdate(mtoShipment *primev3messages.UpdateMTOShipment,
 		model.HasSecondaryPickupAddress = handlers.FmtBool(true)
 	}
 
+	addressModel = AddressModel(&mtoShipment.TertiaryPickupAddress.Address)
+	if addressModel != nil {
+		model.TertiaryPickupAddress = addressModel
+		tertiaryPickupAddressID := uuid.FromStringOrNil(addressModel.ID.String())
+		model.TertiaryPickupAddressID = &tertiaryPickupAddressID
+		model.HasTertiaryPickupAddress = handlers.FmtBool(true)
+	}
+
 	addressModel = AddressModel(&mtoShipment.SecondaryDeliveryAddress.Address)
 	if addressModel != nil {
 		model.SecondaryDeliveryAddress = addressModel
@@ -349,6 +357,14 @@ func MTOShipmentModelFromUpdate(mtoShipment *primev3messages.UpdateMTOShipment,
 		model.HasSecondaryDeliveryAddress = handlers.FmtBool(true)
 	}
 
+	addressModel = AddressModel(&mtoShipment.TertiaryDeliveryAddress.Address)
+	if addressModel != nil {
+		model.TertiaryDeliveryAddress = addressModel
+		tertiaryDeliveryAddressID := uuid.FromStringOrNil(addressModel.ID.String())
+		model.TertiaryDeliveryAddressID = &tertiaryDeliveryAddressID
+		model.HasTertiaryDeliveryAddress = handlers.FmtBool(true)
+	}
+
 	if mtoShipment.PpmShipment != nil {
 		model.PPMShipment = PPMShipmentModelFromUpdate(mtoShipment.PpmShipment)
 		model.PPMShipment.Shipment = *model
@@ -391,6 +407,15 @@ func PPMShipmentModelFromUpdate(ppmShipment *primev3messages.UpdatePPMShipment)
 		}
 	}
 
+	if ppmShipment.HasTertiaryPickupAddress != nil && *ppmShipment.HasTertiaryPickupAddress {
+		addressModel = AddressModel(&ppmShipment.TertiaryPickupAddress.Address)
+		if addressModel != nil {
+			model.TertiaryPickupAddress = addressModel
+			tertiaryPickupAddressID := uuid.FromStringOrNil(addressModel.ID.String())
+			model.TertiaryPickupAddressID = &tertiaryPickupAddressID
+		}
+	}
+
 	addressModel = AddressModel(&ppmShipment.DestinationAddress.Address)
 	if addressModel != nil {
 		model.DestinationAddress = addressModel
@@ -406,6 +431,15 @@ func PPMShipmentModelFromUpdate(ppmShipment *primev3messages.UpdatePPMShipment)
 		}
 	}
 
+	if ppmShipment.HasTertiaryDestinationAddress != nil && *ppmShipment.HasTertiaryDestinationAddress {
+		addressModel = AddressModel(&ppmShipment.TertiaryDestinationAddress.Address)
+		if addressModel != nil {
+			model.TertiaryDestinationAddress = addressModel
+			tertiaryDestinationAddressID := uuid.FromStringOrNil(addressModel.ID.String())
+			model.TertiaryDestinationAddressID = &tertiaryDestinationAddressID
+		}
+	}
+
 	expectedDepartureDate := handlers.FmtDatePtrToPopPtr(ppmShipment.ExpectedDepartureDate)
 	if expectedDepartureDate != nil && !expectedDepartureDate.IsZero() {
 		model.ExpectedDepartureDate = *expectedDepartureDate
diff --git a/playwright/tests/office/primesimulator/primeSimulatorFlows.spec.js b/playwright/tests/office/primesimulator/primeSimulatorFlows.spec.js
index 5b6f56fbb57..a6cc84e9f04 100644
--- a/playwright/tests/office/primesimulator/primeSimulatorFlows.spec.js
+++ b/playwright/tests/office/primesimulator/primeSimulatorFlows.spec.js
@@ -148,7 +148,7 @@ test.describe('Prime simulator user', () => {
     await page.locator('input[name="destinationAddress.city"]').fill('Joshua Tree');
     await page.locator('select[name="destinationAddress.state"]').selectOption({ label: 'CA' });
     await page.locator('input[name="destinationAddress.postalCode"]').fill('92252');
-    await page.getByTestId('dropdown').nth(1).selectOption('Home of record (HOR)');
+    await page.getByTestId('dropdown').nth(5).selectOption('Home of record (HOR)');
 
     await page.getByText('Save').click();
     await expect(page.getByText('Successfully updated shipment')).toHaveCount(1);
diff --git a/src/pages/PrimeUI/Shipment/PrimeUIShipmentUpdate.jsx b/src/pages/PrimeUI/Shipment/PrimeUIShipmentUpdate.jsx
index 699700e7ee8..bb408d21f55 100644
--- a/src/pages/PrimeUI/Shipment/PrimeUIShipmentUpdate.jsx
+++ b/src/pages/PrimeUI/Shipment/PrimeUIShipmentUpdate.jsx
@@ -20,7 +20,12 @@ import formStyles from 'styles/form.module.scss';
 import WizardNavigation from 'components/Customer/WizardNavigation/WizardNavigation';
 import { requiredAddressSchema, addressSchema } from 'utils/validation';
 import { isEmpty, isValidWeight } from 'shared/utils';
-import { formatAddressForPrimeAPI, formatSwaggerDate, fromPrimeAPIAddressFormat } from 'utils/formatters';
+import {
+  formatAddressForPrimeAPI,
+  formatExtraAddressForPrimeAPI,
+  formatSwaggerDate,
+  fromPrimeAPIAddressFormat,
+} from 'utils/formatters';
 import PrimeUIShipmentUpdateForm from 'pages/PrimeUI/Shipment/PrimeUIShipmentUpdateForm';
 import PrimeUIShipmentUpdatePPMForm from 'pages/PrimeUI/Shipment/PrimeUIShipmentUpdatePPMForm';
 import { setFlashMessage as setFlashMessageAction } from 'store/flash/actions';
@@ -128,7 +133,11 @@ const PrimeUIShipmentUpdate = ({ setFlashMessage }) => {
   const reformatPrimeApiSecondaryDeliveryAddress = fromPrimeAPIAddressFormat(shipment.secondaryDeliveryAddress);
   const reformatPrimeApiTertiaryDeliveryAddress = fromPrimeAPIAddressFormat(shipment.tertiaryDeliveryAddress);
   const editablePickupAddress = isEmpty(reformatPrimeApiPickupAddress);
+  const editableSecondaryPickupAddress = isEmpty(reformatPrimeApiSecondaryPickupAddress);
+  const editableTertiaryPickupAddress = isEmpty(reformatPrimeApiTertiaryPickupAddress);
   const editableDestinationAddress = isEmpty(reformatPrimeApiDestinationAddress);
+  const editableSecondaryDeliveryAddress = isEmpty(reformatPrimeApiSecondaryDeliveryAddress);
+  const editableTertiaryDeliveryAddress = isEmpty(reformatPrimeApiTertiaryDeliveryAddress);
 
   const onCancelShipmentClick = () => {
     mutateMTOShipmentStatus({ mtoShipmentID: shipmentId, ifMatchETag: shipment.eTag }).then(() => {
@@ -144,8 +153,10 @@ const PrimeUIShipmentUpdate = ({ setFlashMessage }) => {
           expectedDepartureDate,
           pickupAddress,
           secondaryPickupAddress,
+          tertiaryPickupAddress,
           destinationAddress,
           secondaryDestinationAddress,
+          tertiaryDestinationAddress,
           sitExpected,
           sitLocation,
           sitEstimatedWeight,
@@ -156,7 +167,9 @@ const PrimeUIShipmentUpdate = ({ setFlashMessage }) => {
           proGearWeight,
           spouseProGearWeight,
           hasSecondaryPickupAddress,
+          hasTertiaryPickupAddress,
           hasSecondaryDestinationAddress,
+          hasTertiaryDestinationAddress,
         },
         counselorRemarks,
       } = values;
@@ -167,10 +180,16 @@ const PrimeUIShipmentUpdate = ({ setFlashMessage }) => {
           secondaryPickupAddress: isEmpty(secondaryPickupAddress)
             ? emptyAddress
             : formatAddressForPrimeAPI(secondaryPickupAddress),
+          tertiaryPickupAddress: isEmpty(tertiaryPickupAddress)
+            ? emptyAddress
+            : formatAddressForPrimeAPI(tertiaryPickupAddress),
           destinationAddress: isEmpty(destinationAddress) ? null : formatAddressForPrimeAPI(destinationAddress),
           secondaryDestinationAddress: isEmpty(secondaryDestinationAddress)
             ? emptyAddress
             : formatAddressForPrimeAPI(secondaryDestinationAddress),
+          tertiaryDestinationAddress: isEmpty(tertiaryDestinationAddress)
+            ? emptyAddress
+            : formatAddressForPrimeAPI(tertiaryDestinationAddress),
           sitExpected,
           ...(sitExpected && {
             sitLocation: sitLocation || null,
@@ -185,7 +204,9 @@ const PrimeUIShipmentUpdate = ({ setFlashMessage }) => {
             spouseProGearWeight: spouseProGearWeight ? parseInt(spouseProGearWeight, 10) : null,
           }),
           hasSecondaryPickupAddress: hasSecondaryPickupAddress === 'true',
+          hasTertiaryPickupAddress: hasTertiaryPickupAddress === 'true',
           hasSecondaryDestinationAddress: hasSecondaryDestinationAddress === 'true',
+          hasTertiaryDestinationAddress: hasTertiaryDestinationAddress === 'true',
         },
         counselorRemarks: counselorRemarks || null,
       };
@@ -200,7 +221,11 @@ const PrimeUIShipmentUpdate = ({ setFlashMessage }) => {
         actualDeliveryDate,
         scheduledDeliveryDate,
         pickupAddress,
+        secondaryPickupAddress,
+        tertiaryPickupAddress,
         destinationAddress,
+        secondaryDeliveryAddress,
+        tertiaryDeliveryAddress,
         destinationType,
         diversion,
       } = values;
@@ -215,7 +240,19 @@ const PrimeUIShipmentUpdate = ({ setFlashMessage }) => {
         scheduledDeliveryDate: scheduledDeliveryDate ? formatSwaggerDate(scheduledDeliveryDate) : null,
         actualDeliveryDate: actualDeliveryDate ? formatSwaggerDate(actualDeliveryDate) : null,
         pickupAddress: editablePickupAddress ? formatAddressForPrimeAPI(pickupAddress) : null,
+        secondaryPickupAddress: editableSecondaryPickupAddress
+          ? formatExtraAddressForPrimeAPI(secondaryPickupAddress)
+          : null,
+        tertiaryPickupAddress: editableTertiaryPickupAddress
+          ? formatExtraAddressForPrimeAPI(tertiaryPickupAddress)
+          : null,
         destinationAddress: editableDestinationAddress ? formatAddressForPrimeAPI(destinationAddress) : null,
+        secondaryDeliveryAddress: editableSecondaryDeliveryAddress
+          ? formatExtraAddressForPrimeAPI(secondaryDeliveryAddress)
+          : null,
+        tertiaryDeliveryAddress: editableTertiaryDeliveryAddress
+          ? formatExtraAddressForPrimeAPI(tertiaryDeliveryAddress)
+          : null,
         destinationType,
         diversion,
       };
@@ -237,12 +274,18 @@ const PrimeUIShipmentUpdate = ({ setFlashMessage }) => {
         secondaryPickupAddress: shipment.ppmShipment.secondaryPickupAddress
           ? formatAddressForPrimeAPI(shipment.ppmShipment.secondaryPickupAddress)
           : emptyAddress,
+        tertiaryPickupAddress: shipment.ppmShipment.tertiaryPickupAddress
+          ? formatAddressForPrimeAPI(shipment.ppmShipment.tertiaryPickupAddress)
+          : emptyAddress,
         destinationAddress: shipment.ppmShipment.destinationAddress
           ? formatAddressForPrimeAPI(shipment.ppmShipment.destinationAddress)
           : emptyAddress,
         secondaryDestinationAddress: shipment.ppmShipment.secondaryDestinationAddress
           ? formatAddressForPrimeAPI(shipment.ppmShipment.secondaryDestinationAddress)
           : emptyAddress,
+        tertiaryDestinationAddress: shipment.ppmShipment.tertiaryDestinationAddress
+          ? formatAddressForPrimeAPI(shipment.ppmShipment.tertiaryDestinationAddress)
+          : emptyAddress,
         sitExpected: shipment.ppmShipment.sitExpected,
         sitLocation: shipment.ppmShipment.sitLocation,
         sitEstimatedWeight: shipment.ppmShipment.sitEstimatedWeight?.toString(),
@@ -254,7 +297,9 @@ const PrimeUIShipmentUpdate = ({ setFlashMessage }) => {
         proGearWeight: shipment.ppmShipment.proGearWeight?.toString(),
         spouseProGearWeight: shipment.ppmShipment.spouseProGearWeight?.toString(),
         hasSecondaryPickupAddress: shipment.ppmShipment.hasSecondaryPickupAddress ? 'true' : 'false',
+        hasTertiaryPickupAddress: shipment.ppmShipment.hasTertiaryPickupAddress ? 'true' : 'false',
         hasSecondaryDestinationAddress: shipment.ppmShipment.hasSecondaryDestinationAddress ? 'true' : 'false',
+        hasTertiaryDestinationAddress: shipment.ppmShipment.hasTertiaryDestinationAddress ? 'true' : 'false',
       },
       counselorRemarks: shipment.counselorRemarks || '',
     };
@@ -265,8 +310,10 @@ const PrimeUIShipmentUpdate = ({ setFlashMessage }) => {
           .typeError('Invalid date. Must be in the format: DD MMM YYYY'),
         pickupAddress: requiredAddressSchema.required('Required'),
         secondaryPickupAddress: OptionalAddressSchema,
+        tertiaryPickupAddress: OptionalAddressSchema,
         destinationAddress: requiredAddressSchema.required('Required'),
         secondaryDestinationAddress: OptionalAddressSchema,
+        tertiaryDestinationAddress: OptionalAddressSchema,
         sitExpected: Yup.boolean().required('Required'),
         sitLocation: Yup.string().when('sitExpected', {
           is: true,
@@ -313,11 +360,13 @@ const PrimeUIShipmentUpdate = ({ setFlashMessage }) => {
       scheduledDeliveryDate: shipment.scheduledDeliveryDate,
       actualDeliveryDate: shipment.actualDeliveryDate,
       pickupAddress: editablePickupAddress ? emptyAddress : reformatPrimeApiPickupAddress,
-      secondaryPickupAddress: reformatPrimeApiSecondaryPickupAddress,
-      tertiaryPickupAddress: reformatPrimeApiTertiaryPickupAddress,
+      secondaryPickupAddress: editableSecondaryPickupAddress ? emptyAddress : reformatPrimeApiSecondaryPickupAddress,
+      tertiaryPickupAddress: editableTertiaryPickupAddress ? emptyAddress : reformatPrimeApiTertiaryPickupAddress,
       destinationAddress: editableDestinationAddress ? emptyAddress : reformatPrimeApiDestinationAddress,
-      secondaryDeliveryAddress: reformatPrimeApiSecondaryDeliveryAddress,
-      tertiaryDeliveryAddress: reformatPrimeApiTertiaryDeliveryAddress,
+      secondaryDeliveryAddress: editableSecondaryDeliveryAddress
+        ? emptyAddress
+        : reformatPrimeApiSecondaryDeliveryAddress,
+      tertiaryDeliveryAddress: editableTertiaryDeliveryAddress ? emptyAddress : reformatPrimeApiTertiaryDeliveryAddress,
       destinationType: shipment.destinationType,
       diversion: shipment.diversion,
     };
@@ -365,7 +414,11 @@ const PrimeUIShipmentUpdate = ({ setFlashMessage }) => {
                           editableProGearWeightActualField={editableProGearWeightActualField}
                           editableSpouseProGearWeightActualField={editableSpouseProGearWeightActualField}
                           editablePickupAddress={editablePickupAddress}
+                          editableSecondaryPickupAddress={editableSecondaryPickupAddress}
+                          editableTertiaryPickupAddress={editableTertiaryPickupAddress}
                           editableDestinationAddress={editableDestinationAddress}
+                          editableSecondaryDeliveryAddress={editableSecondaryDeliveryAddress}
+                          editableTertiaryDeliveryAddress={editableTertiaryDeliveryAddress}
                           estimatedWeight={initialValues.estimatedWeight}
                           actualWeight={initialValues.actualWeight}
                           actualProGearWeight={initialValues.actualProGearWeight}
@@ -378,6 +431,7 @@ const PrimeUIShipmentUpdate = ({ setFlashMessage }) => {
                           secondaryDeliveryAddress={initialValues.secondaryDeliveryAddress}
                           tertiaryDeliveryAddress={initialValues.tertiaryDeliveryAddress}
                           diversion={initialValues.diversion}
+                          shipmentType={shipment.shipmentType}
                         />
                       )}
                       <div className={formStyles.formActions}>
diff --git a/src/pages/PrimeUI/Shipment/PrimeUIShipmentUpdateForm.jsx b/src/pages/PrimeUI/Shipment/PrimeUIShipmentUpdateForm.jsx
index 50d8bdb2a57..795e6caf525 100644
--- a/src/pages/PrimeUI/Shipment/PrimeUIShipmentUpdateForm.jsx
+++ b/src/pages/PrimeUI/Shipment/PrimeUIShipmentUpdateForm.jsx
@@ -11,6 +11,7 @@ import { AddressFields } from 'components/form/AddressFields/AddressFields';
 import SectionWrapper from 'components/Customer/SectionWrapper';
 import formStyles from 'styles/form.module.scss';
 import { shipmentDestinationTypes } from 'constants/shipments';
+import { SHIPMENT_OPTIONS } from 'shared/constants';
 
 const emptyAddressShape = {
   streetAddress1: '',
@@ -28,7 +29,11 @@ const PrimeUIShipmentUpdateForm = ({
   editableProGearWeightActualField,
   editableSpouseProGearWeightActualField,
   editablePickupAddress,
+  editableSecondaryPickupAddress,
+  editableTertiaryPickupAddress,
   editableDestinationAddress,
+  editableSecondaryDeliveryAddress,
+  editableTertiaryDeliveryAddress,
   requestedPickupDate,
   estimatedWeight,
   actualWeight,
@@ -40,7 +45,10 @@ const PrimeUIShipmentUpdateForm = ({
   destinationAddress,
   secondaryDeliveryAddress,
   tertiaryDeliveryAddress,
+  shipmentType,
 }) => {
+  const isNTS = shipmentType === SHIPMENT_OPTIONS.NTS;
+  const isNTSR = shipmentType === SHIPMENT_OPTIONS.NTSR;
   return (
     <SectionWrapper className={`${formStyles.formSection} ${styles.formSectionHeader}`}>
       <h2 className={styles.sectionHeader}>Shipment Dates</h2>
@@ -146,17 +154,29 @@ const PrimeUIShipmentUpdateForm = ({
       <h5 className={styles.sectionHeader}>Pickup Address</h5>
       {editablePickupAddress && <AddressFields name="pickupAddress" />}
       {!editablePickupAddress && formatAddress(pickupAddress)}
-      <h5 className={styles.sectionHeader}>Second Pickup Address</h5>
-      {formatAddress(secondaryPickupAddress)}
-      <h5 className={styles.sectionHeader}>Third Pickup Address</h5>
-      {formatAddress(tertiaryPickupAddress)}
+      {!isNTSR && (
+        <>
+          <h5 className={styles.sectionHeader}>Second Pickup Address</h5>
+          {editableSecondaryPickupAddress && <AddressFields name="secondaryPickupAddress" />}
+          {!editableSecondaryPickupAddress && formatAddress(secondaryPickupAddress)}
+          <h5 className={styles.sectionHeader}>Third Pickup Address</h5>
+          {editableTertiaryPickupAddress && <AddressFields name="tertiaryPickupAddress" />}
+          {!editableTertiaryPickupAddress && formatAddress(tertiaryPickupAddress)}
+        </>
+      )}
       <h5 className={styles.sectionHeader}>Destination Address</h5>
       {editableDestinationAddress && <AddressFields name="destinationAddress" />}
       {!editableDestinationAddress && formatAddress(destinationAddress)}
-      <h5 className={styles.sectionHeader}>Second Destination Address</h5>
-      {formatAddress(secondaryDeliveryAddress)}
-      <h5 className={styles.sectionHeader}>Third Destination Address</h5>
-      {formatAddress(tertiaryDeliveryAddress)}
+      {!isNTS && (
+        <>
+          <h5 className={styles.sectionHeader}>Second Delivery Address</h5>
+          {editableSecondaryDeliveryAddress && <AddressFields name="secondaryDeliveryAddress" />}
+          {!editableSecondaryDeliveryAddress && formatAddress(secondaryDeliveryAddress)}
+          <h5 className={styles.sectionHeader}>Third Delivery Address</h5>
+          {editableTertiaryDeliveryAddress && <AddressFields name="tertiaryDeliveryAddress" />}
+          {!editableTertiaryDeliveryAddress && formatAddress(tertiaryDeliveryAddress)}
+        </>
+      )}
       <DropdownInput
         label="Destination type"
         name="destinationType"
diff --git a/src/pages/PrimeUI/Shipment/PrimeUIShipmentUpdatePPMForm.jsx b/src/pages/PrimeUI/Shipment/PrimeUIShipmentUpdatePPMForm.jsx
index aec30993ec4..040737e4898 100644
--- a/src/pages/PrimeUI/Shipment/PrimeUIShipmentUpdatePPMForm.jsx
+++ b/src/pages/PrimeUI/Shipment/PrimeUIShipmentUpdatePPMForm.jsx
@@ -15,7 +15,14 @@ const sitLocationOptions = dropdownInputOptions(LOCATION_TYPES);
 
 const PrimeUIShipmentUpdatePPMForm = () => {
   const { values } = useFormikContext();
-  const { sitExpected, hasProGear, hasSecondaryPickupAddress, hasSecondaryDestinationAddress } = values.ppmShipment;
+  const {
+    sitExpected,
+    hasProGear,
+    hasSecondaryPickupAddress,
+    hasTertiaryPickupAddress,
+    hasSecondaryDestinationAddress,
+    hasTertiaryDestinationAddress,
+  } = values.ppmShipment;
 
   return (
     <SectionWrapper className={`${formStyles.formSection} ${styles.formSectionHeader}`}>
@@ -62,7 +69,41 @@ const PrimeUIShipmentUpdatePPMForm = () => {
                 />
               </div>
             </FormGroup>
-            {hasSecondaryPickupAddress === 'true' && <AddressFields name="ppmShipment.secondaryPickupAddress" />}
+            {hasSecondaryPickupAddress === 'true' && (
+              <>
+                <AddressFields name="ppmShipment.secondaryPickupAddress" />
+                <h4>Third pickup location</h4>
+                <FormGroup>
+                  <p>
+                    Will the movers pick up any belongings from a third address? (Must be near the pickup address.
+                    Subject to approval.)
+                  </p>
+                  <div className={formStyles.radioGroup}>
+                    <Field
+                      as={Radio}
+                      id="has-tertiary-pickup"
+                      data-testid="has-tertiary-pickup"
+                      label="Yes"
+                      name="ppmShipment.hasTertiaryPickupAddress"
+                      value="true"
+                      title="Yes, there is a third pickup location"
+                      checked={hasTertiaryPickupAddress === 'true'}
+                    />
+                    <Field
+                      as={Radio}
+                      id="no-tertiary-pickup"
+                      data-testid="no-tertiary-pickup"
+                      label="No"
+                      name="ppmShipment.hasTertiaryPickupAddress"
+                      value="false"
+                      title="No, there is not a third pickup location"
+                      checked={hasTertiaryPickupAddress !== 'true'}
+                    />
+                  </div>
+                </FormGroup>
+                {hasTertiaryPickupAddress === 'true' && <AddressFields name="ppmShipment.tertiaryPickupAddress" />}
+              </>
+            )}
           </>
         )}
       />
@@ -103,7 +144,41 @@ const PrimeUIShipmentUpdatePPMForm = () => {
               </div>
             </FormGroup>
             {hasSecondaryDestinationAddress === 'true' && (
-              <AddressFields name="ppmShipment.secondaryDestinationAddress" />
+              <>
+                <AddressFields name="ppmShipment.secondaryDestinationAddress" />
+                <h4>Third destination location</h4>
+                <FormGroup>
+                  <p>
+                    Will the movers pick up any belongings from a third address? (Must be near the Destination address.
+                    Subject to approval.)
+                  </p>
+                  <div className={formStyles.radioGroup}>
+                    <Field
+                      as={Radio}
+                      id="has-tertiary-destination"
+                      data-testid="has-tertiary-destination"
+                      label="Yes"
+                      name="ppmShipment.hasTertiaryDestinationAddress"
+                      value="true"
+                      title="Yes, there is a third destination location"
+                      checked={hasTertiaryDestinationAddress === 'true'}
+                    />
+                    <Field
+                      as={Radio}
+                      id="no-tertiary-destination"
+                      data-testid="no-tertiary-destination"
+                      label="No"
+                      name="ppmShipment.hasTertiaryDestinationAddress"
+                      value="false"
+                      title="No, there is not a third destination location"
+                      checked={hasTertiaryDestinationAddress !== 'true'}
+                    />
+                  </div>
+                </FormGroup>
+                {hasTertiaryDestinationAddress === 'true' && (
+                  <AddressFields name="ppmShipment.tertiaryDestinationAddress" />
+                )}
+              </>
             )}
           </>
         )}
diff --git a/src/pages/PrimeUI/Shipment/PrimeUIShipmentUpdatePPMForm.test.jsx b/src/pages/PrimeUI/Shipment/PrimeUIShipmentUpdatePPMForm.test.jsx
index e6ca000f04a..be3ea189cd7 100644
--- a/src/pages/PrimeUI/Shipment/PrimeUIShipmentUpdatePPMForm.test.jsx
+++ b/src/pages/PrimeUI/Shipment/PrimeUIShipmentUpdatePPMForm.test.jsx
@@ -69,6 +69,14 @@ const shipment = {
       state: 'KY',
       postalCode: '42702',
     },
+    tertiaryPickupAddress: {
+      streetAddress1: '123 Test Lane',
+      streetAddress2: '234 Test Lane',
+      streetAddress3: 'Test Woman',
+      city: 'Missoula',
+      state: 'MT',
+      postalCode: '59801',
+    },
     destinationAddress: {
       streetAddress1: '222 Test Street',
       streetAddress2: '333 Test Street',
@@ -85,8 +93,18 @@ const shipment = {
       state: 'KY',
       postalCode: '42701',
     },
+    tertiaryDestinationAddress: {
+      streetAddress1: '321 Test Lane',
+      streetAddress2: '432 Test Lane',
+      streetAddress3: 'Test Woman',
+      city: 'Silver Spring',
+      state: 'MD',
+      postalCode: '20906',
+    },
     hasSecondaryPickupAddress: 'true',
     hasSecondaryDestinationAddress: 'true',
+    hasTertiaryPickupAddress: 'true',
+    hasTertiaryDestinationAddress: 'true',
     submittedAt: '2022-07-01T13:41:33.252Z',
     updatedAt: '2022-07-01T14:23:19.780Z',
   },
@@ -106,6 +124,18 @@ const shipment = {
     state: null,
     streetAddress1: null,
   },
+  tertiaryDeliveryAddress: {
+    city: null,
+    postalCode: null,
+    state: null,
+    streetAddress1: null,
+  },
+  tertiaryPickupAddress: {
+    city: null,
+    postalCode: null,
+    state: null,
+    streetAddress1: null,
+  },
   shipmentType: 'PPM',
   status: 'APPROVED',
   updatedAt: '2022-07-01T14:23:19.738Z',
@@ -173,33 +203,63 @@ describe('PrimeUIShipmentUpdatePPMForm', () => {
     );
 
     expect(await screen.getAllByLabelText('Address 1')[2]).toHaveValue(
-      initialValues.ppmShipment.destinationAddress.streetAddress1,
+      initialValues.ppmShipment.tertiaryPickupAddress.streetAddress1,
     );
     expect(await screen.getAllByLabelText(/Address 2/)[2]).toHaveValue(
-      initialValues.ppmShipment.destinationAddress.streetAddress2,
+      initialValues.ppmShipment.tertiaryPickupAddress.streetAddress2,
+    );
+    expect(await screen.getAllByLabelText('City')[2]).toHaveValue(initialValues.ppmShipment.tertiaryPickupAddress.city);
+    expect(await screen.getAllByLabelText('State')[2]).toHaveValue(
+      initialValues.ppmShipment.tertiaryPickupAddress.state,
     );
-    expect(await screen.getAllByLabelText('City')[2]).toHaveValue(initialValues.ppmShipment.destinationAddress.city);
-    expect(await screen.getAllByLabelText('State')[2]).toHaveValue(initialValues.ppmShipment.destinationAddress.state);
     expect(await screen.getAllByLabelText('ZIP')[2]).toHaveValue(
-      initialValues.ppmShipment.destinationAddress.postalCode,
+      initialValues.ppmShipment.tertiaryPickupAddress.postalCode,
     );
 
     expect(await screen.getAllByLabelText('Address 1')[3]).toHaveValue(
-      initialValues.ppmShipment.secondaryDestinationAddress.streetAddress1,
+      initialValues.ppmShipment.destinationAddress.streetAddress1,
     );
     expect(await screen.getAllByLabelText(/Address 2/)[3]).toHaveValue(
+      initialValues.ppmShipment.destinationAddress.streetAddress2,
+    );
+    expect(await screen.getAllByLabelText('City')[3]).toHaveValue(initialValues.ppmShipment.destinationAddress.city);
+    expect(await screen.getAllByLabelText('State')[3]).toHaveValue(initialValues.ppmShipment.destinationAddress.state);
+    expect(await screen.getAllByLabelText('ZIP')[3]).toHaveValue(
+      initialValues.ppmShipment.destinationAddress.postalCode,
+    );
+
+    expect(await screen.getAllByLabelText('Address 1')[4]).toHaveValue(
+      initialValues.ppmShipment.secondaryDestinationAddress.streetAddress1,
+    );
+    expect(await screen.getAllByLabelText(/Address 2/)[4]).toHaveValue(
       initialValues.ppmShipment.secondaryDestinationAddress.streetAddress2,
     );
-    expect(await screen.getAllByLabelText('City')[3]).toHaveValue(
+    expect(await screen.getAllByLabelText('City')[4]).toHaveValue(
       initialValues.ppmShipment.secondaryDestinationAddress.city,
     );
-    expect(await screen.getAllByLabelText('State')[3]).toHaveValue(
+    expect(await screen.getAllByLabelText('State')[4]).toHaveValue(
       initialValues.ppmShipment.secondaryDestinationAddress.state,
     );
-    expect(await screen.getAllByLabelText('ZIP')[3]).toHaveValue(
+    expect(await screen.getAllByLabelText('ZIP')[4]).toHaveValue(
       initialValues.ppmShipment.secondaryDestinationAddress.postalCode,
     );
 
+    expect(await screen.getAllByLabelText('Address 1')[5]).toHaveValue(
+      initialValues.ppmShipment.tertiaryDestinationAddress.streetAddress1,
+    );
+    expect(await screen.getAllByLabelText(/Address 2/)[5]).toHaveValue(
+      initialValues.ppmShipment.tertiaryDestinationAddress.streetAddress2,
+    );
+    expect(await screen.getAllByLabelText('City')[5]).toHaveValue(
+      initialValues.ppmShipment.tertiaryDestinationAddress.city,
+    );
+    expect(await screen.getAllByLabelText('State')[5]).toHaveValue(
+      initialValues.ppmShipment.tertiaryDestinationAddress.state,
+    );
+    expect(await screen.getAllByLabelText('ZIP')[5]).toHaveValue(
+      initialValues.ppmShipment.tertiaryDestinationAddress.postalCode,
+    );
+
     expect(await screen.findByText('Storage In Transit (SIT)')).toBeInTheDocument();
     expect(await screen.findByLabelText('SIT Expected')).toBeChecked();
     expect(await screen.findByLabelText('SIT Location')).toHaveValue(initialValues.ppmShipment.sitLocation);
diff --git a/src/utils/formatters.js b/src/utils/formatters.js
index 139ef5b179f..50b54459236 100644
--- a/src/utils/formatters.js
+++ b/src/utils/formatters.js
@@ -406,6 +406,19 @@ export const formatAddressForPrimeAPI = (address) => {
   };
 };
 
+export const formatExtraAddressForPrimeAPI = (address) => {
+  const { streetAddress1, city, state, postalCode } = address;
+  if (streetAddress1 === '' || city === '' || state === '' || postalCode === '') return null;
+  return {
+    streetAddress1: address.streetAddress1,
+    streetAddress2: address.streetAddress2,
+    streetAddress3: address.streetAddress3,
+    city: address.city,
+    state: address.state,
+    postalCode: address.postalCode,
+  };
+};
+
 const emptyAddress = {
   streetAddress1: '',
   streetAddress2: '',
diff --git a/swagger-def/prime_v3.yaml b/swagger-def/prime_v3.yaml
index ebefad72192..9a28d0380e2 100644
--- a/swagger-def/prime_v3.yaml
+++ b/swagger-def/prime_v3.yaml
@@ -561,6 +561,15 @@ definitions:
           An optional secondary pickup location near the origin where additional goods exist.
         allOf:
           - $ref: 'definitions/Address.yaml'
+      hasTertiaryPickupAddress:
+        type: boolean
+        x-omitempty: false
+        x-nullable: true
+      tertiaryPickupAddress:
+        description: >
+          An optional third pickup location near the origin where additional goods exist.
+        allOf:
+          - $ref: 'definitions/Address.yaml'
       destinationAddress:
         description: >
           The address of the destination location where goods are being delivered to.
@@ -575,6 +584,15 @@ definitions:
           An optional secondary address near the destination where goods will be dropped off.
         allOf:
           - $ref: 'definitions/Address.yaml'
+      hasTertiaryDestinationAddress:
+        type: boolean
+        x-omitempty: false
+        x-nullable: true
+      tertiaryDestinationAddress:
+        description: >
+          An optional third address near the destination where goods will be dropped off.
+        allOf:
+          - $ref: 'definitions/Address.yaml'
       sitExpected:
         description: |
           Captures whether some or all of the PPM shipment will require temporary storage at the origin or destination.
@@ -709,6 +727,14 @@ definitions:
         description: A second delivery address for this shipment, if the customer entered one. An optional field.
         allOf:
           - $ref: 'definitions/Address.yaml'
+      tertiaryPickupAddress:
+        description: A third pickup address for this shipment, if the customer entered one. An optional field.
+        allOf:
+          - $ref: 'definitions/Address.yaml'
+      tertiaryDeliveryAddress:
+        description: A third delivery address for this shipment, if the customer entered one. An optional field.
+        allOf:
+          - $ref: 'definitions/Address.yaml'
       storageFacility:
         allOf:
           - x-nullable: true
diff --git a/swagger/prime_v3.yaml b/swagger/prime_v3.yaml
index 77007b46f99..d13c94b496f 100644
--- a/swagger/prime_v3.yaml
+++ b/swagger/prime_v3.yaml
@@ -864,6 +864,16 @@ definitions:
           goods exist.
         allOf:
           - $ref: '#/definitions/Address'
+      hasTertiaryPickupAddress:
+        type: boolean
+        x-omitempty: false
+        x-nullable: true
+      tertiaryPickupAddress:
+        description: >
+          An optional third pickup location near the origin where additional
+          goods exist.
+        allOf:
+          - $ref: '#/definitions/Address'
       destinationAddress:
         description: >
           The address of the destination location where goods are being
@@ -880,6 +890,16 @@ definitions:
           dropped off.
         allOf:
           - $ref: '#/definitions/Address'
+      hasTertiaryDestinationAddress:
+        type: boolean
+        x-omitempty: false
+        x-nullable: true
+      tertiaryDestinationAddress:
+        description: >
+          An optional third address near the destination where goods will be
+          dropped off.
+        allOf:
+          - $ref: '#/definitions/Address'
       sitExpected:
         description: >
           Captures whether some or all of the PPM shipment will require
@@ -1047,6 +1067,18 @@ definitions:
           one. An optional field.
         allOf:
           - $ref: '#/definitions/Address'
+      tertiaryPickupAddress:
+        description: >-
+          A third pickup address for this shipment, if the customer entered one.
+          An optional field.
+        allOf:
+          - $ref: '#/definitions/Address'
+      tertiaryDeliveryAddress:
+        description: >-
+          A third delivery address for this shipment, if the customer entered
+          one. An optional field.
+        allOf:
+          - $ref: '#/definitions/Address'
       storageFacility:
         allOf:
           - x-nullable: true