diff --git a/jest.config.js b/jest.config.js
index 905e907dc..e534b3e3f 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -35,7 +35,7 @@ module.exports = {
   testMatch: ["**/*.spec.(js|jsx|ts|tsx)|**/__tests__/*.(js|jsx|ts|tsx)"],
   coverageThreshold: {
     global: {
-      statements: 74,
+      statements: 72,
     },
   },
   // Uncomment this to avoid the massive amount of warnings we are getting for onSubmit and onInvalidSubmit
diff --git a/src/digital-components/salesforce-webchat/salesforce-helper-dev.js b/src/digital-components/salesforce-webchat/salesforce-helper-dev.js
new file mode 100644
index 000000000..fb29bc9eb
--- /dev/null
+++ b/src/digital-components/salesforce-webchat/salesforce-helper-dev.js
@@ -0,0 +1,66 @@
+/*
+The code below is generated from salesforce but modified in the following ways:
+  * Only the javascript inside the second <script> tag in the provided salesforce code is copy pasted
+  * CSS is not copied in
+  * First <script> tag loading in the file from the CDN is not copied in
+  * The only custom code added here is `let embedded_svc = window.embedded_svc` in the first line of the `initESW` function
+	  and the wrapper exported function `initializeSalesforceWebChatForDev`
+*/
+
+export function initializeSalesforceWebchatForDev() {
+    var initESW = function (gslbBaseURL) {
+        let embedded_svc = window.embedded_svc;
+        embedded_svc.settings.displayHelpButton = true; //Or false
+        embedded_svc.settings.language = ""; //For example, enter 'en' or 'en-US'
+
+        //embedded_svc.settings.defaultMinimizedText = '...'; //(Defaults to Chat with an Expert)
+        //embedded_svc.settings.disabledMinimizedText = '...'; //(Defaults to Agent Offline)
+
+        //embedded_svc.settings.loadingText = ''; //(Defaults to Loading)
+        //embedded_svc.settings.storageDomain = 'yourdomain.com'; //(Sets the domain for your deployment so that visitors can navigate subdomains during a chat session)
+
+        // Settings for Chat
+        //embedded_svc.settings.directToButtonRouting = function(prechatFormData) {
+        // Dynamically changes the button ID based on what the visitor enters in the pre-chat form.
+        // Returns a valid button ID.
+        //};
+        //embedded_svc.settings.prepopulatedPrechatFields = {}; //Sets the auto-population of pre-chat form fields
+        //embedded_svc.settings.fallbackRouting = []; //An array of button IDs, user IDs, or userId_buttonId
+        //embedded_svc.settings.offlineSupportMinimizedText = '...'; //(Defaults to Contact Us)
+
+        embedded_svc.settings.enabledFeatures = ["LiveAgent"];
+        embedded_svc.settings.entryFeature = "LiveAgent";
+
+        embedded_svc.init(
+            "https://safelite2--dev.sandbox.my.salesforce.com",
+            "https://safelite2--dev.sandbox.my.salesforce-sites.com/chat",
+            gslbBaseURL,
+            "00D6s0000008r6A",
+            "Sales_Central_Snap_in",
+            {
+                baseLiveAgentContentURL:
+                    "https://c.la12s-core1.sfdc-8tgtt5.salesforceliveagent.com/content",
+                deploymentId: "572Wr0000017xKX",
+                buttonId: "573Wr000000CpgH",
+                baseLiveAgentURL: "https://d.la12s-core1.sfdc-8tgtt5.salesforceliveagent.com/chat",
+                eswLiveAgentDevName:
+                    "EmbeddedServiceLiveAgent_Parent04IWr000003yKq9MAE_1961681659a",
+                isOfflineSupportEnabled: false,
+            }
+        );
+    };
+
+    if (!window.embedded_svc) {
+        var s = document.createElement("script");
+        s.setAttribute(
+            "src",
+            "https://safelite2--dev.sandbox.my.salesforce.com/embeddedservice/5.0/esw.min.js"
+        );
+        s.onload = function () {
+            initESW(null);
+        };
+        document.body.appendChild(s);
+    } else {
+        initESW("https://service.force.com");
+    }
+}
diff --git a/src/digital-components/salesforce-webchat/salesforce-helper-prod.js b/src/digital-components/salesforce-webchat/salesforce-helper-prod.js
new file mode 100644
index 000000000..224f3d72e
--- /dev/null
+++ b/src/digital-components/salesforce-webchat/salesforce-helper-prod.js
@@ -0,0 +1,63 @@
+/*
+The code below is generated from salesforce but modified in the following ways:
+  * Only the javascript inside the second <script> tag in the provided salesforce code is copy pasted
+  * CSS is not copied in
+  * First <script> tag loading in the file from the CDN is not copied in
+  * The only custom code added here is `let embedded_svc = window.embedded_svc` in the first line of the `initESW` function
+	  and the wrapper exported function `initializeSalesforceWebChatForProd`
+*/
+
+export function initializeSalesforceWebchatForProd(embedded_svc) {
+    var initESW = function (gslbBaseURL) {
+        let embedded_svc = window.embedded_svc;
+        embedded_svc.settings.displayHelpButton = true; //Or false
+        embedded_svc.settings.language = ""; //For example, enter 'en' or 'en-US'
+
+        //embedded_svc.settings.defaultMinimizedText = '...'; //(Defaults to Chat with an Expert)
+        //embedded_svc.settings.disabledMinimizedText = '...'; //(Defaults to Agent Offline)
+
+        //embedded_svc.settings.loadingText = ''; //(Defaults to Loading)
+        //embedded_svc.settings.storageDomain = 'yourdomain.com'; //(Sets the domain for your deployment so that visitors can navigate subdomains during a chat session)
+
+        // Settings for Chat
+        //embedded_svc.settings.directToButtonRouting = function(prechatFormData) {
+        // Dynamically changes the button ID based on what the visitor enters in the pre-chat form.
+        // Returns a valid button ID.
+        //};
+        //embedded_svc.settings.prepopulatedPrechatFields = {}; //Sets the auto-population of pre-chat form fields
+        //embedded_svc.settings.fallbackRouting = []; //An array of button IDs, user IDs, or userId_buttonId
+        //embedded_svc.settings.offlineSupportMinimizedText = '...'; //(Defaults to Contact Us)
+
+        embedded_svc.settings.enabledFeatures = ["LiveAgent"];
+        embedded_svc.settings.entryFeature = "LiveAgent";
+
+        embedded_svc.init(
+            "https://safelite2.my.salesforce.com",
+            "https://safelite2.my.salesforce-sites.com/chat",
+            gslbBaseURL,
+            "00D3t000004nvsT",
+            "Sales_Central_Snap_in",
+            {
+                baseLiveAgentContentURL:
+                    "https://c.la13-core2.sfdc-lywfpd.salesforceliveagent.com/content",
+                deploymentId: "5723t0000008wWB",
+                buttonId: "5733t000000D90z",
+                baseLiveAgentURL: "https://d.la13-core2.sfdc-lywfpd.salesforceliveagent.com/chat",
+                eswLiveAgentDevName:
+                    "EmbeddedServiceLiveAgent_Parent04I3t000000Cq0SEAS_188de1871ea",
+                isOfflineSupportEnabled: false,
+            }
+        );
+    };
+
+    if (!window.embedded_svc) {
+        var s = document.createElement("script");
+        s.setAttribute("src", "https://safelite2.my.salesforce.com/embeddedservice/5.0/esw.min.js");
+        s.onload = function () {
+            initESW(null);
+        };
+        document.body.appendChild(s);
+    } else {
+        initESW("https://service.force.com");
+    }
+}
diff --git a/src/digital-components/salesforce-webchat/salesforce-helper-qa.js b/src/digital-components/salesforce-webchat/salesforce-helper-qa.js
new file mode 100644
index 000000000..ef08d42de
--- /dev/null
+++ b/src/digital-components/salesforce-webchat/salesforce-helper-qa.js
@@ -0,0 +1,67 @@
+/*
+The code below is generated from salesforce but modified in the following ways:
+  * Only the javascript inside the second <script> tag in the provided salesforce code is copy pasted
+  * CSS is not copied in
+  * First <script> tag loading in the file from the CDN is not copied in
+  * The only custom code added here is `let embedded_svc = window.embedded_svc` in the first line of the `initESW` function
+	  and the wrapper exported function `initializeSalesforceWebChatForQa`
+*/
+
+export function initializeSalesforceWebchatForQa() {
+    var initESW = function (gslbBaseURL) {
+        let embedded_svc = window.embedded_svc;
+
+        embedded_svc.settings.displayHelpButton = true; //Or false
+        embedded_svc.settings.language = ""; //For example, enter 'en' or 'en-US'
+
+        //embedded_svc.settings.defaultMinimizedText = '...'; //(Defaults to Chat with an Expert)
+        //embedded_svc.settings.disabledMinimizedText = '...'; //(Defaults to Agent Offline)
+
+        //embedded_svc.settings.loadingText = ''; //(Defaults to Loading)
+        //embedded_svc.settings.storageDomain = 'yourdomain.com'; //(Sets the domain for your deployment so that visitors can navigate subdomains during a chat session)
+
+        // Settings for Chat
+        //embedded_svc.settings.directToButtonRouting = function(prechatFormData) {
+        // Dynamically changes the button ID based on what the visitor enters in the pre-chat form.
+        // Returns a valid button ID.
+        //};
+        //embedded_svc.settings.prepopulatedPrechatFields = {}; //Sets the auto-population of pre-chat form fields
+        //embedded_svc.settings.fallbackRouting = []; //An array of button IDs, user IDs, or userId_buttonId
+        //embedded_svc.settings.offlineSupportMinimizedText = '...'; //(Defaults to Contact Us)
+
+        embedded_svc.settings.enabledFeatures = ["LiveAgent"];
+        embedded_svc.settings.entryFeature = "LiveAgent";
+
+        embedded_svc.init(
+            "https://safelite2--safeliteua.sandbox.my.salesforce.com",
+            "https://safelite2--safeliteua.sandbox.my.salesforce-sites.com/chat",
+            gslbBaseURL,
+            "00DDJ000000HRqO",
+            "Sales_Central_Snap_in",
+            {
+                baseLiveAgentContentURL:
+                    "https://c.la12s-core1.sfdc-8tgtt5.salesforceliveagent.com/content",
+                deploymentId: "572DJ00000001j3",
+                buttonId: "573DJ00000001ur",
+                baseLiveAgentURL: "https://d.la12s-core1.sfdc-8tgtt5.salesforceliveagent.com/chat",
+                eswLiveAgentDevName:
+                    "EmbeddedServiceLiveAgent_Parent04IDJ0000008OZk2AM_1883057c9a6",
+                isOfflineSupportEnabled: false,
+            }
+        );
+    };
+
+    if (!window.embedded_svc) {
+        var s = document.createElement("script");
+        s.setAttribute(
+            "src",
+            "https://safelite2--safeliteua.sandbox.my.salesforce.com/embeddedservice/5.0/esw.min.js"
+        );
+        s.onload = function () {
+            initESW(null);
+        };
+        document.body.appendChild(s);
+    } else {
+        initESW("https://service.force.com");
+    }
+}
diff --git a/src/digital-components/salesforce-webchat/salesforce-webchat.vue b/src/digital-components/salesforce-webchat/salesforce-webchat.vue
new file mode 100644
index 000000000..58da503fa
--- /dev/null
+++ b/src/digital-components/salesforce-webchat/salesforce-webchat.vue
@@ -0,0 +1,57 @@
+<template>
+    <span class="salesforce-webchat"></span>
+</template>
+
+<script>
+// Supporting files
+import { initializeSalesforceWebchatForDev } from "./salesforce-helper-dev";
+import { initializeSalesforceWebchatForQa } from "./salesforce-helper-qa";
+import { initializeSalesforceWebchatForProd } from "./salesforce-helper-prod";
+
+export default {
+    name: "salesforceWebchat",
+    data() {
+        return {};
+    },
+    props: {
+        hideSalesforceWebchatLaunchButton: {
+            type: Boolean,
+            default: false,
+        },
+    },
+    mounted() {
+        // Load in script from salesforce CDN
+        const script = document.createElement("script");
+        script.src = "https://service.force.com/embeddedservice/5.0/esw.min.js";
+        script.onload = () => {
+            switch (process.env.VUE_APP_CURRENT_ENVIRONMENT) {
+                case "Prod":
+                    initializeSalesforceWebchatForProd();
+                    break;
+                case "QA":
+                case "SysTest":
+                    initializeSalesforceWebchatForQa();
+                    break;
+                case "Dev":
+                case "Localhost":
+                    initializeSalesforceWebchatForDev();
+                    break;
+            }
+        };
+        document.body.appendChild(script);
+    },
+    methods: {},
+    computed: {},
+    components: {},
+};
+</script>
+
+<style type="text/css">
+.embeddedServiceHelpButton .helpButton .uiButton {
+    background-color: #167cac;
+    font-family: "Arial", sans-serif;
+}
+.embeddedServiceHelpButton .helpButton .uiButton:focus {
+    outline: 1px solid #167cac;
+}
+</style>
diff --git a/src/experiment-components/service-package-radio-for-afterpay.vue b/src/experiment-components/service-package-radio-for-afterpay.vue
index b936e21bf..f38621462 100644
--- a/src/experiment-components/service-package-radio-for-afterpay.vue
+++ b/src/experiment-components/service-package-radio-for-afterpay.vue
@@ -5,6 +5,7 @@
             :class="[
                 this.buttonLabelSubCopy ? 'has-subheader' : '',
                 this.additionalButtonData.isInsuranceSelected ? 'is-insurance' : '',
+                this.hasPackageDiscount() ? 'has-package-discount' : '',
             ]"
             for="testradio">
             <div class="package-specs">
