diff --git a/models/intermediate/core/int_core__booking_service_detail.sql b/models/intermediate/core/int_core__booking_service_detail.sql
index ea4e72c..f4b2397 100644
--- a/models/intermediate/core/int_core__booking_service_detail.sql
+++ b/models/intermediate/core/int_core__booking_service_detail.sql
@@ -111,7 +111,7 @@ with
                 psba.last_chargeable_date_utc) as last_chargeable_date_utc,
             bts.is_missing_host_currency_code as is_missing_currency_code,
             bts.is_booking_cancelled,
-            (not pstp.is_default_service) as is_upgraded_service
+            (not ps.is_default_service) as is_upgraded_service
         from int_core__booking_to_service bts
         inner join
             stg_core__product_service ps
@@ -157,7 +157,7 @@ with
             ppba.last_chargeable_date_utc,
             bts.is_missing_host_currency_code as is_missing_currency_code,
             bts.is_booking_cancelled,
-            (not pptp.is_default_service) as is_upgraded_service
+            (not pp.is_default_service) as is_upgraded_service
         from int_core__booking_to_service bts
         inner join
             stg_core__protection_plan pp
diff --git a/models/intermediate/kpis/int_kpis__metric_daily_check_out_bookings.sql b/models/intermediate/kpis/int_kpis__metric_daily_check_out_bookings.sql
index f04a2c8..a88b175 100644
--- a/models/intermediate/kpis/int_kpis__metric_daily_check_out_bookings.sql
+++ b/models/intermediate/kpis/int_kpis__metric_daily_check_out_bookings.sql
@@ -4,7 +4,17 @@ select
     icb.check_out_date_utc as date,
     coalesce(icuh.id_deal, 'UNSET') as id_deal,
     case
