diff --git a/app/models/form/lettings/questions/waityear.rb b/app/models/form/lettings/questions/waityear.rb
index 569533a9d..7ca4938f9 100644
--- a/app/models/form/lettings/questions/waityear.rb
+++ b/app/models/form/lettings/questions/waityear.rb
@@ -3,22 +3,37 @@ class Form::Lettings::Questions::Waityear < ::Form::Question
     super
     @id = "waityear"
     @check_answer_label = "Length of time on local authority waiting list"
-    @header = "How long has the household been on the local authority waiting list for the new letting?"
+    @header = form.start_year_after_2024? ? "How long has the household been on the local authority waiting list for the area of the new letting?" : "How long has the household been on the local authority waiting list for the new letting?"
     @type = "radio"
     @check_answers_card_number = 0
     @hint_text = ""
-    @answer_options = ANSWER_OPTIONS
     @question_number = 76
   end
 
-  ANSWER_OPTIONS = {
-    "2" => { "value" => "Less than 1 year" },
-    "7" => { "value" => "1 year but under 2 years" },
-    "8" => { "value" => "2 years but under 3 years" },
-    "9" => { "value" => "3 years but under 4 years" },
-    "10" => { "value" => "4 years but under 5 years" },
-    "5" => { "value" => "5 years or more" },
-    "divider" => { "value" => true },
-    "6" => { "value" => "Don’t know" },
-  }.freeze
+  def answer_options
+    if form.start_year_after_2024?
+      {
+        "2" => { "value" => "Less than 1 year" },
+        "7" => { "value" => "1 year but under 2 years" },
+        "8" => { "value" => "2 years but under 3 years" },
+        "9" => { "value" => "3 years but under 4 years" },
+        "10" => { "value" => "4 years but under 5 years" },
+        "11" => { "value" => "5 years but under 10 years" },
+        "12" => { "value" => "10 years or more" },
+        "divider" => { "value" => true },
+        "6" => { "value" => "Don’t know" },
+      }.freeze
+    else
+      {
+        "2" => { "value" => "Less than 1 year" },
+        "7" => { "value" => "1 year but under 2 years" },
+        "8" => { "value" => "2 years but under 3 years" },
+        "9" => { "value" => "3 years but under 4 years" },
+        "10" => { "value" => "4 years but under 5 years" },
+        "5" => { "value" => "5 years or more" },
+        "divider" => { "value" => true },
+        "6" => { "value" => "Don’t know" },
+      }.freeze
+    end
+  end
 end
diff --git a/spec/models/form/lettings/questions/waityear_spec.rb b/spec/models/form/lettings/questions/waityear_spec.rb
new file mode 100644
index 000000000..def11af8a
--- /dev/null
+++ b/spec/models/form/lettings/questions/waityear_spec.rb
@@ -0,0 +1,95 @@
+require "rails_helper"
+
+RSpec.describe Form::Lettings::Questions::Waityear, type: :model do
+  subject(:question) { described_class.new(nil, question_definition, page) }
+
+  let(:question_definition) { nil }
+  let(:page) { instance_double(Form::Page) }
+  let(:subsection) { instance_double(Form::Subsection) }
+  let(:form) { instance_double(Form) }
+
+  before do
+    allow(form).to receive(:start_year_after_2024?).and_return(false)
+    allow(page).to receive(:subsection).and_return(subsection)
+    allow(subsection).to receive(:form).and_return(form)
+  end
+
+  it "has correct page" do
+    expect(question.page).to eq(page)
+  end
+
+  it "has the correct type" do
+    expect(question.type).to eq("radio")
+  end
+
+  it "is not marked as derived" do
+    expect(question.derived?).to be false
+  end
+
+  it "has the correct check_answer_label" do
+    expect(question.check_answer_label).to eq("Length of time on local authority waiting list")
+  end
+
+  it "has the correct id" do
+    expect(question.id).to eq("waityear")
+  end
+
+  it "has the correct hint" do
+    expect(question.hint_text).to eq("")
+  end
+
+  it "has correct conditional for" do
+    expect(question.conditional_for).to be_nil
+  end
+
+  it "has the correct hidden_in_check_answers" do
+    expect(question.hidden_in_check_answers).to be_nil
+  end
+
+  it "has the correct check_answers_card_number" do
+    expect(question.check_answers_card_number).to eq(0)
+  end
+
+  context "with 2023/24 form" do
+    it "has the correct header" do
+      expect(question.header).to eq("How long has the household been on the local authority waiting list for the new letting?")
+    end
+
+    it "has the correct answer_options" do
+      expect(question.answer_options).to eq({
+        "2" => { "value" => "Less than 1 year" },
+        "7" => { "value" => "1 year but under 2 years" },
+        "8" => { "value" => "2 years but under 3 years" },
+        "9" => { "value" => "3 years but under 4 years" },
+        "10" => { "value" => "4 years but under 5 years" },
+        "5" => { "value" => "5 years or more" },
+        "divider" => { "value" => true },
+        "6" => { "value" => "Don’t know" },
+      })
+    end
+  end
+
+  context "with 2024/25 form" do
+    before do
+      allow(form).to receive(:start_year_after_2024?).and_return(true)
+    end
+
+    it "has the correct header" do
+      expect(question.header).to eq("How long has the household been on the local authority waiting list for the area of the new letting?")
+    end
+
+    it "has the correct answer_options" do
+      expect(question.answer_options).to eq({
+        "2" => { "value" => "Less than 1 year" },
+        "7" => { "value" => "1 year but under 2 years" },
+        "8" => { "value" => "2 years but under 3 years" },
+        "9" => { "value" => "3 years but under 4 years" },
+        "10" => { "value" => "4 years but under 5 years" },
+        "11" => { "value" => "5 years but under 10 years" },
+        "12" => { "value" => "10 years or more" },
+        "divider" => { "value" => true },
+        "6" => { "value" => "Don’t know" },
+      })
+    end
+  end
+end