diff --git a/app/models/form/lettings/questions/referral.rb b/app/models/form/lettings/questions/referral.rb
index 5bf45a187..feb0082f4 100644
--- a/app/models/form/lettings/questions/referral.rb
+++ b/app/models/form/lettings/questions/referral.rb
@@ -7,49 +7,92 @@ class Form::Lettings::Questions::Referral < ::Form::Question
     @type = "radio"
     @check_answers_card_number = 0
     @hint_text = "You told us that you are a local authority and that the needs type is general needs. We have removed some options because of this."
-    @answer_options = ANSWER_OPTIONS
     @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
   end
 
-  ANSWER_OPTIONS = {
-    "1" => {
-      "value" => "Internal transfer",
-      "hint" => "Where the tenant has moved to another social property owned by the same landlord.",
-    },
-    "2" => {
-      "value" => "Tenant applied directly (no referral or nomination)",
-    },
-    "8" => {
-      "value" => "Re-located through official housing mobility scheme",
-    },
-    "10" => {
-      "value" => "Other social landlord",
-    },
-    "9" => {
-      "value" => "Community learning disability team",
-    },
-    "14" => {
-      "value" => "Community mental health team",
-    },
-    "15" => {
-      "value" => "Health service",
-    },
-    "12" => {
-      "value" => "Police, probation or prison",
-    },
-    "7" => {
-      "value" => "Voluntary agency",
-    },
-    "13" => {
-      "value" => "Youth offending team",
-    },
-    "17" => {
-      "value" => "Children’s Social Care",
-    },
-    "16" => {
-      "value" => "Other",
-    },
-  }.freeze
+  def answer_options
+    if form.start_year_after_2024?
+      {
+        "1" => {
+          "value" => "Internal transfer",
+          "hint" => "Where the tenant has moved to another social property owned by the same landlord.",
+        },
+        "2" => {
+          "value" => "Tenant applied directly (no referral or nomination)",
+        },
+        "8" => {
+          "value" => "Re-located through official housing mobility scheme",
+        },
+        "10" => {
+          "value" => "Other social landlord",
+        },
+        "9" => {
+          "value" => "Community learning disability team",
+        },
+        "14" => {
+          "value" => "Community mental health team",
+        },
+        "15" => {
+          "value" => "Health service",
+        },
+        "18" => {
+          "value" => "Police, probation, prison or youth offending team – tenant had custodial sentence",
+        },
+        "19" => {
+          "value" => "Police, probation, prison or youth offending team – no custodial sentence",
+        },
+        "7" => {
+          "value" => "Voluntary agency",
+        },
+        "17" => {
+          "value" => "Children’s Social Care",
+        },
+        "16" => {
+          "value" => "Other",
+        },
+      }.freeze
+    else
+      {
+        "1" => {
+          "value" => "Internal transfer",
+          "hint" => "Where the tenant has moved to another social property owned by the same landlord.",
+        },
+        "2" => {
+          "value" => "Tenant applied directly (no referral or nomination)",
+        },
+        "8" => {
+          "value" => "Re-located through official housing mobility scheme",
+        },
+        "10" => {
+          "value" => "Other social landlord",
+        },
+        "9" => {
+          "value" => "Community learning disability team",
+        },
+        "14" => {
+          "value" => "Community mental health team",
+        },
+        "15" => {
+          "value" => "Health service",
+        },
+        "12" => {
+          "value" => "Police, probation or prison",
+        },
+        "7" => {
+          "value" => "Voluntary agency",
+        },
+        "13" => {
+          "value" => "Youth offending team",
+        },
+        "17" => {
+          "value" => "Children’s Social Care",
+        },
+        "16" => {
+          "value" => "Other",
+        },
+      }.freeze
+    end
+  end
 
   QUESTION_NUMBER_FROM_YEAR = { 2023 => 85, 2024 => 84 }.freeze
 end
