diff --git a/app/constants/db_enums.rb b/app/constants/db_enums.rb
index 23e4b4bd4..d28393105 100644
--- a/app/constants/db_enums.rb
+++ b/app/constants/db_enums.rb
@@ -166,11 +166,10 @@ module DbEnums
 
   def self.tenancy
     {
-      "Fixed term – Secure" => 1,
-      "Fixed term – Assured Shorthold Tenancy (AST)" => 4,
-      "Lifetime – Secure" => 100,
-      "Lifetime – Assured" => 2,
-      "License agreement" => 5,
+      "Secure (including flexible)" => 1,
+      "Assured" => 2,
+      "Assured Shorthold" => 4,
+      "Licence agreement (almshouses only)" => 5,
       "Other" => 3,
     }
   end
diff --git a/config/forms/2021_2022.json b/config/forms/2021_2022.json
index 859e5fa14..7433f4d7b 100644
--- a/config/forms/2021_2022.json
+++ b/config/forms/2021_2022.json
@@ -1068,12 +1068,11 @@
                   "hint_text": "",
                   "type": "radio",
                   "answer_options": {
-                    "0": "Fixed term – Secure",
-                    "1": "Fixed term – Assured Shorthold Tenancy (AST)",
-                    "2": "Lifetime – Secure",
-                    "3": "Lifetime – Assured",
-                    "4": "License agreement",
-                    "5": "Other"
+                    "0": "Secure (including flexible)",
+                    "1": "Assured",
+                    "2": "Assured Shorthold",
+                    "3": "Licence agreement (almshouses only)",
+                    "4": "Other"
                   },
                   "conditional_for": {
                     "other_tenancy_type": ["Other"]