diff --git a/app/controllers/bulk_upload_lettings_logs_controller.rb b/app/controllers/bulk_upload_lettings_logs_controller.rb
index 9b37cd2b5..ec5975432 100644
--- a/app/controllers/bulk_upload_lettings_logs_controller.rb
+++ b/app/controllers/bulk_upload_lettings_logs_controller.rb
@@ -33,6 +33,8 @@ private
   end
 
   def in_crossover_period?
+    return true if FeatureToggle.force_crossover?
+
     FormHandler.instance.lettings_in_crossover_period?
   end
 
diff --git a/app/models/forms/bulk_upload_lettings/prepare_your_file.rb b/app/models/forms/bulk_upload_lettings/prepare_your_file.rb
index bfaa622b2..68b9dd5c6 100644
--- a/app/models/forms/bulk_upload_lettings/prepare_your_file.rb
+++ b/app/models/forms/bulk_upload_lettings/prepare_your_file.rb
@@ -44,6 +44,8 @@ module Forms
     private
 
       def in_crossover_period?
+        return true if FeatureToggle.force_crossover?
+
         FormHandler.instance.lettings_in_crossover_period?
       end
     end
diff --git a/app/models/forms/bulk_upload_lettings/year.rb b/app/models/forms/bulk_upload_lettings/year.rb
index 80324e53e..d958f27d4 100644
--- a/app/models/forms/bulk_upload_lettings/year.rb
+++ b/app/models/forms/bulk_upload_lettings/year.rb
@@ -34,7 +34,10 @@ module Forms
     private
 
       def possible_years
-        [FormHandler.instance.lettings_forms["current_lettings"].start_date.year, FormHandler.instance.lettings_forms["previous_lettings"].start_date.year]
+        [
+          FormHandler.instance.lettings_forms["next_lettings"].start_date.year,
+          FormHandler.instance.lettings_forms["current_lettings"].start_date.year,
+        ]
       end
     end
   end
diff --git a/config/initializers/feature_toggle.rb b/config/initializers/feature_toggle.rb
index 4fc402212..0253bcc41 100644
--- a/config/initializers/feature_toggle.rb
+++ b/config/initializers/feature_toggle.rb
@@ -40,6 +40,12 @@ class FeatureToggle
     !Rails.env.development?
   end
 
+  def self.force_crossover?
+    return false if Rails.env.test?
+
+    !Rails.env.production?
+  end
+
   def self.validate_valid_radio_options?
     !(Rails.env.production? || Rails.env.staging?)
   end
diff --git a/spec/models/forms/bulk_upload_lettings/year_spec.rb b/spec/models/forms/bulk_upload_lettings/year_spec.rb
index 0b0babb30..ebb65e517 100644
--- a/spec/models/forms/bulk_upload_lettings/year_spec.rb
+++ b/spec/models/forms/bulk_upload_lettings/year_spec.rb
@@ -5,8 +5,8 @@ RSpec.describe Forms::BulkUploadLettings::Year do
 
   describe "#options" do
     it "returns correct years" do
-      expect(form.options.map(&:id)).to eql([2022, 2021])
-      expect(form.options.map(&:name)).to eql(%w[2022/2023 2021/2022])
+      expect(form.options.map(&:id)).to eql([2023, 2022])
+      expect(form.options.map(&:name)).to eql(%w[2023/2024 2022/2023])
     end
   end
 end