diff --git a/app/models/form/lettings/questions/referral_prp.rb b/app/models/form/lettings/questions/referral_prp.rb
index ee676e81e..c5549ce49 100644
--- a/app/models/form/lettings/questions/referral_prp.rb
+++ b/app/models/form/lettings/questions/referral_prp.rb
@@ -7,55 +7,104 @@ class Form::Lettings::Questions::ReferralPrp < ::Form::Question
     @type = "radio"
     @check_answers_card_number = 0
     @hint_text = "You told us that the needs type is general needs. We have removed some options because of this."
-    @answer_options = ANSWER_OPTIONS
     @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
   end
 
-  ANSWER_OPTIONS = {
-    "1" => {
-      "value" => "Internal transfer",
-      "hint" => "Where the tenant has moved to another social property owned by the same landlord.",
-    },
-    "2" => {
-      "value" => "Tenant applied directly (no nomination)",
-    },
-    "3" => {
-      "value" => "Nominated by a local housing authority",
-    },
-    "4" => {
-      "value" => "Referred by local authority housing department",
-    },
-    "8" => {
-      "value" => "Re-located through official housing mobility scheme",
-    },
-    "10" => {
-      "value" => "Other social landlord",
-    },
-    "9" => {
-      "value" => "Community learning disability team",
-    },
-    "14" => {
-      "value" => "Community mental health team",
-    },
-    "15" => {
-      "value" => "Health service",
-    },
-    "12" => {
-      "value" => "Police, probation or prison",
-    },
-    "7" => {
-      "value" => "Voluntary agency",
-    },
-    "13" => {
-      "value" => "Youth offending team",
-    },
-    "17" => {
-      "value" => "Children’s Social Care",
-    },
-    "16" => {
-      "value" => "Other",
-    },
-  }.freeze
+  def answer_options
+    if form.start_year_after_2024?
+      {
+        "1" => {
+          "value" => "Internal transfer",
+          "hint" => "Where the tenant has moved to another social property owned by the same landlord.",
+        },
+        "2" => {
+          "value" => "Tenant applied directly (no nomination)",
+        },
+        "3" => {
+          "value" => "Nominated by a local housing authority",
+        },
+        "4" => {
+          "value" => "Referred by local authority housing department",
+        },
+        "8" => {
+          "value" => "Re-located through official housing mobility scheme",
+        },
+        "10" => {
+          "value" => "Other social landlord",
+        },
+        "9" => {
+          "value" => "Community learning disability team",
+        },
+        "14" => {
+          "value" => "Community mental health team",
+        },
+        "15" => {
+          "value" => "Health service",
+        },
+        "18" => {
+          "value" => "Police, probation, prison or youth offending team – tenant had custodial sentence",
+        },
+        "19" => {
+          "value" => "Police, probation, prison or youth offending team – no custodial sentence",
+        },
+        "7" => {
+          "value" => "Voluntary agency",
+        },
+        "17" => {
+          "value" => "Children’s Social Care",
+        },
+        "16" => {
+          "value" => "Other",
+        },
+      }.freeze
+    else
+      {
+        "1" => {
+          "value" => "Internal transfer",
+          "hint" => "Where the tenant has moved to another social property owned by the same landlord.",
+        },
+        "2" => {
+          "value" => "Tenant applied directly (no nomination)",
+        },
+        "3" => {
+          "value" => "Nominated by a local housing authority",
+        },
+        "4" => {
+          "value" => "Referred by local authority housing department",
+        },
+        "8" => {
+          "value" => "Re-located through official housing mobility scheme",
+        },
+        "10" => {
+          "value" => "Other social landlord",
+        },
+        "9" => {
+          "value" => "Community learning disability team",
+        },
+        "14" => {
+          "value" => "Community mental health team",
+        },
+        "15" => {
+          "value" => "Health service",
+        },
+        "12" => {
+          "value" => "Police, probation or prison",
+        },
+        "7" => {
+          "value" => "Voluntary agency",
+        },
+        "13" => {
+          "value" => "Youth offending team",
+        },
+        "17" => {
+          "value" => "Children’s Social Care",
+        },
+        "16" => {
+          "value" => "Other",
+        },
+      }.freeze
+    end
+  end
 
   QUESTION_NUMBER_FROM_YEAR = { 2023 => 85, 2024 => 84 }.freeze
 end
