diff --git a/src/layouts/address-vehicles/address-vehicles-question/address-vehicles-question.vue b/src/layouts/address-vehicles/address-vehicles-question/address-vehicles-question.vue
index 9bdf1382..8bce10ae 100644
--- a/src/layouts/address-vehicles/address-vehicles-question/address-vehicles-question.vue
+++ b/src/layouts/address-vehicles/address-vehicles-question/address-vehicles-question.vue
@@ -49,7 +49,7 @@ export default {
         vehicles: Array,
         vehicleSelected: Object,
         modelValue: String,
-        cmsWidgetName: String,
+        questionText: String,
         validationRules: String,
         isCarIdDifferent: Boolean,
         displayMatchedDifferentVehicleAlert: Boolean,
@@ -89,9 +89,6 @@ export default {
                 .replaceAll('{custom:vinYmmsFound}', vinYmmsFound)
                 .replaceAll('{custom:vinYmmsExpected}', vinYmmsExpected);
         },
-        questionText() {
-            return this.getCmsContent('VehicleConfirmationQuestion', 'QuestionText');
-        },
         selectedVehicleVin: {
             get() {
                 return this.modelValue;
@@ -123,4 +120,8 @@ export default {
 #address-vehicles-question-alert p {
     margin-bottom: 0 !important; // Overrides extra margin-bottom on alert body text
 }
+
+:deep(div.list-button-content > span:first-child) {
+    text-transform: uppercase;
+}
 </style>
diff --git a/src/layouts/address-vehicles/address-vehicles.spec.js b/src/layouts/address-vehicles/address-vehicles.spec.js
index 01147679..a1016855 100644
--- a/src/layouts/address-vehicles/address-vehicles.spec.js
+++ b/src/layouts/address-vehicles/address-vehicles.spec.js
@@ -100,6 +100,9 @@ function setupMocks({
                 if (contentName === 'ProvideVinAlert') {
                     return 'ProvideVinAlertTestReturn';
                 }
+                if (contentName === 'VehicleConfirmationQuestion') {
+                    return 'VehicleConfirmationQuestionTestReturn';
+                }
                 return null;
             })
         },
diff --git a/src/layouts/address-vehicles/address-vehicles.vue b/src/layouts/address-vehicles/address-vehicles.vue
index ea05519b..412072cc 100644
--- a/src/layouts/address-vehicles/address-vehicles.vue
+++ b/src/layouts/address-vehicles/address-vehicles.vue
@@ -13,15 +13,6 @@
                     <siteSubHeader
                         cmsWidgetName="SiteSubHeaderWidget"
                         class="mt-4" />
-                    <alert
-                        id="multiple-vehicles-alert"
-                        ref="alertFoundMultipleVehicles"
-                        cmsWidgetName="FoundMultipleVehicles"
-                        class="my-5"
-                        alertClass="alert-warning"
-                        :manualHeadline="AlertFoundMultipleVehiclesHeader"
-                        manualCopy=""
-                        :isDismissible="false" />
                     <alert
                         v-if="displayNoServiceAlert"
                         ref="AlertNoService"
@@ -32,7 +23,7 @@
                     <addressVehiclesQuestion
                         ref="addressVehiclesQuestion"
                         v-model="selectedVehicleVin"
-                        cmsWidgetName="VehicleConfirmationQuestion"
+                        :questionText="questionText"
                         :vehicles="VehiclesForQuestions"
                         :vehicleSelected="VehicleSelected"
                         validationRules="vehicle-required"
@@ -164,10 +155,10 @@ export default {
         vehicleCount() {
             return this.VehiclesForQuestions.length;
         },
-        AlertFoundMultipleVehiclesHeader() {
+        questionText() {
             return this.getCmsContent(
-                'FoundMultipleVehicles',
-                'HeadlineText'
+                'VehicleConfirmationQuestion',
+                'QuestionText'
             ).replaceAll('{custom:vehicleCount}', this.vehicleCount);
         },
         isTwoIdenticalYMMVehicleFound() {
@@ -186,7 +177,7 @@ export default {
             // Map API result data, to address-vehicles data structure
             const mappedData = this.VehiclesFromApi.map((v) => {
                 const maskSymbol = '*';
-                const vinStart = maskSymbol.repeat(v.vin.length - 6);
+                const vinStart = maskSymbol.repeat(6);
                 const vinEnd = v.vin.substring(v.vin.length - 6);
                 return {
                     vin: v.vin,
@@ -234,13 +225,6 @@ export default {
                     } else {
                         this.displayMatchedDifferentVehicleAlert = true;
                     }
-                    this.$refs.siteFooter.updateButtonText(`Continue with ${this.selectedVehicle.vehicle.year} `
-                            + `${this.selectedVehicle.vehicle.make} ${this.selectedVehicle.vehicle.model} ${this.forwardButtonCarStyle}`);
-                } else {
-                    this.$refs.siteFooter.updateButtonText(this.getCmsContent(
-                        'SiteFooterWidget',
-                        'ForwardButtonText'
-                    ));
                 }
             },
             deep: true