diff --git a/app/models/form/sales/pages/buyer2_nationality.rb b/app/models/form/sales/pages/buyer2_nationality.rb
index bd89b2203..bbec2a105 100644
--- a/app/models/form/sales/pages/buyer2_nationality.rb
+++ b/app/models/form/sales/pages/buyer2_nationality.rb
@@ -15,6 +15,13 @@ class Form::Sales::Pages::Buyer2Nationality < ::Form::Page
   end
 
   def questions
-    @questions ||= [Form::Sales::Questions::Buyer2Nationality.new(nil, nil, self)]
+    @questions ||= if form.start_year_after_2024?
+                     [
+                       Form::Sales::Questions::NationalityAllGroup.new("nationality_all_buyer2_group", nil, self, 2),
+                       Form::Sales::Questions::NationalityAll.new("nationality_all_buyer2", nil, self, 2),
+                     ]
+                   else
+                     [Form::Sales::Questions::Buyer2Nationality.new(nil, nil, self)]
+                   end
   end
 end
diff --git a/app/models/form/sales/pages/nationality1.rb b/app/models/form/sales/pages/nationality1.rb
index 0fcc19b8f..8d30487c3 100644
--- a/app/models/form/sales/pages/nationality1.rb
+++ b/app/models/form/sales/pages/nationality1.rb
@@ -13,6 +13,13 @@ class Form::Sales::Pages::Nationality1 < ::Form::Page
   end
 
   def questions
-    @questions ||= [Form::Sales::Questions::Nationality1.new(nil, nil, self)]
+    @questions ||= if form.start_year_after_2024?
+                     [
+                       Form::Sales::Questions::NationalityAllGroup.new("nationality_all_group", nil, self, 1),
+                       Form::Sales::Questions::NationalityAll.new("nationality_all", nil, self, 1),
+                     ]
+                   else
+                     [Form::Sales::Questions::Nationality1.new(nil, nil, self)]
+                   end
   end
 end