diff --git a/app/models/form/lettings/questions/referral_supported_housing.rb b/app/models/form/lettings/questions/referral_supported_housing.rb
index a4d0403d6..642d2eb16 100644
--- a/app/models/form/lettings/questions/referral_supported_housing.rb
+++ b/app/models/form/lettings/questions/referral_supported_housing.rb
@@ -7,52 +7,98 @@ class Form::Lettings::Questions::ReferralSupportedHousing < ::Form::Question
     @type = "radio"
     @check_answers_card_number = 0
     @hint_text = "You told us that you are a local authority. We have removed some options because of this."
-    @answer_options = ANSWER_OPTIONS
     @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
   end
 
-  ANSWER_OPTIONS = {
-    "1" => {
-      "value" => "Internal transfer",
-      "hint" => "Where the tenant has moved to another social property owned by the same landlord.",
-    },
-    "2" => {
-      "value" => "Tenant applied directly (no referral)",
-    },
-    "3" => {
-      "value" => "Referred by local authority housing department",
-    },
-    "8" => {
-      "value" => "Re-located through official housing mobility scheme",
-    },
-    "10" => {
-      "value" => "Other social landlord",
-    },
-    "9" => {
-      "value" => "Community learning disability team",
-    },
-    "14" => {
-      "value" => "Community mental health team",
-    },
-    "15" => {
-      "value" => "Health service",
-    },
-    "12" => {
-      "value" => "Police, probation or prison",
-    },
-    "7" => {
-      "value" => "Voluntary agency",
-    },
-    "13" => {
-      "value" => "Youth offending team",
-    },
-    "17" => {
-      "value" => "Children’s Social Care",
-    },
-    "16" => {
-      "value" => "Other",
-    },
-  }.freeze
+  def answer_options
+    if form.start_year_after_2024?
+      {
+        "1" => {
+          "value" => "Internal transfer",
+          "hint" => "Where the tenant has moved to another social property owned by the same landlord.",
+        },
+        "2" => {
+          "value" => "Tenant applied directly (no referral)",
+        },
+        "3" => {
+          "value" => "Nominated by a local housing authority",
+        },
+        "8" => {
+          "value" => "Re-located through official housing mobility scheme",
+        },
+        "10" => {
+          "value" => "Other social landlord",
+        },
+        "9" => {
+          "value" => "Community learning disability team",
+        },
+        "14" => {
+          "value" => "Community mental health team",
+        },
+        "15" => {
+          "value" => "Health service",
+        },
+        "18" => {
+          "value" => "Police, probation, prison or youth offending team – tenant had custodial sentence",
+        },
+        "19" => {
+          "value" => "Police, probation, prison or youth offending team – no custodial sentence",
+        },
+        "7" => {
+          "value" => "Voluntary agency",
+        },
+        "17" => {
+          "value" => "Children’s Social Care",
+        },
+        "16" => {
+          "value" => "Other",
+        },
+      }.freeze
+    else
+      {
+        "1" => {
+          "value" => "Internal transfer",
+          "hint" => "Where the tenant has moved to another social property owned by the same landlord.",
+        },
+        "2" => {
+          "value" => "Tenant applied directly (no referral)",
+        },
+        "3" => {
+          "value" => "Nominated by a local housing authority",
+        },
+        "8" => {
+          "value" => "Re-located through official housing mobility scheme",
+        },
+        "10" => {
+          "value" => "Other social landlord",
+        },
+        "9" => {
+          "value" => "Community learning disability team",
+        },
+        "14" => {
+          "value" => "Community mental health team",
+        },
+        "15" => {
+          "value" => "Health service",
+        },
+        "12" => {
+          "value" => "Police, probation or prison",
+        },
+        "7" => {
+          "value" => "Voluntary agency",
+        },
+        "13" => {
+          "value" => "Youth offending team",
+        },
+        "17" => {
+          "value" => "Children’s Social Care",
+        },
+        "16" => {
+          "value" => "Other",
+        },
+      }.freeze
+    end
+  end
 
   QUESTION_NUMBER_FROM_YEAR = { 2023 => 85, 2024 => 84 }.freeze
 end
