diff --git a/config/forms/2021_2022.json b/config/forms/2021_2022.json
index 58d7227e9..9f1cc2654 100644
--- a/config/forms/2021_2022.json
+++ b/config/forms/2021_2022.json
@@ -1054,24 +1054,6 @@
           "label": "Tenancy information",
           "depends_on": { "about_this_log": "completed" },
           "pages": {
-            "joint_tenancy": {
-              "header": "",
-              "description": "",
-              "questions": {
-                "jointtenancy": {
-                  "check_answer_label": "Is this a joint tenancy?",
-                  "header": "Is this a joint tenancy?",
-                  "hint_text": "",
-                  "type": "radio",
-                  "answer_options": {
-                    "0": "Yes",
-                    "1": "No",
-                    "2": "Don't know"
-                  }
-                }
-              },
-              "depends_on": { "conditions" : ["is_22_23_log?(case_log[\"startdate\"])"] }
-            },
             "starter_tenancy": {
               "header": "",
               "description": "",
diff --git a/config/forms/2022_2023.json b/config/forms/2022_2023.json
index ab5330b31..0db95743a 100644
--- a/config/forms/2022_2023.json
+++ b/config/forms/2022_2023.json
@@ -1025,35 +1025,36 @@
           "label": "Tenancy information",
           "depends_on": {"about_this_log": "completed"},
           "pages": {
-            "starter_tenancy": {
+            "joint_tenancy": {
               "header": "",
               "description": "",
               "questions": {
-                "startertenancy": {
-                  "check_answer_label": "Is this a starter or introductory tenancy?",
-                  "header": "Is this a starter tenancy?",
+                "jointtenancy": {
+                  "check_answer_label": "Is this a joint tenancy?",
+                  "header": "Is this a joint tenancy?",
                   "hint_text": "",
                   "type": "radio",
                   "answer_options": {
                     "0": "Yes",
-                    "1": "No"
+                    "1": "No",
+                    "2": "Don't know"
                   }
                 }
               }
             },
-            "fixed_term_tenancy": {
+            "starter_tenancy": {
               "header": "",
               "description": "",
               "questions": {
-                "tenancylength": {
-                  "check_answer_label": "If the main tenancy is a fixed term tenancy, please provide the length of the fixed term (to the nearest year) excluding any starter/introductory period",
-                  "header": "If fixed-term, what is the length of the fixed-term tenancy after any starter period?",
-                  "hint_text": "To the nearest year",
-                  "type": "numeric",
-                  "min": 0,
-                  "max": 150,
-                  "step": 1,
-                  "width": 4
+                "startertenancy": {
+                  "check_answer_label": "Is this a starter or introductory tenancy?",
+                  "header": "Is this a starter tenancy?",
+                  "hint_text": "",
+                  "type": "radio",
+                  "answer_options": {
+                    "0": "Yes",
+                    "1": "No"
+                  }
                 }
               }
             },
@@ -1067,11 +1068,12 @@
                   "hint_text": "",
                   "type": "radio",
                   "answer_options": {
-                    "0": "Secure (including flexible)",
-                    "1": "Assured",
-                    "2": "Assured Shorthold",
-                    "3": "Licence agreement (almshouses only)",
-                    "4": "Other"
+                    "0": "Fixed-term - secure",
+                    "1": "Fixed-term - assured shorthold",
+                    "2": "Lifetime - secure",
+                    "3": "Lifetime - assured",
+                    "4": "Licence agreement",
+                    "5": "Other"
                   },
                   "conditional_for": {
                     "tenancyother": ["Other"]
@@ -1084,18 +1086,36 @@
                 }
               }
             },
-            "letting_provider": {
+            "fixed_term_tenancy": {
+              "header": "",
+              "description": "",
+              "questions": {
+                "tenancylength": {
+                  "check_answer_label": "If the main tenancy is a fixed term tenancy, please provide the length of the fixed term (to the nearest year) excluding any starter/introductory period",
+                  "header": "If fixed-term, what is the length of the fixed-term tenancy after any starter period?",
+                  "hint_text": "To the nearest year",
+                  "type": "numeric",
+                  "min": 0,
+                  "max": 150,
+                  "step": 1,
+                  "width": 4
+                }
+              }
+            },
+            "letting_in_sheltered_accomodation": {
               "header": "",
               "description": "",
               "questions": {
-                "landlord": {
-                  "check_answer_label": "Provider",
-                  "header": "Who is the letting provider?",
+                "lettinginshelteredaccomodation": {
+                  "check_answer_label": "Is this letting in sheltered accommodation?",
+                  "header": "Is this letting in sheltered accommodation?",
                   "hint_text": "",
                   "type": "radio",
                   "answer_options": {
-                    "0": "This landlord",
-                    "1": "Another registered provider - includes housing association or local authority"
+                    "0": "Yes - specialist retirement housing",
+                    "1": "Yes - extra care housing",
+                    "2": "No",
+                    "3": "Don't know"
                   }
                 }
               }