diff --git a/src/layouts/order-confirmation/order-confirmation.vue b/src/layouts/order-confirmation/order-confirmation.vue
index 4cb7668c..93cb9a38 100644
--- a/src/layouts/order-confirmation/order-confirmation.vue
+++ b/src/layouts/order-confirmation/order-confirmation.vue
@@ -630,8 +630,9 @@ export default {
             const repairOrReplace = this.submittedOrder.isRepair ? 'repair' : 'replace';
             this.pushEventToGA('confirmation', 'safelite', `${mobileOrInshop}_${repairOrReplace}_${verifiedOrNotVerified}`, true);
 
+            const paymentMethodForAnalytics = analyticsPaymentTypeMap.get(this.payment.paymentMethod) ?? 'UNKNOWN';
+            this.pushEventToGA('order_confirmed', 'payment_type_submitted', paymentMethodForAnalytics, true);
             if (this.payment.isPayInAdvance) {
-                const paymentMethodForAnalytics = analyticsPaymentTypeMap.get(this.payment.paymentMethod);
                 this.pushEventToGA('payment_page', 'pia_successful', paymentMethodForAnalytics, true);
             }
 
diff --git a/src/layouts/payment-page-adyen/payment-page-adyen.vue b/src/layouts/payment-page-adyen/payment-page-adyen.vue
index 8608bc29..2d346efa 100644
--- a/src/layouts/payment-page-adyen/payment-page-adyen.vue
+++ b/src/layouts/payment-page-adyen/payment-page-adyen.vue
@@ -119,7 +119,7 @@ export default {
     },
     mounted() {
         showIssLoadingModal(true);
-        this.pushEventToGA('payment_page', 'Mode', 'Adyen', true);
+        this.handleAnalyticsEventsOnMounted()
         this.initializeAdyen().finally(() => {
             showIssLoadingModal(false);
         });
@@ -584,6 +584,11 @@ export default {
                 this.$route
             );
         },
+        handleAnalyticsEventsOnMounted() {
+            this.pushEventToGA('payment_page', 'PIA Mode', 'Adyen', true);
+            const paymentMethod = analyticsPaymentTypeMap.get(this.piaType) ?? 'UNKNOWN';
+            this.pushEventToGA('payment_method', 'pia', paymentMethod, true);
+        },
         showIssLoadingModal
     }
 };
diff --git a/vue.config.js b/vue.config.js
index d9d97c60..0a9dc98e 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,4 +1,4 @@
-process.env.VUE_APP_CONSUMER_CF_DISTRO = 'https://digitalapi.dev.safelite.io';
+process.env.VUE_APP_CONSUMER_CF_DISTRO = 'https://digitalapi.test.safelite.io';
 process.env.VUE_APP_CURRENT_ENVIRONMENT = 'Localhost';
 process.env.VUE_APP_CUSTOMER_PORTAL_URL = 'https://myaccountdev.safelite.com/';
 process.env.VUE_APP_GOOGLE_PLACES_API_KEY = 'AIzaSyCuLhQcDdZTTb4JzpUFms1OCch2dk5lHF0';