diff --git a/app/models/form/sales/questions/nationality_all.rb b/app/models/form/sales/questions/nationality_all.rb
new file mode 100644
index 000000000..d99a961d5
--- /dev/null
+++ b/app/models/form/sales/questions/nationality_all.rb
@@ -0,0 +1,217 @@
+class Form::Sales::Questions::NationalityAll < ::Form::Question
+  def initialize(id, hsh, page, buyer_index)
+    super(id, hsh, page)
+    @check_answer_label = "Buyer #{buyer_index}’s nationality"
+    @header = "Enter a nationality"
+    @type = "select"
+    @answer_options = ANSWER_OPTIONS
+    @check_answers_card_number = buyer_index
+    @question_number = buyer_index == 1 ? 24 : 32
+  end
+
+  ANSWER_OPTIONS = {
+    "" => "Select an option",
+    "4" => "Afghanistan",
+    "8" => "Albania",
+    "12" => "Algeria",
+    "20" => "Andorra",
+    "24" => "Angola",
+    "28" => "Antigua and Barbuda",
+    "32" => "Argentina",
+    "51" => "Armenia",
+    "36" => "Australia",
+    "40" => "Austria",
+    "31" => "Azerbaijan",
+    "44" => "Bahamas",
+    "48" => "Bahrain",
+    "50" => "Bangladesh",
+    "52" => "Barbados",
+    "112" => "Belarus",
+    "56" => "Belgium",
+    "84" => "Belize",
+    "204" => "Benin",
+    "64" => "Bhutan",
+    "68" => "Bolivia",
+    "70" => "Bosnia and Herzegovina",
+    "72" => "Botswana",
+    "76" => "Brazil",
+    "96" => "Brunei",
+    "100" => "Bulgaria",
+    "854" => "Burkina Faso",
+    "108" => "Burundi",
+    "132" => "Cabo Verde",
+    "116" => "Cambodia",
+    "120" => "Cameroon",
+    "124" => "Canada",
+    "140" => "Central African Republic",
+    "148" => "Chad",
+    "152" => "Chile",
+    "156" => "China",
+    "170" => "Colombia",
+    "174" => "Comoros",
+    "178" => "Congo",
+    "188" => "Costa Rica",
+    "384" => "Côte d'Ivoire",
+    "191" => "Croatia",
+    "192" => "Cuba",
+    "196" => "Cyprus",
+    "203" => "Czechia",
+    "180" => "Democratic Republic of the Congo",
+    "208" => "Denmark",
+    "262" => "Djibouti",
+    "212" => "Dominica",
+    "214" => "Dominican Republic",
+    "218" => "Ecuador",
+    "818" => "Egypt",
+    "222" => "El Salvador",
+    "226" => "Equatorial Guinea",
+    "232" => "Eritrea",
+    "233" => "Estonia",
+    "748" => "Eswatini",
+    "231" => "Ethiopia",
+    "238" => "Falkland Islands",
+    "242" => "Fiji",
+    "246" => "Finland",
+    "250" => "France",
+    "266" => "Gabon",
+    "270" => "Gambia",
+    "268" => "Georgia",
+    "276" => "Germany",
+    "288" => "Ghana",
+    "292" => "Gibraltar",
+    "300" => "Greece",
+    "308" => "Grenada",
+    "320" => "Guatemala",
+    "831" => "Guernsey",
+    "324" => "Guinea",
+    "624" => "Guinea-Bissau",
+    "328" => "Guyana",
+    "332" => "Haiti",
+    "340" => "Honduras",
+    "344" => "Hong Kong",
+    "348" => "Hungary",
+    "352" => "Iceland",
+    "356" => "India",
+    "360" => "Indonesia",
+    "364" => "Iran",
+    "368" => "Iraq",
+    "372" => "Ireland",
+    "833" => "Isle of Man",
+    "376" => "Israel",
+    "380" => "Italy",
+    "388" => "Jamaica",
+    "392" => "Japan",
+    "832" => "Jersey",
+    "400" => "Jordan",
+    "398" => "Kazakhstan",
+    "404" => "Kenya",
+    "296" => "Kiribati",
+    "414" => "Kuwait",
+    "417" => "Kyrgyzstan",
+    "418" => "Laos",
+    "428" => "Latvia",
+    "422" => "Lebanon",
+    "426" => "Lesotho",
+    "430" => "Liberia",
+    "434" => "Libya",
+    "438" => "Liechtenstein",
+    "440" => "Lithuania",
+    "442" => "Luxembourg",
+    "450" => "Madagascar",
+    "454" => "Malawi",
+    "458" => "Malaysia",
+    "462" => "Maldives",
+    "466" => "Mali",
+    "470" => "Malta",
+    "584" => "Marshall Islands",
+    "478" => "Mauritania",
+    "480" => "Mauritius",
+    "484" => "Mexico",
+    "583" => "Micronesia (Federated States of)",
+    "498" => "Moldova",
+    "492" => "Monaco",
+    "496" => "Mongolia",
+    "499" => "Montenegro",
+    "504" => "Morocco",
+    "508" => "Mozambique",
+    "104" => "Myanmar",
+    "516" => "Namibia",
+    "520" => "Nauru",
+    "524" => "Nepal",
+    "528" => "Netherlands",
+    "554" => "New Zealand",
+    "558" => "Nicaragua",
+    "562" => "Niger",
+    "566" => "Nigeria",
+    "807" => "North Macedonia",
+    "408" => "North Korea",
+    "578" => "Norway",
+    "512" => "Oman",
+    "586" => "Pakistan",
+    "585" => "Palau",
+    "275" => "Palestine, State of",
+    "591" => "Panama",
+    "598" => "Papua New Guinea",
+    "600" => "Paraguay",
+    "604" => "Peru",
+    "608" => "Philippines",
+    "616" => "Poland",
+    "620" => "Portugal",
+    "634" => "Qatar",
+    "642" => "Romania",
+    "643" => "Russia",
+    "646" => "Rwanda",
+    "659" => "Saint Kitts and Nevis",
+    "662" => "Saint Lucia",
+    "670" => "Saint Vincent and the Grenadines",
+    "882" => "Samoa",
+    "674" => "San Marino",
+    "678" => "Sao Tome and Principe",
+    "682" => "Saudi Arabia",
+    "686" => "Senegal",
+    "688" => "Serbia",
+    "690" => "Seychelles",
+    "694" => "Sierra Leone",
+    "702" => "Singapore",
+    "703" => "Slovakia",
+    "705" => "Slovenia",
+    "90" => "Solomon Islands",
+    "706" => "Somalia",
+    "710" => "South Africa",
+    "410" => "South Korea",
+    "728" => "South Sudan",
+    "724" => "Spain",
+    "144" => "Sri Lanka",
+    "729" => "Sudan",
+    "740" => "Suriname",
+    "752" => "Sweden",
+    "756" => "Switzerland",
+    "760" => "Syria",
+    "158" => "Taiwan",
+    "762" => "Tajikistan",
+    "834" => "Tanzania",
+    "764" => "Thailand",
+    "626" => "Timor-Leste",
+    "768" => "Togo",
+    "776" => "Tonga",
+    "780" => "Trinidad and Tobago",
+    "788" => "Tunisia",
+    "792" => "Turkey",
+    "795" => "Turkmenistan",
+    "798" => "Tuvalu",
+    "800" => "Uganda",
+    "804" => "Ukraine",
+    "784" => "United Arab Emirates",
+    "826" => "United Kingdom",
+    "840" => "United States of America",
+    "858" => "Uruguay",
+    "860" => "Uzbekistan",
+    "548" => "Vanuatu",
+    "336" => "Vatican City",
+    "862" => "Venezuela",
+    "704" => "Vietnam",
+    "887" => "Yemen",
+    "894" => "Zambia",
+    "716" => "Zimbabwe",
+  }.freeze
+end
diff --git a/app/models/form/sales/questions/nationality_all_group.rb b/app/models/form/sales/questions/nationality_all_group.rb
new file mode 100644
index 000000000..349485188
--- /dev/null
+++ b/app/models/form/sales/questions/nationality_all_group.rb
@@ -0,0 +1,20 @@
+class Form::Sales::Questions::NationalityAllGroup < ::Form::Question
+  def initialize(id, hsh, page, buyer_index)
+    super(id, hsh, page)
+    @check_answer_label = "Buyer #{buyer_index}’s nationality"
+    @header = "What is buyer #{buyer_index}’s nationality?"
+    @type = "radio"
+    @hint_text = buyer_index == 1 ? "Buyer 1 is the person in the household who does the most paid work. If it’s a joint purchase and the buyers do the same amount of paid work, buyer 1 is whoever is the oldest." : ""
+    @answer_options = ANSWER_OPTIONS
+    @check_answers_card_number = buyer_index
+    @question_number = buyer_index == 1 ? 24 : 32
+    @conditional_for = buyer_index == 1 ? { "nationality_all" => [12] } : { "nationality_all_buyer2" => [12] }
+    @hidden_in_check_answers = { "depends_on" => [{ id => 12 }] }
+  end
+
+  ANSWER_OPTIONS = {
+    "826" => { "value" => "United Kingdom" },
+    "12" => { "value" => "Other" },
+    "13" => { "value" => "Buyer prefers not to say" },
+  }.freeze
+end
diff --git a/spec/models/form/sales/pages/buyer2_nationality_spec.rb b/spec/models/form/sales/pages/buyer2_nationality_spec.rb
index ba4c16b61..63bfbdb10 100644
--- a/spec/models/form/sales/pages/buyer2_nationality_spec.rb
+++ b/spec/models/form/sales/pages/buyer2_nationality_spec.rb
@@ -4,6 +4,12 @@ RSpec.describe Form::Sales::Pages::Buyer2Nationality, type: :model do
   subject(:page) { described_class.new(nil, nil, subsection) }
 
   let(:subsection) { instance_double(Form::Subsection) }