diff --git a/app/models/form/lettings/questions/referral_supported_housing_prp.rb b/app/models/form/lettings/questions/referral_supported_housing_prp.rb
index b7b937fa3..ffdd7eafb 100644
--- a/app/models/form/lettings/questions/referral_supported_housing_prp.rb
+++ b/app/models/form/lettings/questions/referral_supported_housing_prp.rb
@@ -7,26 +7,104 @@ class Form::Lettings::Questions::ReferralSupportedHousingPrp < ::Form::Question
     @type = "radio"
     @check_answers_card_number = 0
     @hint_text = ""
-    @answer_options = ANSWER_OPTIONS
     @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
   end
 
-  ANSWER_OPTIONS = {
-    "1" => { "value" => "Internal transfer", "hint" => "Where the tenant has moved to another social property owned by the same landlord." },
-    "2" => { "value" => "Tenant applied directly (no referral or nomination)" },
-    "3" => { "value" => "Nominated by a local housing authority" },
-    "4" => { "value" => "Referred by local authority housing department" },
-    "8" => { "value" => "Re-located through official housing mobility scheme" },
-    "10" => { "value" => "Other social landlord" },
-    "9" => { "value" => "Community learning disability team" },
-    "14" => { "value" => "Community mental health team" },
-    "15" => { "value" => "Health service" },
-    "12" => { "value" => "Police, probation or prison" },
-    "7" => { "value" => "Voluntary agency" },
-    "13" => { "value" => "Youth offending team" },
-    "17" => { "value" => "Children’s Social Care" },
-    "16" => { "value" => "Other" },
-  }.freeze
+  def answer_options
+    if form.start_year_after_2024?
+      {
+        "1" => {
+          "value" => "Internal transfer",
+          "hint" => "Where the tenant has moved to another social property owned by the same landlord.",
+        },
+        "2" => {
+          "value" => "Tenant applied directly (no referral or nomination)",
+        },
+        "3" => {
+          "value" => "Nominated by a local housing authority",
+        },
+        "4" => {
+          "value" => "Referred by local authority housing department",
+        },
+        "8" => {
+          "value" => "Re-located through official housing mobility scheme",
+        },
+        "10" => {
+          "value" => "Other social landlord",
+        },
+        "9" => {
+          "value" => "Community learning disability team",
+        },
+        "14" => {
+          "value" => "Community mental health team",
+        },
+        "15" => {
+          "value" => "Health service",
+        },
+        "18" => {
+          "value" => "Police, probation, prison or youth offending team – tenant had custodial sentence",
+        },
+        "19" => {
+          "value" => "Police, probation, prison or youth offending team – no custodial sentence",
+        },
+        "7" => {
+          "value" => "Voluntary agency",
+        },
+        "17" => {
+          "value" => "Children’s Social Care",
+        },
+        "16" => {
+          "value" => "Other",
+        },
+      }.freeze
+    else
+      {
+        "1" => {
+          "value" => "Internal transfer",
+          "hint" => "Where the tenant has moved to another social property owned by the same landlord.",
+        },
+        "2" => {
+          "value" => "Tenant applied directly (no referral or nomination)",
+        },
+        "3" => {
+          "value" => "Nominated by a local housing authority",
+        },
+        "4" => {
+          "value" => "Referred by local authority housing department",
+        },
+        "8" => {
+          "value" => "Re-located through official housing mobility scheme",
+        },
+        "10" => {
+          "value" => "Other social landlord",
+        },
+        "9" => {
+          "value" => "Community learning disability team",
+        },
+        "14" => {
+          "value" => "Community mental health team",
+        },
+        "15" => {
+          "value" => "Health service",
+        },
+        "12" => {
+          "value" => "Police, probation or prison",
+        },
+        "7" => {
+          "value" => "Voluntary agency",
+        },
+        "13" => {
+          "value" => "Youth offending team",
+        },
+        "17" => {
+          "value" => "Children’s Social Care",
+        },
+        "16" => {
+          "value" => "Other",
+        },
+      }.freeze
+    end
+  end
 
   QUESTION_NUMBER_FROM_YEAR = { 2023 => 85, 2024 => 84 }.freeze
 end
