diff --git a/src/constants/store-mutations.js b/src/constants/store-mutations.js
index 939caf922..d4e07cf0a 100644
--- a/src/constants/store-mutations.js
+++ b/src/constants/store-mutations.js
@@ -32,6 +32,7 @@ const storeMutations = {
     UPDATE_REGISTRATION_LAST_NAME: "updateRegistrationLastName",
     UPDATE_REGISTRATION: "updateRegistration",
 
+    UPDATE_SERVICE_ZIP: "updateServiceZip",
     UPDATE_SERVICE_LOCATION: "updateServiceLocation",
     UPDATE_SCHEDULE: "updateSchedule",
 
diff --git a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.spec.js b/src/fmg-components/address-questions/address-questions.spec.js
similarity index 99%
rename from src/layouts/address-lookup/customer-questions/address-questions/address-questions.spec.js
rename to src/fmg-components/address-questions/address-questions.spec.js
index 26a81341a..f0d508943 100644
--- a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.spec.js
+++ b/src/fmg-components/address-questions/address-questions.spec.js
@@ -1,5 +1,5 @@
 // Components
-import addressQuestions from "@/layouts/address-lookup/customer-questions/address-questions/address-questions";
+import addressQuestions from "@/fmg-components/address-questions/address-questions";
 import alert from "@/ux-components/alert/alert";
 
 // Supporting Files
diff --git a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue b/src/fmg-components/address-questions/address-questions.vue
similarity index 100%
rename from src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
rename to src/fmg-components/address-questions/address-questions.vue
diff --git a/src/layouts/address-lookup/customer-questions/customer-questions.vue b/src/layouts/address-lookup/customer-questions/customer-questions.vue
index 95aa3c4e2..66d411157 100644
--- a/src/layouts/address-lookup/customer-questions/customer-questions.vue
+++ b/src/layouts/address-lookup/customer-questions/customer-questions.vue
@@ -38,7 +38,7 @@
 </template>
 
 <script>
-import addressQuestions from "@/layouts/address-lookup/customer-questions/address-questions/address-questions";
+import addressQuestions from "@/fmg-components/address-questions/address-questions";
 import textboxQuestion from "@/digital-components/textbox-question/textbox-question";
 import { defineRule } from "vee-validate";
 import { required } from "@/helpers/validation-rules";
diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.vue b/src/layouts/license-plate-lookup/license-plate-lookup.vue
index 4cc69fb16..367e1c938 100644
--- a/src/layouts/license-plate-lookup/license-plate-lookup.vue
+++ b/src/layouts/license-plate-lookup/license-plate-lookup.vue
@@ -302,16 +302,11 @@ export default {
             await this.dispatchStoreAction(storeActions.SAVE_EMAIL, this.email, false);
 
             await this.dispatchStoreAction(
-                storeActions.SAVE_SERVICE_LOCATION,
+                storeActions.SAVE_SERVICE_ZIP_CODE_INFO,
                 {
-                    address: "",
-                    address2: "",
-                    city: "",
                     state: resultMap.serviceZipValidationResponse.state,
                     zipCode: this.serviceZipCode,
                     zipCodeCtu: resultMap.serviceZipValidationResponse.zipCodeCtu,
-                    appointmentType: "",
-                    isVehicleProtected: null,
                 },
                 false
             );
diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index fc740441b..8c442a052 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -64,7 +64,7 @@ import textLink from "@/ux-components/text-link/text-link";
 import textBlock from "@/digital-components/text-block/text-block";
 import modal from "@/digital-components/modal/modal";
 import alert from "@/ux-components/alert/alert";
-import addressQuestions from "@/layouts/address-lookup/customer-questions/address-questions/address-questions";
+import addressQuestions from "@/fmg-components/address-questions/address-questions";
 import vehicleProtectedQuestion from "@/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question";
 
 // Helpers
@@ -85,7 +85,6 @@ export default {
         return {
             internalModel: deepClone(this.modelValue),
             displayInvalidZipAlert: false,
-            addressQuestionsKey: 0,
             isModalOpened: false,
         };
     },
diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index 7da42f302..ddb69ba6f 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -324,14 +324,9 @@ export default {
                 await this.dispatchStoreAction(
                     storeActions.SAVE_SERVICE_ZIP_CODE_INFO,
                     {
-                        address: "",
-                        address2: "",
-                        city: "",
                         state: resultMap.zipCodeData.state,
                         zipCode: this.serviceZipCode,
                         zipCodeCtu: resultMap.zipCodeData.zipCodeCtu,
-                        appointmentType: "",
-                        isVehicleProtected: null,
                     },
                     false
                 );
@@ -366,14 +361,9 @@ export default {
                         await this.dispatchStoreAction(
                             storeActions.SAVE_SERVICE_ZIP_CODE_INFO,
                             {
-                                address: null,
-                                address2: null,
-                                city: null,
                                 state: zipCodeData.state,
                                 zipCode: this.serviceZipCode,
                                 zipCodeCtu: zipCodeData.zipCodeCtu,
-                                appointmentType: null,
-                                isVehicleProtected: null,
                             },
                             false
                         );
diff --git a/src/store/index.js b/src/store/index.js
index 4c0057b00..5c290b1cd 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -244,6 +244,11 @@ export const mutations = {
         state.order.vehicle.registration.firstName = registrationInfo?.firstName;
         state.order.vehicle.registration.lastName = registrationInfo?.lastName;
     },
+    updateServiceZip(state, serviceZipInfo) {
+        state.order.serviceLocation.state = serviceZipInfo.state;
+        state.order.serviceLocation.zipCode = serviceZipInfo.zipCode;
+        state.order.serviceLocation.zipCodeCtu = serviceZipInfo.zipCodeCtu;
+    },
     updateServiceLocation(state, serviceLocationInfo) {
         state.order.serviceLocation.address = serviceLocationInfo.address;
         state.order.serviceLocation.address2 = serviceLocationInfo.address2;
@@ -1905,7 +1910,7 @@ export const actions = {
             context.commit(storeMutations.RESET_SERVICE_LOCATION_MOBILE_ADDRESS);
         }
 
-        context.commit(storeMutations.UPDATE_SERVICE_LOCATION, serviceZipCodeInfo);
+        context.commit(storeMutations.UPDATE_SERVICE_ZIP, serviceZipCodeInfo);
     },
 
     saveServiceLocation(context, serviceLocationInfo) {