+  let(:form) { instance_double(Form) }
+
+  before do
+    allow(subsection).to receive(:form).and_return(form)
+    allow(form).to receive(:start_year_after_2024?).and_return(false)
+  end
 
   it "has correct subsection" do
     expect(page.subsection).to be subsection
@@ -37,4 +43,14 @@ RSpec.describe Form::Sales::Pages::Buyer2Nationality, type: :model do
       },
     ]
   end
+
+  context "with year 2024" do
+    before do
+      allow(form).to receive(:start_year_after_2024?).and_return(true)
+    end
+
+    it "has correct questions" do
+      expect(page.questions.map(&:id)).to eq %w[nationality_all_buyer2_group nationality_all_buyer2]
+    end
+  end
 end
diff --git a/spec/models/form/sales/pages/nationality1_spec.rb b/spec/models/form/sales/pages/nationality1_spec.rb
index 47e291915..1dc482848 100644
--- a/spec/models/form/sales/pages/nationality1_spec.rb
+++ b/spec/models/form/sales/pages/nationality1_spec.rb
@@ -4,6 +4,12 @@ RSpec.describe Form::Sales::Pages::Nationality1, type: :model do
   subject(:page) { described_class.new(nil, nil, subsection) }
 
   let(:subsection) { instance_double(Form::Subsection) }