diff --git a/spec/models/form/lettings/questions/referral_spec.rb b/spec/models/form/lettings/questions/referral_spec.rb
new file mode 100644
index 000000000..5c7bc1735
--- /dev/null
+++ b/spec/models/form/lettings/questions/referral_spec.rb
@@ -0,0 +1,101 @@
+require "rails_helper"
+
+RSpec.describe Form::Lettings::Questions::Referral, type: :model do
+  subject(:question) { described_class.new(question_id, question_definition, page) }
+
+  let(:question_id) { nil }
+  let(:question_definition) { nil }
+  let(:page) { instance_double(Form::Page) }
+  let(:subsection) { instance_double(Form::Subsection) }
+  let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1)) }
+
+  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 id" do
+    expect(question.id).to eq("referral")
+  end
+
+  it "has the correct header" do
+    expect(question.header).to eq("What was the source of referral for this letting?")
+  end
+
+  it "has the correct check_answer_label" do
+    expect(question.check_answer_label).to eq("Source of referral for letting")
+  end
+
+  it "has the correct type" do
+    expect(question.type).to eq("radio")
+  end
+
+  it "has the correct check_answers_card_number" do
+    expect(question.check_answers_card_number).to eq(0)
+  end
+
+  it "has the correct hint" do
+    expect(question.hint_text).to eq("You told us that you are a local authority and that the needs type is general needs. We have removed some options because of this.")
+  end
+
+  it "is not marked as derived" do
+    expect(question).not_to be_derived(nil)
+  end
+
+  context "with 2023/24 form" do
+    it "has the correct answer_options" do
+      expect(question.answer_options).to eq({
+        "1" => { "value" => "Internal transfer", "hint" => "Where the tenant has moved to another social property owned by the same landlord." },
+        "2" => { "value" => "Tenant applied directly (no referral or nomination)" },
+        "8" => { "value" => "Re-located through official housing mobility scheme" },
+        "10" => { "value" => "Other social landlord" },
+        "9" => { "value" => "Community learning disability team" },
+        "14" => { "value" => "Community mental health team" },
+        "15" => { "value" => "Health service" },
+        "12" => { "value" => "Police, probation or prison" },
+        "7" => { "value" => "Voluntary agency" },
+        "13" => { "value" => "Youth offending team" },
+        "17" => { "value" => "Children’s Social Care" },
+        "16" => { "value" => "Other" },
+      })
+    end
+
+    it "has the correct question number" do
+      expect(question.question_number).to eq(85)
+    end
+  end
+
+  context "with 2024/25 form" do
+    let(:form) { instance_double(Form, start_date: Time.zone.local(2024, 4, 1)) }
+
+    before do
+      allow(form).to receive(:start_year_after_2024?).and_return(true)
+    end
+
+    it "has the correct answer_options" do
+      expect(question.answer_options).to eq({
+        "1" => { "value" => "Internal transfer", "hint" => "Where the tenant has moved to another social property owned by the same landlord." },
+        "2" => { "value" => "Tenant applied directly (no referral or nomination)" },
+        "8" => { "value" => "Re-located through official housing mobility scheme" },
+        "10" => { "value" => "Other social landlord" },
+        "9" => { "value" => "Community learning disability team" },
+        "14" => { "value" => "Community mental health team" },
+        "15" => { "value" => "Health service" },
+        "18" => { "value" => "Police, probation, prison or youth offending team – tenant had custodial sentence" },
+        "19" => { "value" => "Police, probation, prison or youth offending team – no custodial sentence" },
+        "7" => { "value" => "Voluntary agency" },
+        "17" => { "value" => "Children’s Social Care" },
+        "16" => { "value" => "Other" },
+      })
+    end
+
+    it "has the correct question number" do
+      expect(question.question_number).to eq(84)
+    end
+  end
+end