diff --git a/config/locales/forms/2023/sales/property.en.yml b/config/locales/forms/2023/sales/property.en.yml
index c92abe9cf..d79fc9353 100644
--- a/config/locales/forms/2023/sales/property.en.yml
+++ b/config/locales/forms/2023/sales/property.en.yml
@@ -1,113 +1,113 @@
 en:
-  forms:
-    2023:
-      sales:
-        property:
-          uprn:
-            page_header: ""
-            check_answer_label: "UPRN"
-            hint_text: ""
-            question_text: "What is the property's UPRN?"
+    forms:
+        2023:
+            sales:
+                property:
+                    uprn:
+                        page_header: ""
+                        check_answer_label: "UPRN"
+                        hint_text: ""
+                        question_text: "What is the property's UPRN?"
 
-          uprn_known:
-            page_header: ""
-            check_answer_label: "UPRN known?"
-            hint_text: "The Unique Property Reference Number (UPRN) is a unique number system created by Ordnance Survey and used by housing providers and various industries across the UK. An example UPRN is 10010457355.<br><br>
-                              The UPRN may not be the same as the property reference assigned by your organisation.<br><br>
-                              If you don’t know the UPRN you can enter the address of the property instead on the next screen."
-            question_text: "Do you know the property's UPRN?"
+                    uprn_known:
+                        page_header: ""
+                        check_answer_label: "UPRN known?"
+                        hint_text: "The Unique Property Reference Number (UPRN) is a unique number system created by Ordnance Survey and used by housing providers and various industries across the UK. An example UPRN is 10010457355.<br><br>
+                                          The UPRN may not be the same as the property reference assigned by your organisation.<br><br>
+                                          If you don’t know the UPRN you can enter the address of the property instead on the next screen."
+                        question_text: "Do you know the property's UPRN?"
 
-          uprn_confirmed:
-            page_header: "We found an address that might be this property"
-            check_answer_label: "Is this the right address?"
-            hint_text: ""
-            question_text: "Is this the property address?"
+                    uprn_confirmed:
+                        page_header: "We found an address that might be this property"
+                        check_answer_label: "Is this the right address?"
+                        hint_text: ""
+                        question_text: "Is this the property address?"
 
-          address:
-            page_header: "Q15 - What is the property's address?"
-            address_line1:
-              check_answer_label: "Address lines 1 and 2"
-              hint_text: ""
-              question_text: "Address line 1"
-            address_line2:
-              check_answer_label: ""
-              hint_text: ""
-              question_text: "Address line 2 (optional)"
-            town_or_city:
-              check_answer_label: "Town or city"
-              hint_text: ""
-              question_text: "Town or city"
-            county:
-              check_answer_label: "County"
-              hint_text: ""
-              question_text: "County (optional)"
-            postcode_full:
-              check_answer_label: "Postcode"
-              hint_text: ""
-              question_text: "Postcode"
+                    address:
+                        page_header: "Q15 - What is the property's address?"
+                        address_line1:
+                            check_answer_label: "Address lines 1 and 2"
+                            hint_text: ""
+                            question_text: "Address line 1"
+                        address_line2:
+                            check_answer_label: ""
+                            hint_text: ""
+                            question_text: "Address line 2 (optional)"
+                        town_or_city:
+                            check_answer_label: "Town or city"
+                            hint_text: ""
+                            question_text: "Town or city"
+                        county:
+                            check_answer_label: "County"
+                            hint_text: ""
+                            question_text: "County (optional)"
+                        postcode_full:
+                            check_answer_label: "Postcode"
+                            hint_text: ""
+                            question_text: "Postcode"
 
-          la:
-            page_header: ""
-            check_answer_label: "Local authority"
-            hint_text: ""
-            question_text: "What is the property’s local authority?"
+                    la:
+                        page_header: ""
+                        check_answer_label: "Local authority"
+                        hint_text: ""
+                        question_text: "What is the property’s local authority?"
 
-          income1_value_check:
-            page_header: ""
-            check_answer_label: "Buyer 1 income confirmation"
-            hint_text: ""
-            question_text: "Are you sure this is correct?"
+                    income1_value_check:
+                        page_header: ""
+                        check_answer_label: "Buyer 1 income confirmation"
+                        hint_text: ""
+                        question_text: "Are you sure this is correct?"
 