+  let(:form) { instance_double(Form) }
+
+  before do
+    allow(subsection).to receive(:form).and_return(form)
+    allow(form).to receive(:start_year_after_2024?).and_return(false)
+  end
 
   it "has correct subsection" do
     expect(page.subsection).to be subsection
@@ -28,4 +34,14 @@ RSpec.describe Form::Sales::Pages::Nationality1, type: :model do
   it "has correct depends_on" do
     expect(page.depends_on).to eq [{ "buyer_has_seen_privacy_notice?" => true }, { "buyer_not_interviewed?" => true }]
   end
+
+  context "with year 2024" do
+    before do
+      allow(form).to receive(:start_year_after_2024?).and_return(true)
+    end
+
+    it "has correct questions" do
+      expect(page.questions.map(&:id)).to eq %w[nationality_all_group nationality_all]
+    end
+  end
 end
diff --git a/spec/models/form/sales/questions/nationality_all_group_spec.rb b/spec/models/form/sales/questions/nationality_all_group_spec.rb
new file mode 100644
index 000000000..6859b50cb
--- /dev/null
+++ b/spec/models/form/sales/questions/nationality_all_group_spec.rb
@@ -0,0 +1,89 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Questions::NationalityAllGroup, type: :model do
+  subject(:question) { described_class.new("some_id", nil, page, buyer_index) }
+
+  let(:buyer_index) { 1 }
+
+  let(:page) { instance_double(Form::Page) }
+
+  it "has correct page" do
+    expect(question.page).to be page
+  end
+
+  it "has the correct id" do
+    expect(question.id).to eq "some_id"
+  end
+
+  it "has the correct type" do
+    expect(question.type).to eq "radio"
+  end
+
+  it "has the correct answer_options" do
+    expect(question.answer_options).to eq({
+      "826" => { "value" => "United Kingdom" },
+      "12" => { "value" => "Other" },
+      "13" => { "value" => "Buyer prefers not to say" },
+    })
+  end
+
+  it "has correct hidden in check answers" do
+    expect(question.hidden_in_check_answers).to eq({ "depends_on" => [{ "some_id" => 12 }] })
+  end
+
+  context "with buyer 1" do
+    let(:buyer_index) { 1 }
+
+    it "has correct conditional for" do
+      expect(question.conditional_for).to eq({ "nationality_all" => [12] })
+    end
+
+    it "has correct question_number" do
+      expect(question.question_number).to eq(24)
+    end
+
+    it "has correct check_answers_card_number" do
+      expect(question.check_answers_card_number).to eq(1)
+    end
+
+    it "has the correct hint" do
+      expect(question.hint_text).to eq "Buyer 1 is the person in the household who does the most paid work. If it’s a joint purchase and the buyers do the same amount of paid work, buyer 1 is whoever is the oldest."
+    end
+
+    it "has the correct header" do
+      expect(question.header).to eq "What is buyer 1’s nationality?"
+    end
+
+    it "has the correct check_answer_label" do
+      expect(question.check_answer_label).to eq "Buyer 1’s nationality"
+    end
+  end
+
+  context "with buyer 2" do
+    let(:buyer_index) { 2 }
+
+    it "has correct conditional for" do
+      expect(question.conditional_for).to eq({ "nationality_all_buyer2" => [12] })
+    end
+
+    it "has correct question_number" do
+      expect(question.question_number).to eq(32)
+    end
+
+    it "has correct check_answers_card_number" do
+      expect(question.check_answers_card_number).to eq(2)
+    end
+
+    it "has the correct hint" do
+      expect(question.hint_text).to eq("")
+    end
+
+    it "has the correct header" do
+      expect(question.header).to eq "What is buyer 2’s nationality?"
+    end
+
+    it "has the correct check_answer_label" do
+      expect(question.check_answer_label).to eq "Buyer 2’s nationality"
+    end
+  end
+end
diff --git a/spec/models/form/sales/questions/nationality_all_spec.rb b/spec/models/form/sales/questions/nationality_all_spec.rb
new file mode 100644
index 000000000..c228c459d
--- /dev/null
+++ b/spec/models/form/sales/questions/nationality_all_spec.rb
@@ -0,0 +1,73 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Questions::NationalityAll, type: :model do
+  subject(:question) { described_class.new("some_id", nil, page, buyer_index) }
+
+  let(:buyer_index) { 1 }
+
+  let(:page) { instance_double(Form::Page) }
+
+  it "has correct page" do
+    expect(question.page).to be page
+  end
+
+  it "has the correct id" do
+    expect(question.id).to eq "some_id"
+  end
+
+  it "has the correct header" do
+    expect(question.header).to eq "Enter a nationality"
+  end
+
+  it "has the correct type" do
+    expect(question.type).to eq "select"
+  end
+
+  it "has the correct hint" do
+    expect(question.hint_text).to be_nil
+  end
+
+  it "has the correct answer_options" do
+    expect(question.answer_options.count).to eq(203)
+  end
+
+  it "has correct conditional for" do
+    expect(question.conditional_for).to be_nil
+  end
+
+  it "has correct hidden in check answers" do
+    expect(question.hidden_in_check_answers).to be_nil
+  end
+
+  context "with buyer 1" do
+    let(:buyer_index) { 1 }
+
+    it "has the correct check_answers_card_number" do
+      expect(question.check_answers_card_number).to be 1
+    end
+
+    it "has the correct check_answer_label" do
+      expect(question.check_answer_label).to eq "Buyer 1’s nationality"
+    end
+
+    it "has the correct question_number" do
+      expect(question.question_number).to be 24
+    end
+  end
+
+  context "with buyer 2" do
+    let(:buyer_index) { 2 }
+
+    it "has the correct check_answers_card_number" do
+      expect(question.check_answers_card_number).to be 2
+    end
+
+    it "has the correct check_answer_label" do
+      expect(question.check_answer_label).to eq "Buyer 2’s nationality"
+    end
+
+    it "has the correct question_number" do
+      expect(question.question_number).to be 32
+    end
+  end
+end