diff --git a/app/models/form/sales/pages/address.rb b/app/models/form/sales/pages/address.rb
index 6bd74f8b7..6c83aabdc 100644
--- a/app/models/form/sales/pages/address.rb
+++ b/app/models/form/sales/pages/address.rb
@@ -2,7 +2,7 @@ class Form::Sales::Pages::Address < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "address"
-    @header = "Q#{QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]} - What is the property's address?"
+    @copy_key = "sales.property.address"
     @depends_on = [
       { "uprn_known" => nil },
       { "uprn_known" => 0 },
diff --git a/app/models/form/sales/pages/address_fallback.rb b/app/models/form/sales/pages/address_fallback.rb
index 3a69dabba..449dc5a40 100644
--- a/app/models/form/sales/pages/address_fallback.rb
+++ b/app/models/form/sales/pages/address_fallback.rb
@@ -2,7 +2,7 @@ class Form::Sales::Pages::AddressFallback < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "address"
-    @header = "Q12 - What is the property's address?"
+    @copy_key = "sales.property.address"
     @depends_on = [
       { "uprn_known" => nil, "uprn_selection" => "uprn_not_listed" },
       { "uprn_known" => 0, "uprn_selection" => "uprn_not_listed" },
diff --git a/app/models/form/sales/pages/address_matcher.rb b/app/models/form/sales/pages/address_matcher.rb
index 5d2a38767..5384ec4c1 100644
--- a/app/models/form/sales/pages/address_matcher.rb
+++ b/app/models/form/sales/pages/address_matcher.rb
@@ -2,7 +2,7 @@ class Form::Sales::Pages::AddressMatcher < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "address_matcher"
-    @header = "Find an address"
+    @header = "sales.property.address_matcher"
     @depends_on = [
       { "uprn_known" => nil },
       { "uprn_known" => 0 },
diff --git a/app/models/form/sales/pages/uprn_confirmation.rb b/app/models/form/sales/pages/uprn_confirmation.rb
index d553972a3..c7e6858df 100644
--- a/app/models/form/sales/pages/uprn_confirmation.rb
+++ b/app/models/form/sales/pages/uprn_confirmation.rb
@@ -2,7 +2,7 @@ class Form::Sales::Pages::UprnConfirmation < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "uprn_confirmation"
-    @header = "We found an address that might be this property"
+    @copy_key = "sales.property.uprn_confirmed"
   end
 
   def questions
diff --git a/app/models/form/sales/pages/uprn_selection.rb b/app/models/form/sales/pages/uprn_selection.rb
index 94f35540f..b6188ec30 100644
--- a/app/models/form/sales/pages/uprn_selection.rb
+++ b/app/models/form/sales/pages/uprn_selection.rb
@@ -2,7 +2,7 @@ class Form::Sales::Pages::UprnSelection < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "uprn_selection"
-    @header = "We found some addresses that might be this property"
+    @copy_key = "sales.property.uprn_selection"
     @depends_on = [
       { "uprn_known" => nil, "address_options_present?" => true },
       { "uprn_known" => 0, "address_options_present?" => true },
diff --git a/config/locales/forms/2023/sales/property.en.yml b/config/locales/forms/2023/sales/property.en.yml
index 4b9050153..c92abe9cf 100644
--- a/config/locales/forms/2023/sales/property.en.yml
+++ b/config/locales/forms/2023/sales/property.en.yml
@@ -4,114 +4,110 @@ en:
       sales:
         property:
           uprn:
-            page_header: "What is the property's UPRN?"
+            page_header: ""
             check_answer_label: "UPRN"
             hint_text: ""
-            question_text: ""
+            question_text: "What is the property's UPRN?"
 
           uprn_known:
-            page_header: "Do you know the property's UPRN?"
+            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: ""
+            question_text: "Do you know the property's UPRN?"
 
           uprn_confirmed:
-            page_header: "Is this the property address?"
+            page_header: "We found an address that might be this property"
             check_answer_label: "Is this the right address?"
             hint_text: ""
-            question_text: ""
+            question_text: "Is this the property address?"
 
           address:
+            page_header: "Q15 - What is the property's address?"
             address_line1:
-              page_header: "Address line 1"
               check_answer_label: "Address lines 1 and 2"
               hint_text: ""
-              question_text: ""
+              question_text: "Address line 1"
             address_line2:
-              page_header: "Address line 2 (optional)"
               check_answer_label: ""
               hint_text: ""
-              question_text: ""
+              question_text: "Address line 2 (optional)"
             town_or_city:
-              page_header: "Town or city"
               check_answer_label: "Town or city"
               hint_text: ""
-              question_text: ""
+              question_text: "Town or city"
             county:
-              page_header: "County (optional)"
               check_answer_label: "County"
               hint_text: ""
-              question_text: ""
+              question_text: "County (optional)"
             postcode_full:
-              page_header: "Postcode"
               check_answer_label: "Postcode"
               hint_text: ""
-              question_text: ""
+              question_text: "Postcode"
 
           la:
-            page_header: "What is the property’s local authority?"
+            page_header: ""
             check_answer_label: "Local authority"
             hint_text: ""
-            question_text: ""
+            question_text: "What is the property’s local authority?"
 
           income1_value_check:
-            page_header: "Are you sure this is correct?"
+            page_header: ""
             check_answer_label: "Buyer 1 income confirmation"
             hint_text: ""
-            question_text: ""
+            question_text: "Are you sure this is correct?"
 
           income2_value_check":
-            page_header: "Are you sure this is correct?"
+            page_header: ""
             check_answer_label: "Buyer 2 income confirmation"
             hint_text: ""
-            question_text: ""
+            question_text: "Are you sure this is correct?"
 
           combined_income_value_check:
-            page_header: "Are you sure this is correct?"
+            page_header: ""
             check_answer_label: "Combined income confirmation"
             hint_text: ""
-            question_text: ""
+            question_text: "Are you sure this is correct?"
 
           value_value_check:
-            page_header: "Are you sure?"
+            page_header: ""
             check_answer_label: "Purchase price confirmation"
             hint_text: ""
-            question_text: ""
+            question_text: "Are you sure?"
 
           beds:
-            page_header: "How many bedrooms does the property have?"
+            page_header: ""
             check_answer_label: "Number of bedrooms"
             hint_text: "A bedsit has 1 bedroom."
-            question_text: ""
+            question_text: "How many bedrooms does the property have?"
 
           proptype:
-            page_header: "What type of unit is the property?"
+            page_header: ""
             check_answer_label: "Type of unit"
             hint_text: ""
-            question_text: ""
+            question_text: "What type of unit is the property?"
 
           monthly_charges_value_check:
-            page_header: "Are you sure this is correct?"
+            page_header: ""
             check_answer_label: "Monthly charges confirmation"
             hint_text: ""
-            question_text: ""
+            question_text: "Are you sure this is correct?"
 
           percentage_discount_value_check:
-            page_header: "Are you sure this is correct?"
+            page_header: ""
             check_answer_label: "Percentage discount confirmation"
             hint_text: ""
-            question_text: ""
+            question_text: "Are you sure this is correct?"
 
           builtype:
-            page_header: "What type of building is the property?"
+            page_header: ""
             check_answer_label: "Type of building"
             hint_text: ""
-            question_text: ""
+            question_text: "What type of building is the property?"
 
           wchair:
-            page_header: "Is the property built or adapted to wheelchair-user standards?"
+            page_header: ""
             check_answer_label: "Property built or adapted to wheelchair-user standards"
             hint_text: ""
-            question_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 0539ca4a9..61eaeb5bb 100644
--- a/config/locales/forms/2024/sales/property.en.yml
+++ b/config/locales/forms/2024/sales/property.en.yml
@@ -4,139 +4,133 @@ en:
       sales:
         property:
           uprn:
-            page_header: "What is the property's UPRN?"
+            page_header: ""
             check_answer_label: "UPRN"
             hint_text: ""
-            question_text: ""
+            question_text: "What is the property's UPRN?"
 
           uprn_known:
-            page_header: "Do you know the property's UPRN?"
+            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: ""
+            question_text: "Do you know the property's UPRN?"
 
           uprn_confirmed:
-            page_header: "Is this the property address?"
+            page_header: "We found an address that might be this property"
             check_answer_label: "Is this the right address?"
             hint_text: ""
-            question_text: ""
+            question_text: "Is this the property address?"
 
           address_matcher:
+            page_header: "Find an address"
             address_line1_input:
-              page_header: "Address line 1"
               check_answer_label: "Find address"
               hint_text: ""
-              question_text: ""
+              question_text: "Address line 1"
             postcode_full_input:
-              page_header: "Postcode"
               check_answer_label: ""
               hint_text: ""
-              question_text: ""
+              question_text: "Postcode"
 
           address_search_value_check:
-            page_header: "No address found"
+            page_header: ""
             check_answer_label: ""
             hint_text: ""
-            question_text: ""
+            question_text: "No address found"
 
           uprn_selection:
-            page_header: "Select the correct address"
+            page_header: "We found some addresses that might be this property"
             check_answer_label: "Select the correct address"
             hint_text: ""
-            question_text: ""
+            question_text: "Select the correct address"
 
           address:
+            page_header: "Q12 - What is the property's address?"
             address_line1:
-              page_header: "Address line 1"
               check_answer_label: "Address lines 1 and 2"
               hint_text: ""
-              question_text: ""
+              question_text: "Address line 1"
             address_line2:
-              page_header: "Address line 2 (optional)"
               check_answer_label: ""
               hint_text: ""
-              question_text: ""
+              question_text: "Address line 2 (optional)"
             town_or_city:
-              page_header: "Town or city"
               check_answer_label: "Town or city"
               hint_text: ""
-              question_text: ""
+              question_text: "Town or city"
             county:
-              page_header: "County (optional)"
               check_answer_label: "County"
               hint_text: ""
-              question_text: ""
+              question_text: "County (optional)"
             postcode_full:
-              page_header: "Postcode"
               check_answer_label: "Postcode"
               hint_text: ""
-              question_text: ""
+              question_text: "Postcode"
 
           la:
-            page_header: "What is the property’s local authority?"
+            page_header: ""
             check_answer_label: "Local authority"
             hint_text: ""
-            question_text: ""
+            question_text: "What is the property’s local authority?"
 
           income1_value_check:
-            page_header: "Are you sure this is correct?"
+            page_header: ""
             check_answer_label: "Buyer 1 income confirmation"
             hint_text: ""
-            question_text: ""
+            question_text: "Are you sure this is correct?"
 
           income2_value_check":
-            page_header: "Are you sure this is correct?"
+            page_header: ""
             check_answer_label: "Buyer 2 income confirmation"
             hint_text: ""
-            question_text: ""
+            question_text: "Are you sure this is correct?"
 
           combined_income_value_check:
-            page_header: "Are you sure this is correct?"
+            page_header: ""
             check_answer_label: "Combined income confirmation"
             hint_text: ""
-            question_text: ""
+            question_text: "Are you sure this is correct?"
 
           value_value_check:
-            page_header: "Are you sure?"
+            page_header: ""
             check_answer_label: "Purchase price confirmation"
             hint_text: ""
-            question_text: ""
+            question_text: "Are you sure?"
 
           beds:
-            page_header: "How many bedrooms does the property have?"
+            page_header: ""
             check_answer_label: "Number of bedrooms"
             hint_text: "A bedsit has 1 bedroom."
-            question_text: ""
+            question_text: "How many bedrooms does the property have?"
 
           proptype:
-            page_header: "What type of unit is the property?"
+            page_header: ""
             check_answer_label: "Type of unit"
             hint_text: ""
-            question_text: ""
+            question_text: "What type of unit is the property?"
 
           monthly_charges_value_check:
-            page_header: "Are you sure this is correct?"
+            page_header: ""
             check_answer_label: "Monthly charges confirmation"
             hint_text: ""
-            question_text: ""
+            question_text: "Are you sure this is correct?"
 
           percentage_discount_value_check:
-            page_header: "Are you sure this is correct?"
+            page_header: ""
             check_answer_label: "Percentage discount confirmation"
             hint_text: ""
-            question_text: ""
+            question_text: "Are you sure this is correct?"
 
           builtype:
-            page_header: "What type of building is the property?"
+            page_header: ""
             check_answer_label: "Type of building"
             hint_text: ""
-            question_text: ""
+            question_text: "What type of building is the property?"
 
           wchair:
-            page_header: "Is the property built or adapted to wheelchair-user standards?"
+            page_header: ""
             check_answer_label: "Property built or adapted to wheelchair-user standards"
             hint_text: ""
-            question_text: ""
-
+            question_text: "Is the property built or adapted to wheelchair-user standards?"