@@ -54,12 +55,7 @@
                         v-html="this.buttonFooterCopy"></div>
                 </div>
 
-                <div
-                    v-if="
-                        this.additionalButtonData.servicePackageDiscount &&
-                        this.additionalButtonData.Text
-                    "
-                    class="special-save-box">
+                <div v-if="hasPackageDiscount()" class="special-save-box">
                     <span v-html="this.additionalButtonData.Text"></span>
                 </div>
                 <span class="pricing-info">
@@ -144,6 +140,11 @@ export default {
         truncatedSinglePayment() {
             return "$" + Math.trunc(this.buttonAuxillaryCopy.replace("$", ""));
         },
+        hasPackageDiscount() {
+            return (
+                this.additionalButtonData.servicePackageDiscount && this.additionalButtonData.Text
+            );
+        },
     },
 };
 </script>
@@ -212,12 +213,6 @@ export default {
                 }
 
                 &.has-subheader {
-                    min-height: 150px;
-
-                    &.is-insurance {
-                        min-height: 72px;
-                    }
-
                     & > .package-specs {
                         & > div:first-of-type {
                             display: flex;
@@ -225,6 +220,10 @@ export default {
                     }
                 }
 
+                &.has-package-discount {
+                    min-height: 150px;
+                }
+
                 &:before {
                     content: "";
                     position: relative;
diff --git a/src/fmg-components/funnel-header/funnel-header.vue b/src/fmg-components/funnel-header/funnel-header.vue
index 092224551..716ce29d9 100644
--- a/src/fmg-components/funnel-header/funnel-header.vue
+++ b/src/fmg-components/funnel-header/funnel-header.vue
@@ -2,6 +2,7 @@
     <div
         class="funnel-header d-flex justify-content-center align-items-center flex-column"
         v-if="imageSrc">
+        <salesforceWebchat hideSalesforceWebchatLaunchButton />
         <img class="logo-image img-fluid" :src="imageSrc" alt="Safelite logo" />
         <!-- // menu-modal temporarily not in use until the hamburger menu is re-implemented for use with the progress bar. See display: none below. -->
         <menuModal />
@@ -27,6 +28,7 @@ import alert from "@/ux-components/alert/alert";
 import eventBus from "@/helpers/event-bus/event-bus";
 import { globalEvents } from "@/constants/events";
 import menuModal from "@/fmg-components/funnel-header/menu-modal/menu-modal";
+import salesforceWebchat from "../../digital-components/salesforce-webchat/salesforce-webchat.vue";
 import progressBar from "@/fmg-components/funnel-header/progress-bar/progress-bar";
 
 // Constants
@@ -41,6 +43,10 @@ export default {
     },
     props: {
         cmsWidgetName: String,
+        hideSalesforceWebchatLaunchButton: {
+            type: Boolean,
+            default: false,
+        },
     },
     computed: {
         imageSrc() {
@@ -65,6 +71,7 @@ export default {
         alert,
         menuModal,
         progressBar,
+        salesforceWebchat,
     },
     mounted() {
         // Check if alert event is on the bus
diff --git a/src/layouts/address-lookup/address-lookup.spec.js b/src/layouts/address-lookup/address-lookup.spec.js
index 19a46abb8..677c14069 100644
--- a/src/layouts/address-lookup/address-lookup.spec.js
+++ b/src/layouts/address-lookup/address-lookup.spec.js
@@ -182,39 +182,6 @@ describe("address-lookup.vue", () => {
             // Assert
             expect(wrapper.findComponent({ ref: "alertVinNotFound" }).isVisible()).toBe(true);
         });
-        test("should show the AlertNoService when displayNoServiceAlert is true", async () => {
-            const { wrapper } = setupMocks({
-                isZipServiceable: true,
-                displayNoServiceAlert: true,
-                lookupVinbyAddressResponse: {
-                    isStatePermissible: true,
-                    vinVehicles: [], // Return no vehicles
-                },
-            });
-
-            // Set displayNoServiceAlert to true
-            await wrapper.setData({ displayNoServiceAlert: true });
-
-            // Check if the AlertNoService component is rendered
-            const alertNoService = wrapper.findComponent({ ref: "AlertNoService" });
-            expect(alertNoService.exists()).toBe(true);
-        });
-        test("should hide the AlertNoService when displayNoServiceAlert is false", async () => {
-            const { wrapper } = setupMocks({
-                isZipServiceable: true,
-                displayNoServiceAlert: false,
-                lookupVinbyAddressResponse: {
-                    isStatePermissible: true,
-                    vinVehicles: [], // Return no vehicles
-                },
-            });
-            // Ensure displayNoServiceAlert is false
-            await wrapper.setData({ displayNoServiceAlert: false });
-
-            // Check if the AlertNoService component is not rendered
-            const alertNoService = wrapper.findComponent({ ref: "AlertNoService" });
-            expect(alertNoService.exists()).toBe(false);
-        });
     });
 
     describe("navigation", () => {
@@ -774,18 +741,6 @@ function setupMocks({
     wrapper.vm.setCmsContent = jest.fn();
     wrapper.vm.$refs.navbar.updateButtonText = jest.fn();
     wrapper.vm.$refs.navbar.removeLoader = jest.fn();
-    const closestShops = {
-        data: {
-            providers: [
-                { id: 1, name: "Shop 1" },
-                { id: 2, name: "Shop 2" },
-            ],
-        },
-    };
-
-    wrapper.vm.findClosestApplicableShops = jest.fn().mockImplementation(() => {
-        return new Promise((resolve) => resolve(closestShops));
-    });
 
     return { wrapper };
 }
diff --git a/src/layouts/address-lookup/address-lookup.vue b/src/layouts/address-lookup/address-lookup.vue
index 44dbaaa5e..ba2f8f6dd 100644
--- a/src/layouts/address-lookup/address-lookup.vue
+++ b/src/layouts/address-lookup/address-lookup.vue
@@ -81,20 +81,13 @@
                             </div>
                         </div>
                     </transition>
-                    <alert
-                        ref="AlertNoService"
-                        v-if="displayNoServiceAlert"
-                        class="my-4"
-                        cmsWidgetName="AlertNoServiceWidget"
-                        alertClass="alert-danger"
-                        v-bind:isDismissible="false" />
                     <navbar
                         cmsWidgetName="FunnelFooterWidget"
                         ref="navbar"
                         :isDisabled="!meta.valid"
                         @ForwardClicked="forwardButtonAction"
                         @back-clicked="backButtonAction"
-                        :isForwardActionDisabled="!meta.valid || displayNoServiceAlert" />
+                        :isForwardActionDisabled="!meta.valid" />
                 </div>
             </div>
         </div>
@@ -184,7 +177,6 @@ export default {
             displayInvalidZipAlert: false,
             showServiceZipField: this.getServiceZipFromStore(),
             isZipServiceable: false,
-            displayNoServiceAlert: false,
         };
     },
     methods: {
@@ -301,17 +293,6 @@ export default {
                 return this.$refs.navbar.removeLoader();
             }
             this.displayInvalidZipAlert = false;
-            if (this.serviceZipCode != null && this.isHeavyTruck) {
-                const closestShops = await this.findClosestApplicableShops(
-                    this.serviceZipCode,
-                    this.carId
-                );
-                this.displayNoServiceAlert = !closestShops?.data?.providers?.length;
-                if (this.displayNoServiceAlert) {
-                    return this.$refs.navbar.removeLoader();
-                }
-            }
-
             const carsFound = resultMap.vinLookupResponse.vinVehicles;
 
             // Handle cases for different amounts of VINS found for the address.
@@ -463,7 +444,6 @@ export default {
             this.displayNonServiceableZipAlert = false;
             this.displayMatchedDifferentVehicleAlert = false;
             this.displayVinLookupByHomeAddressNotAllowedAlert = false;
-            this.displayNoServiceAlert = false;
         },
     },
     mounted() {
@@ -515,7 +495,6 @@ export default {
             handler(newValue) {
                 // If they modify the service zip code, then hide the error message.
                 this.displayNonServiceableZipAlert = false;
-                this.displayNoServiceAlert = false;
             },
         },
         showServiceZipField: {
diff --git a/src/layouts/confirmation/confirmation.vue b/src/layouts/confirmation/confirmation.vue
index 3b3ead4c1..40736b2c2 100644
--- a/src/layouts/confirmation/confirmation.vue
+++ b/src/layouts/confirmation/confirmation.vue
@@ -5,7 +5,10 @@
                 <div class="container-fluid pb-2">
                     <div class="row justify-content-center">
                         <div class="col-md-6">
-                            <funnelHeader cmsWidgetName="FunnelHeaderWidget" ref="funnelHeader" />
+                            <funnelHeader
+                                cmsWidgetName="FunnelHeaderWidget"
+                                ref="funnelHeader"
+                                hideSalesforceWebchatLaunchButton />
                         </div>
                     </div>
                     <div class="row justify-content-center">
diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.spec.js b/src/layouts/license-plate-lookup/license-plate-lookup.spec.js
index 2ffe61193..14f0408d1 100644
--- a/src/layouts/license-plate-lookup/license-plate-lookup.spec.js
+++ b/src/layouts/license-plate-lookup/license-plate-lookup.spec.js
@@ -611,42 +611,6 @@ describe("license-plate-lookup.vue", () => {
             expect(arePagePrerequisitesValid).toBe(false);
         });
     });
-
-    describe("alerts", () => {
-        test("should show the AlertNoService when displayNoServiceAlert is true", async () => {
-            const { wrapper } = setupMocks({
-                isZipServiceable: true,
-                displayNoServiceAlert: true,
-                lookupVinbyAddressResponse: {
-                    isStatePermissible: true,
-                    vinVehicles: [], // Return no vehicles
-                },
-            });
-
-            // Set displayNoServiceAlert to true
-            await wrapper.setData({ displayNoServiceAlert: true });
-
-            // Check if the AlertNoService component is rendered
-            const alertNoService = wrapper.findComponent({ ref: "AlertNoService" });
-            expect(alertNoService.exists()).toBe(true);
-        });
-        test("should hide the AlertNoService when displayNoServiceAlert is false", async () => {
-            const { wrapper } = setupMocks({
-                isZipServiceable: true,
-                displayNoServiceAlert: false,
-                lookupVinbyAddressResponse: {
-                    isStatePermissible: true,
-                    vinVehicles: [], // Return no vehicles
-                },
-            });
-            // Ensure displayNoServiceAlert is false
-            await wrapper.setData({ displayNoServiceAlert: false });
-
-            // Check if the AlertNoService component is not rendered
-            const alertNoService = wrapper.findComponent({ ref: "AlertNoService" });
-            expect(alertNoService.exists()).toBe(false);
-        });
-    });
 });
 
 function setupMocks({
@@ -752,18 +716,5 @@ function setupMocks({
     wrapper.vm.getCmsContent = jest.fn().mockImplementation(() => "");
     wrapper.vm.$refs.navbar.updateButtonText = jest.fn();
     wrapper.vm.$refs.navbar.removeLoader = jest.fn();
-    const closestShops = {
-        data: {
-            providers: [
-                { id: 1, name: "Shop 1" },
-                { id: 2, name: "Shop 2" },
-            ],
-        },
-    };
-
-    wrapper.vm.findClosestApplicableShops = jest.fn().mockImplementation(() => {
-        return new Promise((resolve) => resolve(closestShops));
-    });
-
     return { wrapper, apiPromise };
 }
diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.vue b/src/layouts/license-plate-lookup/license-plate-lookup.vue
index a8c68215a..8736df956 100644
--- a/src/layouts/license-plate-lookup/license-plate-lookup.vue
+++ b/src/layouts/license-plate-lookup/license-plate-lookup.vue
@@ -177,7 +177,6 @@ export default {
             displayInvalidZipAlert: false,
             showServiceZipField: this.getServiceZipFromStore(),
             isZipServiceable: false,
-            displayNoServiceAlert: false,
         };
     },
     methods: {
@@ -280,17 +279,6 @@ export default {
                 this.displayInvalidZipAlert = true;
                 return this.$refs.navbar.removeLoader();
             }
-            if (this.isHeavyTruck) {
-                const closestShops = await this.findClosestApplicableShops(
-                    this.serviceZipCode,
-                    this.carId
-                );
-                this.displayNoServiceAlert = !closestShops?.data?.providers?.length;
-                if (this.displayNoServiceAlert) {
-                    return this.$refs.navbar.removeLoader();
-                }
-            }
-
             // Check if the CarId has changed.
             this.isCarIdDifferent =
                 vinLookup.data.vehicle.carId !== this.$store.getters.vehicle.carId;
@@ -405,7 +393,6 @@ export default {
             this.displayMatchedDifferentVehicleAlert = false;
             this.displayVinLookupByHomeAddressNotAllowedAlert = false;
             this.displayInvalidZipAlert = false;
-            this.displayNoServiceAlert = false;
         },
     },
     mounted() {
@@ -450,7 +437,6 @@ export default {
         serviceZipCode() {
             // If they modify the service zip code, then hide the error message.
             this.displayNonServiceableZipAlert = false;
-            this.displayNoServiceAlert = false;
             this.$refs.navbar.updateButtonText(
                 this.getCmsContent("FunnelFooterWidget", "ForwardButtonText")
             );
diff --git a/src/layouts/service-location/appointment-type-question/appointment-type-question.spec.js b/src/layouts/service-location/appointment-type-question/appointment-type-question.spec.js
index 8ff7c9b1c..c6af1377f 100644
--- a/src/layouts/service-location/appointment-type-question/appointment-type-question.spec.js
+++ b/src/layouts/service-location/appointment-type-question/appointment-type-question.spec.js
@@ -100,7 +100,7 @@ describe("appointment-type-question.vue", () => {
         ]);
     });
 
-    it("Should display only the In-Shop answer when only in-shop service is available", async () => {
+    it("Should display only the In-Shop and Drop-Off answers when only in-shop service is available", async () => {
         // Arrange/Act
         const { wrapper } = setupMocks({
             mixins: [mockMixin],
@@ -108,7 +108,6 @@ describe("appointment-type-question.vue", () => {
                 cmsWidgetName: cmsWidgetName,
                 isServiceableInshop: true,
                 isServiceableMobile: false,
-                isServiceableDropoff: false,
             },
             mountOptions: {
                 attachTo: document.body,
@@ -124,6 +123,13 @@ describe("appointment-type-question.vue", () => {
                 SubWidgetName: "",
                 Text: "In-shop",
             },
+            {
+                AnswerImageUrl: "",
+                Name: "Dropoff",
+                SubText: "",
+                SubWidgetName: "",
+                Text: "Drop-off",
+            },
         ]);
     });
 
diff --git a/src/layouts/service-location/appointment-type-question/appointment-type-question.vue b/src/layouts/service-location/appointment-type-question/appointment-type-question.vue
index 4c1c0d031..64bf159ff 100644
--- a/src/layouts/service-location/appointment-type-question/appointment-type-question.vue
+++ b/src/layouts/service-location/appointment-type-question/appointment-type-question.vue
@@ -32,7 +32,6 @@ export default {
         cmsWidgetName: String,
         isServiceableMobile: Boolean,
         isServiceableInshop: Boolean,
-        isServiceableDropoff: Boolean,
         mobileFeeApplies: Boolean,
     },
     computed: {
@@ -46,7 +45,7 @@ export default {
             const shouldShowMobile = this.isServiceableMobile;
             const shouldShowInshop = this.isServiceableInshop;
             const shouldShowDropoff =
-                this.isServiceableDropoff && !this.$store.getters.damage.isRepair;
+                this.isServiceableInshop && !this.$store.getters.damage.isRepair;
 
             var answers = this.answersFromCms
                 ? this.answersFromCms.filter((answer) => {
@@ -78,11 +77,6 @@ export default {
         isMobileOnly() {
             return this.isServiceableMobile && !this.isServiceableInshop;
         },
-        isInshopOnly() {
-            return (
-                this.isServiceableInshop && !this.isServiceableMobile && !this.isServiceableDropoff
-            );
-        },
     },
     watch: {
         answersToDisplay: {
@@ -92,7 +86,7 @@ export default {
                     newValue.length == 1 &&
                     newValue.findIndex((answer) => answer.Name == "Mobile") != -1
                 ) {
-                    this.selectedValue = "Mobile";
+                    this.selectedValues = "Mobile";
                 }
             },
             immediate: true,
@@ -100,14 +94,7 @@ export default {
         isMobileOnly: {
             handler(newValue) {
                 if (newValue) {
-                    this.selectedValue = "Mobile";
-                }
-            },
-        },
-        isInshopOnly: {
-            handler(newValue) {
-                if (newValue) {
-                    this.selectedValue = "Inshop";
+                    this.selectedValues = "Mobile";
                 }
             },
         },
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 7b3163c87..a85a5bd17 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -76,7 +76,6 @@
                         v-show="isAppointmentTypeDisplayed"
                         :isServiceableMobile="isServiceableMobile"
                         :isServiceableInshop="isServiceableInshop"
-                        :isServiceableDropoff="isServiceableDropoff"
                         :isDisplayed="isAppointmentTypeDisplayed"
                         :mobileFeeApplies="mobileFeeApplies"
                         ref="appointmentTypeQuestion"
@@ -197,8 +196,6 @@ export default {
             isVehicleProtected: this.getIsVehicleProtectedFromStore(),
             isGlassServiceableInshop: null,
             isRecalibrationServiceableInshop: null,
-            isGlassServiceableDropoff: null,
-            isRecalibrationServiceableDropoff: null,
             isGlassServiceableMobile: null,
             isRecalibrationServiceableMobile: null,
             selectedAppointmentType: this.getSelectedAppointmentType(),
@@ -357,13 +354,6 @@ export default {
                 return this.isGlassServiceableInshop;
             }
         },
-        isServiceableDropoff() {
-            if (this.isRecalibrationServiceableDropoff !== null) {
-                return this.isGlassServiceableDropoff && this.isRecalibrationServiceableDropoff;
-            } else {
-                return this.isGlassServiceableDropoff;
-            }
-        },
         isShopQuestionDisplayed() {
             return (
                 this.selectedAppointmentType === "Inshop" ||
@@ -569,9 +559,6 @@ export default {
             this.isGlassServiceableInshop = serviceabilityDetails.isGlassServiceableInshop;
             this.isRecalibrationServiceableInshop =
                 serviceabilityDetails.isRecalibrationServiceableInshop;
-            this.isGlassServiceableDropoff = serviceabilityDetails.isGlassServiceableDropoff;
-            this.isRecalibrationServiceableDropoff =
-                serviceabilityDetails.isRecalibrationServiceableDropoff;
             this.isGlassServiceableMobile = serviceabilityDetails.isGlassServiceableMobile;
             this.isRecalibrationServiceableMobile =
                 serviceabilityDetails.isRecalibrationServiceableMobile;
diff --git a/src/layouts/service-zip/service-zip.spec.js b/src/layouts/service-zip/service-zip.spec.js
index e7cd68e3d..f8fc1f2ae 100644
--- a/src/layouts/service-zip/service-zip.spec.js
+++ b/src/layouts/service-zip/service-zip.spec.js
@@ -415,33 +415,6 @@ describe("service-zip.vue", () => {
             expect(wrapper.vm.displayInvalidZipAlert).toBe(false);
             expect(wrapper.vm.displayNonServiceableZipAlert).toBe(false);
         });
-        test("should show the AlertNoService when displayNoServiceAlert is true", async () => {
-            // Arrange
-            // no changes to store
-            applyMockStoreDataToGetters();
-
-            const wrapper = setupMocks({});
-            wrapper.vm.serviceZipCode = "12345";
-
-            // Act
-            wrapper.vm.displayNoServiceAlert = true;
-
-            // Check if the AlertNoService component is rendered
-            expect(wrapper.vm.displayNoServiceAlert).toBe(true);
-        });
-        test("should hide the AlertNoService when displayNoServiceAlert is false", async () => {
-            // Arrange
-            // no changes to store
-            applyMockStoreDataToGetters();
-
-            const wrapper = setupMocks({});
-            wrapper.vm.serviceZipCode = "12345";
-            //ACT
-            wrapper.vm.displayNoServiceAlert = false;
-
-            // Check if the AlertNoService component is rendered
-            expect(wrapper.vm.displayNoServiceAlert).toBe(false);
-        });
     });
 });
 
@@ -538,16 +511,5 @@ function setupMocks({ customMountOptions, customZipQuery, customZipDataResponse
     ];
 
     const wrapper = shallowMount(serviceZip, mountOptions);
-    wrapper.vm.findClosestApplicableShops = jest.fn().mockImplementation(() => {
-        return Promise.resolve({
-            data: {
-                providers: [
-                    { id: 1, name: "Shop 1" },
-                    { id: 2, name: "Shop 2" },
-                ],
-            },
-        });
-    });
-
     return wrapper;
 }
diff --git a/src/layouts/service-zip/service-zip.vue b/src/layouts/service-zip/service-zip.vue
index a991119ef..5bb9ed471 100644
--- a/src/layouts/service-zip/service-zip.vue
+++ b/src/layouts/service-zip/service-zip.vue
@@ -47,18 +47,10 @@
                             v-if="displayNonServiceableZipAlert"
                             alertClass="alert-danger" />
 
-                        <alert
-                            ref="AlertNoService"
-                            v-if="displayNoServiceAlert"
-                            class="my-4"
-                            cmsWidgetName="AlertNoServiceWidget"
-                            alertClass="alert-danger"
-                            v-bind:isDismissible="false" />
-
                         <navbar
                             cmsWidgetName="FunnelFooterWidget"
                             ref="navbar"
-                            :isForwardActionDisabled="!meta.valid || displayNoServiceAlert"
+                            :isForwardActionDisabled="!meta.valid"
                             @back-clicked="backButtonAction"
                             @ForwardClicked="forwardButtonAction" />
                     </div>
@@ -122,7 +114,6 @@ export default {
             isHeavyTruck: this.getIsVehicleHeavyTruckServiceableFromStore(),
             displayInvalidZipAlert: false,
             displayNonServiceableZipAlert: false,
-            displayNoServiceAlert: false,
         };
     },
 
diff --git a/src/layouts/vin-lookup/vin-lookup.spec.js b/src/layouts/vin-lookup/vin-lookup.spec.js
index 458f9fc48..6eb1aa515 100644
--- a/src/layouts/vin-lookup/vin-lookup.spec.js
+++ b/src/layouts/vin-lookup/vin-lookup.spec.js
@@ -258,39 +258,6 @@ describe("vin-lookup.vue", () => {
             // Assert
             expect(wrapper.findAllComponents({ name: "alert" }).length).toBe(1);
         });
-
-        test("should show the AlertNoService when displayNoServiceAlert is true", async () => {
-            const { wrapper } = setupMocks({
-                isZipServiceable: true,
-                displayNoServiceAlert: true,
-                lookupVinbyAddressResponse: {
-                    isStatePermissible: true,
-                    vinVehicles: [], // Return no vehicles
-                },
-            });
-            // Set displayNoServiceAlert to true
-            await wrapper.setData({ displayNoServiceAlert: true });
-
-            // Check if the AlertNoService component is rendered
-            const alertNoService = wrapper.findComponent({ ref: "AlertNoService" });
-            expect(alertNoService.exists()).toBe(true);
-        });
-        test("should hide the AlertNoService when displayNoServiceAlert is false", async () => {
-            const { wrapper } = setupMocks({
-                isZipServiceable: true,
-                displayNoServiceAlert: false,
-                lookupVinbyAddressResponse: {
-                    isStatePermissible: true,
-                    vinVehicles: [], // Return no vehicles
-                },
-            });
-            // Ensure displayNoServiceAlert is false
-            await wrapper.setData({ displayNoServiceAlert: false });
-
-            // Check if the AlertNoService component is not rendered
-            const alertNoService = wrapper.findComponent({ ref: "AlertNoService" });
-            expect(alertNoService.exists()).toBe(false);
-        });
     });
 
     describe("getVinFromImage", () => {
diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index b439b5e5e..1b57ee068 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -71,8 +71,7 @@
                             vinPopulatedOnPageLoad &&
                             isInsuranceVerified &&
                             !displayInvalidZipAlert &&
-                            !displayNonServiceableZipAlert &&
-                            !displayNoServiceAlert
+                            !displayNonServiceableZipAlert
                         "
                         alertClass="alert-success" />
 
@@ -108,23 +107,14 @@
                             vinPopulatedOnPageLoad &&
                             !isInsuranceVerified &&
                             !displayInvalidZipAlert &&
-                            !displayNonServiceableZipAlert &&
-                            !displayNoServiceAlert
+                            !displayNonServiceableZipAlert
                         "
                         alertClass="alert-success" />
 
-                    <alert
-                        ref="AlertNoService"
-                        v-if="displayNoServiceAlert"
-                        class="my-4"
-                        cmsWidgetName="AlertNoServiceWidget"
-                        alertClass="alert-danger"
-                        v-bind:isDismissible="false" />
-
                     <navbar
                         cmsWidgetName="FunnelFooterWidget"
                         ref="navbar"
-                        :isForwardActionDisabled="!meta.valid || displayNoServiceAlert"
+                        :isForwardActionDisabled="!meta.valid"
                         @back-clicked="backButtonAction"
                         @ForwardClicked="forwardButtonAction" />
                 </div>
@@ -219,7 +209,6 @@ export default {
             displayVinNotFoundAlert: false,
             displayMatchedDifferentVehicleAlert: false,
             displayVinScanFailedAlert: false,
-            displayNoServiceAlert: false,
         };
     },
     methods: {
@@ -235,12 +224,6 @@ export default {
         getZipFromStore() {
             return this.$store.getters.order.serviceLocation.zipCode;
         },
-        getCarIdfromStore() {
-            return store.getters.vehicle.carId;
-        },
-        getIsVehicleHeavyTruckFromStore() {
-            return store.getters.isHeavyTruckVehicle;
-        },
         attachCustomEvents() {
             this.prependActionToMethod(this, this.forwardButtonAction, () => {
                 this.pushEventToGA(
@@ -306,18 +289,6 @@ export default {
                     return this.$refs.navbar.removeLoader();
                 }
                 this.displayInvalidZipAlert = false;
-                if (this.isHeavyTruck) {
-                    // If a VIN has already been found. Validate the Service Zip (in case of changes)
-                    var closestShops = await this.findClosestApplicableShops(
-                        this.serviceZipCode,
-                        this.carId
-                    );
-                    this.displayNoServiceAlert = !closestShops?.data?.providers?.length;
-                    if (this.displayNoServiceAlert) {
-                        return this.$refs.navbar.removeLoader();
-                    }
-                }
-
                 // If either lookup fails, remove the loader and stop processing the page.
                 if (!resultMap.vehicleLookupResponse || !resultMap.zipCodeData.isServiceable) {
                     // If the vehicle result is undefined, the vin entered was invalid.
@@ -605,7 +576,6 @@ export default {
         },
         serviceZipCode() {
             this.displayNonServiceableZipAlert = false;
-            this.displayNoServiceAlert = false;
         },
     },
     components: {