-        when icbs.id_booking is not null then 'New Dash' else 'Old Dash'
+        -- New Dash users with a booking and a deal
+        when
+            icbs.id_booking is not null
+            and icbs.is_user_in_new_dash = true
+            and icbs.is_missing_id_deal = false
+        then 'New Dash'
+        -- Old Dash users if there is no booking or the user is not in the new dash
+        when icbs.id_booking is null or icbs.is_user_in_new_dash = false
+        then 'Old Dash'
+        -- Rest of the cases, includes KYG Lite users
+        else 'UNSET'
     end as business_scope,
     -- Dimensions --
     coalesce(
@@ -38,9 +48,6 @@ left join
     on icuh.id_deal = icmas.id_deal
     and icb.check_out_date_utc = icmas.date
 left join
-    {{ ref("int_core__booking_summary") }} as icbs
-    on icb.id_booking = icbs.id_booking
-    and icbs.is_user_in_new_dash = true
-    and icbs.is_missing_id_deal = false
+    {{ ref("int_core__booking_summary") }} as icbs on icb.id_booking = icbs.id_booking
 where icb.is_duplicate_booking = false
 group by 1, 2, 3, 4, 5
diff --git a/models/intermediate/kpis/int_kpis__metric_daily_completed_guest_journeys.sql b/models/intermediate/kpis/int_kpis__metric_daily_completed_guest_journeys.sql
index 9ef6c9b..57e280b 100644
--- a/models/intermediate/kpis/int_kpis__metric_daily_completed_guest_journeys.sql
+++ b/models/intermediate/kpis/int_kpis__metric_daily_completed_guest_journeys.sql
@@ -4,7 +4,17 @@ select
     icvr.verification_estimated_completed_date_utc as date,
     coalesce(icuh.id_deal, 'UNSET') as id_deal,
     case
-        when icbs.id_booking is not null then 'New Dash' else 'Old Dash'
+        -- New Dash users with a booking and a deal
+        when
+            icbs.id_booking is not null
+            and icbs.is_user_in_new_dash = true
+            and icbs.is_missing_id_deal = false
+        then 'New Dash'
+        -- Old Dash users if there is no booking or the user is not in the new dash
+        when icbs.id_booking is null or icbs.is_user_in_new_dash = false
+        then 'Old Dash'
+        -- Rest of the cases, includes KYG Lite users
+        else 'UNSET'
     end as business_scope,
     -- Dimensions --
     coalesce(
@@ -26,7 +36,5 @@ left join
 left join
     {{ ref("int_core__booking_summary") }} as icbs
     on icvr.id_verification_request = icbs.id_verification_request
-    and icbs.is_user_in_new_dash = true
-    and icbs.is_missing_id_deal = false
 where icvr.verification_estimated_completed_date_utc is not null
 group by 1, 2, 3, 4, 5
diff --git a/models/intermediate/kpis/int_kpis__metric_daily_created_bookings.sql b/models/intermediate/kpis/int_kpis__metric_daily_created_bookings.sql
index 77d4629..f04d31d 100644
--- a/models/intermediate/kpis/int_kpis__metric_daily_created_bookings.sql
+++ b/models/intermediate/kpis/int_kpis__metric_daily_created_bookings.sql
@@ -4,7 +4,17 @@ select
     icb.created_date_utc as date,
     coalesce(icuh.id_deal, 'UNSET') as id_deal,
     case
-        when icbs.id_booking is not null then 'New Dash' else 'Old Dash'
+        -- New Dash users with a booking and a deal
+        when
+            icbs.id_booking is not null
+            and icbs.is_user_in_new_dash = true
+            and icbs.is_missing_id_deal = false
+        then 'New Dash'
+        -- Old Dash users if there is no booking or the user is not in the new dash
+        when icbs.id_booking is null or icbs.is_user_in_new_dash = false
+        then 'Old Dash'
+        -- Rest of the cases, includes KYG Lite users
+        else 'UNSET'
     end as business_scope,
     -- Dimensions --
     coalesce(
@@ -38,9 +48,6 @@ left join
     on icuh.id_deal = icmas.id_deal
     and icb.created_date_utc = icmas.date
 left join
-    {{ ref("int_core__booking_summary") }} as icbs
-    on icb.id_booking = icbs.id_booking
-    and icbs.is_user_in_new_dash = true
-    and icbs.is_missing_id_deal = false
+    {{ ref("int_core__booking_summary") }} as icbs on icb.id_booking = icbs.id_booking
 where icb.is_duplicate_booking = false
 group by 1, 2, 3, 4, 5
diff --git a/models/intermediate/kpis/int_kpis__metric_daily_created_guest_journeys.sql b/models/intermediate/kpis/int_kpis__metric_daily_created_guest_journeys.sql
index f9da17e..4cfd235 100644
--- a/models/intermediate/kpis/int_kpis__metric_daily_created_guest_journeys.sql
+++ b/models/intermediate/kpis/int_kpis__metric_daily_created_guest_journeys.sql
@@ -4,7 +4,17 @@ select
     icvr.created_date_utc as date,
     coalesce(icuh.id_deal, 'UNSET') as id_deal,
     case
-        when icbs.id_booking is not null then 'New Dash' else 'Old Dash'
+        -- New Dash users with a booking and a deal
+        when
+            icbs.id_booking is not null
+            and icbs.is_user_in_new_dash = true
+            and icbs.is_missing_id_deal = false
+        then 'New Dash'
+        -- Old Dash users if there is no booking or the user is not in the new dash
+        when icbs.id_booking is null or icbs.is_user_in_new_dash = false
+        then 'Old Dash'
+        -- Rest of the cases, includes KYG Lite users
+        else 'UNSET'
     end as business_scope,
     -- Dimensions --
     coalesce(
@@ -26,6 +36,4 @@ left join
 left join
     {{ ref("int_core__booking_summary") }} as icbs
     on icvr.id_verification_request = icbs.id_verification_request
-    and icbs.is_user_in_new_dash = true
-    and icbs.is_missing_id_deal = false
 group by 1, 2, 3, 4, 5
diff --git a/models/intermediate/kpis/int_kpis__metric_daily_guest_journeys_with_payment.sql b/models/intermediate/kpis/int_kpis__metric_daily_guest_journeys_with_payment.sql
index 2f5abf5..3c8e960 100644
--- a/models/intermediate/kpis/int_kpis__metric_daily_guest_journeys_with_payment.sql
+++ b/models/intermediate/kpis/int_kpis__metric_daily_guest_journeys_with_payment.sql
@@ -15,7 +15,17 @@ select
     p.first_payment_paid_date_utc as date,
     coalesce(icuh.id_deal, 'UNSET') as id_deal,
     case
-        when icbs.id_booking is not null then 'New Dash' else 'Old Dash'
+        -- New Dash users with a booking and a deal
+        when
+            icbs.id_booking is not null
+            and icbs.is_user_in_new_dash = true
+            and icbs.is_missing_id_deal = false
+        then 'New Dash'
+        -- Old Dash users if there is no booking or the user is not in the new dash
+        when icbs.id_booking is null or icbs.is_user_in_new_dash = false
+        then 'Old Dash'
+        -- Rest of the cases, includes KYG Lite users
+        else 'UNSET'
     end as business_scope,
     -- Dimensions --
     coalesce(
@@ -40,6 +50,4 @@ left join
 left join
     {{ ref("int_core__booking_summary") }} as icbs
     on p.id_verification_request = icbs.id_verification_request
-    and icbs.is_user_in_new_dash = true
-    and icbs.is_missing_id_deal = false
 group by 1, 2, 3, 4, 5
diff --git a/models/intermediate/kpis/int_kpis__metric_daily_guest_payments.sql b/models/intermediate/kpis/int_kpis__metric_daily_guest_payments.sql
index b1acc4e..ef315f3 100644
--- a/models/intermediate/kpis/int_kpis__metric_daily_guest_payments.sql
+++ b/models/intermediate/kpis/int_kpis__metric_daily_guest_payments.sql
@@ -15,7 +15,17 @@ select
     icvp.payment_paid_date_utc as date,
     coalesce(icuh.id_deal, 'UNSET') as id_deal,
     case
-        when icbs.id_booking is not null then 'New Dash' else 'Old Dash'
+        -- New Dash users with a booking and a deal
+        when
+            icbs.id_booking is not null
+            and icbs.is_user_in_new_dash = true
+            and icbs.is_missing_id_deal = false
+        then 'New Dash'
+        -- Old Dash users if there is no booking or the user is not in the new dash
+        when icbs.id_booking is null or icbs.is_user_in_new_dash = false
+        then 'Old Dash'
+        -- Rest of the cases, includes KYG Lite users
+        else 'UNSET'
     end as business_scope,
     case
         when icv.id_verification is null then 'W/O Id Check' else 'With Id Check'
@@ -86,7 +96,5 @@ left join
 left join
     {{ ref("int_core__booking_summary") }} as icbs
     on icvp.id_verification_request = icbs.id_verification_request
-    and icbs.is_user_in_new_dash = true
-    and icbs.is_missing_id_deal = false
 where upper(icvp.payment_status) = {{ var("paid_payment_state") }}
 group by 1, 2, 3, 4, 5, 6
diff --git a/models/intermediate/kpis/int_kpis__metric_daily_started_guest_journeys.sql b/models/intermediate/kpis/int_kpis__metric_daily_started_guest_journeys.sql
index 0c15e56..1db8e36 100644
--- a/models/intermediate/kpis/int_kpis__metric_daily_started_guest_journeys.sql
+++ b/models/intermediate/kpis/int_kpis__metric_daily_started_guest_journeys.sql
@@ -4,7 +4,17 @@ select
     icvr.verification_estimated_started_date_utc as date,
     coalesce(icuh.id_deal, 'UNSET') as id_deal,
     case
-        when icbs.id_booking is not null then 'New Dash' else 'Old Dash'
+        -- New Dash users with a booking and a deal
+        when
+            icbs.id_booking is not null
+            and icbs.is_user_in_new_dash = true
+            and icbs.is_missing_id_deal = false
+        then 'New Dash'
+        -- Old Dash users if there is no booking or the user is not in the new dash
+        when icbs.id_booking is null or icbs.is_user_in_new_dash = false
+        then 'Old Dash'
+        -- Rest of the cases, includes KYG Lite users
+        else 'UNSET'
     end as business_scope,
     -- Dimensions --
     coalesce(
@@ -26,7 +36,5 @@ left join
 left join
     {{ ref("int_core__booking_summary") }} as icbs
     on icvr.id_verification_request = icbs.id_verification_request
-    and icbs.is_user_in_new_dash = true
-    and icbs.is_missing_id_deal = false
 where icvr.verification_estimated_started_date_utc is not null
 group by 1, 2, 3, 4, 5