-          income2_value_check":
-            page_header: ""
-            check_answer_label: "Buyer 2 income confirmation"
-            hint_text: ""
-            question_text: "Are you sure this is correct?"
+                    income2_value_check":
+                        page_header: ""
+                        check_answer_label: "Buyer 2 income confirmation"
+                        hint_text: ""
+                        question_text: "Are you sure this is correct?"
 
-          combined_income_value_check:
-            page_header: ""
-            check_answer_label: "Combined income confirmation"
-            hint_text: ""
-            question_text: "Are you sure this is correct?"
+                    combined_income_value_check:
+                        page_header: ""
+                        check_answer_label: "Combined income confirmation"
+                        hint_text: ""
+                        question_text: "Are you sure this is correct?"
 
-          value_value_check:
-            page_header: ""
-            check_answer_label: "Purchase price confirmation"
-            hint_text: ""
-            question_text: "Are you sure?"
+                    value_value_check:
+                        page_header: ""
+                        check_answer_label: "Purchase price confirmation"
+                        hint_text: ""
+                        question_text: "Are you sure?"
 
-          beds:
-            page_header: ""
-            check_answer_label: "Number of bedrooms"
-            hint_text: "A bedsit has 1 bedroom."
-            question_text: "How many bedrooms does the property have?"
+                    beds:
+                        page_header: ""
+                        check_answer_label: "Number of bedrooms"
+                        hint_text: "A bedsit has 1 bedroom."
+                        question_text: "How many bedrooms does the property have?"
 
-          proptype:
-            page_header: ""
-            check_answer_label: "Type of unit"
-            hint_text: ""
-            question_text: "What type of unit is the property?"
+                    proptype:
+                        page_header: ""
+                        check_answer_label: "Type of unit"
+                        hint_text: ""
+                        question_text: "What type of unit is the property?"
 
-          monthly_charges_value_check:
-            page_header: ""
-            check_answer_label: "Monthly charges confirmation"
-            hint_text: ""
-            question_text: "Are you sure this is correct?"
+                    monthly_charges_value_check:
+                        page_header: ""
+                        check_answer_label: "Monthly charges confirmation"
+                        hint_text: ""
+                        question_text: "Are you sure this is correct?"
 
-          percentage_discount_value_check:
-            page_header: ""
-            check_answer_label: "Percentage discount confirmation"
-            hint_text: ""
-            question_text: "Are you sure this is correct?"
+                    percentage_discount_value_check:
+                        page_header: ""
+                        check_answer_label: "Percentage discount confirmation"
+                        hint_text: ""
+                        question_text: "Are you sure this is correct?"
 
-          builtype:
-            page_header: ""
-            check_answer_label: "Type of building"
-            hint_text: ""
-            question_text: "What type of building is the property?"
+                    builtype:
+                        page_header: ""
+                        check_answer_label: "Type of building"
+                        hint_text: ""
+                        question_text: "What type of building is the property?"
 
-          wchair:
-            page_header: ""
-            check_answer_label: "Property built or adapted to wheelchair-user standards"
-            hint_text: ""
-            question_text: "Is the property built or adapted to wheelchair-user standards?"
+                    wchair:
+                        page_header: ""
+                        check_answer_label: "Property built or adapted to wheelchair-user standards"
+                        hint_text: ""
+                        question_text: "Is the property built or adapted to wheelchair-user standards?"
diff --git a/config/locales/forms/2024/sales/property.en.yml b/config/locales/forms/2024/sales/property.en.yml
index 61eaeb5bb..772685a12 100644
--- a/config/locales/forms/2024/sales/property.en.yml
+++ b/config/locales/forms/2024/sales/property.en.yml
@@ -1,136 +1,136 @@
 en:
-  forms:
-    2024:
-      sales:
-        property:
-          uprn:
-            page_header: ""
-            check_answer_label: "UPRN"
-            hint_text: ""
-            question_text: "What is the property's UPRN?"
-
-          uprn_known:
-            page_header: ""
-            check_answer_label: "UPRN known?"
-            hint_text: "The Unique Property Reference Number (UPRN) is a unique number system created by Ordnance Survey and used by housing providers and various industries across the UK. An example UPRN is 10010457355.<br><br>
-                              The UPRN may not be the same as the property reference assigned by your organisation.<br><br>
-                              If you don’t know the UPRN you can enter the address of the property instead on the next screen."
-            question_text: "Do you know the property's UPRN?"
-
-          uprn_confirmed:
-            page_header: "We found an address that might be this property"
-            check_answer_label: "Is this the right address?"
-            hint_text: ""
-            question_text: "Is this the property address?"
-
-          address_matcher:
-            page_header: "Find an address"
-            address_line1_input:
-              check_answer_label: "Find address"
-              hint_text: ""
-              question_text: "Address line 1"
-            postcode_full_input:
-              check_answer_label: ""
-              hint_text: ""
-              question_text: "Postcode"
-
-          address_search_value_check:
-            page_header: ""
-            check_answer_label: ""
-            hint_text: ""
-            question_text: "No address found"
-
-          uprn_selection:
-            page_header: "We found some addresses that might be this property"
-            check_answer_label: "Select the correct address"
-            hint_text: ""
-            question_text: "Select the correct address"
-
-          address:
-            page_header: "Q12 - What is the property's address?"
-            address_line1:
-              check_answer_label: "Address lines 1 and 2"
-              hint_text: ""
-              question_text: "Address line 1"
-            address_line2:
-              check_answer_label: ""
-              hint_text: ""
-              question_text: "Address line 2 (optional)"
-            town_or_city:
-              check_answer_label: "Town or city"
-              hint_text: ""
-              question_text: "Town or city"
-            county:
-              check_answer_label: "County"
-              hint_text: ""
-              question_text: "County (optional)"
-            postcode_full:
-              check_answer_label: "Postcode"
-              hint_text: ""
-              question_text: "Postcode"
-
-          la:
-            page_header: ""
-            check_answer_label: "Local authority"
-            hint_text: ""
-            question_text: "What is the property’s local authority?"
-
-          income1_value_check:
-            page_header: ""
-            check_answer_label: "Buyer 1 income confirmation"
-            hint_text: ""
-            question_text: "Are you sure this is correct?"
-
-          income2_value_check":
-            page_header: ""
-            check_answer_label: "Buyer 2 income confirmation"
-            hint_text: ""
-            question_text: "Are you sure this is correct?"
-
-          combined_income_value_check:
-            page_header: ""
-            check_answer_label: "Combined income confirmation"
-            hint_text: ""
-            question_text: "Are you sure this is correct?"
-
-          value_value_check:
-            page_header: ""
-            check_answer_label: "Purchase price confirmation"
-            hint_text: ""
-            question_text: "Are you sure?"
-
-          beds:
-            page_header: ""
-            check_answer_label: "Number of bedrooms"
-            hint_text: "A bedsit has 1 bedroom."
-            question_text: "How many bedrooms does the property have?"
-
-          proptype:
-            page_header: ""
-            check_answer_label: "Type of unit"
-            hint_text: ""
-            question_text: "What type of unit is the property?"
-
-          monthly_charges_value_check:
-            page_header: ""
-            check_answer_label: "Monthly charges confirmation"
-            hint_text: ""
-            question_text: "Are you sure this is correct?"
-
-          percentage_discount_value_check:
-            page_header: ""
-            check_answer_label: "Percentage discount confirmation"
-            hint_text: ""
-            question_text: "Are you sure this is correct?"
-
-          builtype:
-            page_header: ""
-            check_answer_label: "Type of building"
-            hint_text: ""
-            question_text: "What type of building is the property?"
-
-          wchair:
-            page_header: ""
-            check_answer_label: "Property built or adapted to wheelchair-user standards"
-            hint_text: ""
-            question_text: "Is the property built or adapted to wheelchair-user standards?"
+    forms:
+        2024:
+            sales:
+                property:
+                    uprn:
+                        page_header: ""
+                        check_answer_label: "UPRN"
+                        hint_text: ""
+                        question_text: "What is the property's UPRN?"
+
+                    uprn_known:
+                        page_header: ""
+                        check_answer_label: "UPRN known?"
+                        hint_text: "The Unique Property Reference Number (UPRN) is a unique number system created by Ordnance Survey and used by housing providers and various industries across the UK. An example UPRN is 10010457355.<br><br>
+                                          The UPRN may not be the same as the property reference assigned by your organisation.<br><br>
+                                          If you don’t know the UPRN you can enter the address of the property instead on the next screen."
+                        question_text: "Do you know the property's UPRN?"
+
+                    uprn_confirmed:
+                        page_header: "We found an address that might be this property"
+                        check_answer_label: "Is this the right address?"
+                        hint_text: ""
+                        question_text: "Is this the property address?"
+
+                    address_matcher:
+                        page_header: "Find an address"
+                        address_line1_input:
+                            check_answer_label: "Find address"
+                            hint_text: ""
+                            question_text: "Address line 1"
+                        postcode_full_input:
+                            check_answer_label: ""
+                            hint_text: ""
+                            question_text: "Postcode"
+
+                    address_search_value_check:
+                        page_header: ""
+                        check_answer_label: ""
+                        hint_text: ""
+                        question_text: "No address found"
+
+                    uprn_selection:
+                        page_header: "We found some addresses that might be this property"
+                        check_answer_label: "Select the correct address"
+                        hint_text: ""
+                        question_text: "Select the correct address"
+
+                    address:
+                        page_header: "Q12 - What is the property's address?"
+                        address_line1:
+                            check_answer_label: "Address lines 1 and 2"
+                            hint_text: ""
+                            question_text: "Address line 1"
+                        address_line2:
+                            check_answer_label: ""
+                            hint_text: ""
+                            question_text: "Address line 2 (optional)"
+                        town_or_city:
+                            check_answer_label: "Town or city"
+                            hint_text: ""
+                            question_text: "Town or city"
+                        county:
+                            check_answer_label: "County"
+                            hint_text: ""
+                            question_text: "County (optional)"
+                        postcode_full:
+                            check_answer_label: "Postcode"
+                            hint_text: ""
+                            question_text: "Postcode"
+
+                    la:
+                        page_header: ""
+                        check_answer_label: "Local authority"
+                        hint_text: ""
+                        question_text: "What is the property’s local authority?"
+
+                    income1_value_check:
+                        page_header: ""
+                        check_answer_label: "Buyer 1 income confirmation"
+                        hint_text: ""
+                        question_text: "Are you sure this is correct?"
+
+                    income2_value_check":
+                        page_header: ""
+                        check_answer_label: "Buyer 2 income confirmation"
+                        hint_text: ""
+                        question_text: "Are you sure this is correct?"
+
+                    combined_income_value_check:
+                        page_header: ""
+                        check_answer_label: "Combined income confirmation"
+                        hint_text: ""
+                        question_text: "Are you sure this is correct?"
+
+                    value_value_check:
+                        page_header: ""
+                        check_answer_label: "Purchase price confirmation"
+                        hint_text: ""
+                        question_text: "Are you sure?"
+
+                    beds:
+                        page_header: ""
+                        check_answer_label: "Number of bedrooms"
+                        hint_text: "A bedsit has 1 bedroom."
+                        question_text: "How many bedrooms does the property have?"
+
+                    proptype:
+                        page_header: ""
+                        check_answer_label: "Type of unit"
+                        hint_text: ""
+                        question_text: "What type of unit is the property?"
+
+                    monthly_charges_value_check:
+                        page_header: ""
+                        check_answer_label: "Monthly charges confirmation"
+                        hint_text: ""
+                        question_text: "Are you sure this is correct?"
+
+                    percentage_discount_value_check:
+                        page_header: ""
+                        check_answer_label: "Percentage discount confirmation"
+                        hint_text: ""
+                        question_text: "Are you sure this is correct?"
+
+                    builtype:
+                        page_header: ""
+                        check_answer_label: "Type of building"
+                        hint_text: ""
+                        question_text: "What type of building is the property?"
+
+                    wchair:
+                        page_header: ""
+                        check_answer_label: "Property built or adapted to wheelchair-user standards"
+                        hint_text: ""
+                        question_text: "Is the property built or adapted to wheelchair-user standards?"