diff --git a/json-definitions/v3/tech-record/enums/vehicleConfigurationHgvPsv.enum.json b/json-definitions/v3/tech-record/enums/vehicleConfigurationHgvPsv.enum.json
new file mode 100644
index 00000000..e360a9ae
--- /dev/null
+++ b/json-definitions/v3/tech-record/enums/vehicleConfigurationHgvPsv.enum.json
@@ -0,0 +1,12 @@
+{
+    "title": "Vehicle Configuration",
+    "type": "string",
+    "tsEnumNames": [
+      "RIGID",
+      "ARTICULATED"
+    ],
+    "enum": [
+        "rigid",
+        "articulated"
+    ]
+  }
\ No newline at end of file
diff --git a/json-definitions/v3/tech-record/enums/vehicleConfiguration.ignore.json b/json-definitions/v3/tech-record/enums/vehicleConfigurationLightVehicle.enum.json
similarity index 54%
rename from json-definitions/v3/tech-record/enums/vehicleConfiguration.ignore.json
rename to json-definitions/v3/tech-record/enums/vehicleConfigurationLightVehicle.enum.json
index d2da5bcf..b8963a8a 100644
--- a/json-definitions/v3/tech-record/enums/vehicleConfiguration.ignore.json
+++ b/json-definitions/v3/tech-record/enums/vehicleConfigurationLightVehicle.enum.json
@@ -1,6 +1,20 @@
 {
   "title": "Vehicle Configuration",
   "type": "string",
+  "tsEnumNames": [
+    "RIGID",
+    "ARTICULATED",
+    "CENTRE_AXLE_DRAWBAR",
+    "SEMI_CAR_TRANSPORTER",
+    "SEMI_TRAILER",
+    "LONG_SEMI_TRAILER",
+    "LOW_LOADER",
+    "OTHER",
+    "DRAWBAR",
+    "FOUR_IN_LINE",
+    "DOLLY",
+    "FULL_DRAWBAR"
+  ],
   "enum": [
     "rigid",
     "articulated",
diff --git a/json-definitions/v3/tech-record/enums/vehicleConfigurationTrl.enum.json b/json-definitions/v3/tech-record/enums/vehicleConfigurationTrl.enum.json
new file mode 100644
index 00000000..d54ac619
--- /dev/null
+++ b/json-definitions/v3/tech-record/enums/vehicleConfigurationTrl.enum.json
@@ -0,0 +1,28 @@
+{
+    "title": "Vehicle Configuration",
+    "type": "string",
+    "tsEnumNames": [
+        "CENTRE_AXLE_DRAWBAR",
+        "SEMI_CAR_TRANSPORTER",
+        "SEMI_TRAILER",
+        "LONG_SEMI_TRAILER",
+        "LOW_LOADER",
+        "OTHER",
+        "DRAWBAR",
+        "FOUR_IN_LINE",
+        "DOLLY",
+        "FULL_DRAWBAR"
+      ],
+    "enum": [
+      "centre axle drawbar",
+      "semi-car transporter",
+      "semi-trailer",
+      "long semi-trailer",
+      "low loader",
+      "other",
+      "drawbar",
+      "four-in-line",
+      "dolly",
+      "full drawbar"
+    ]
+  }
\ No newline at end of file
diff --git a/json-definitions/v3/tech-record/get/car/complete/index.json b/json-definitions/v3/tech-record/get/car/complete/index.json
index 0a7cc0bb..587d697e 100644
--- a/json-definitions/v3/tech-record/get/car/complete/index.json
+++ b/json-definitions/v3/tech-record/get/car/complete/index.json
@@ -170,7 +170,7 @@
           "type": "null"
         },
         {
-          "$ref": "../../../enums/vehicleConfiguration.ignore.json"
+          "$ref": "../../../enums/vehicleConfigurationLightVehicle.enum.json"
         }
       ]
     },
diff --git a/json-definitions/v3/tech-record/get/car/skeleton/index.json b/json-definitions/v3/tech-record/get/car/skeleton/index.json
index 7e4c94bb..b471afe9 100644
--- a/json-definitions/v3/tech-record/get/car/skeleton/index.json
+++ b/json-definitions/v3/tech-record/get/car/skeleton/index.json
@@ -167,7 +167,7 @@
           "type": "null"
         },
         {
-          "$ref": "../../../enums/vehicleConfiguration.ignore.json"
+          "$ref": "../../../enums/vehicleConfigurationLightVehicle.enum.json"
         }
       ]
     },
diff --git a/json-definitions/v3/tech-record/get/hgv/complete/index.json b/json-definitions/v3/tech-record/get/hgv/complete/index.json
index 4a4450cd..4e793b0e 100644
--- a/json-definitions/v3/tech-record/get/hgv/complete/index.json
+++ b/json-definitions/v3/tech-record/get/hgv/complete/index.json
@@ -836,7 +836,7 @@
     "techRecord_vehicleConfiguration": {
       "anyOf": [
         {
-          "$ref": "../../../enums/vehicleConfiguration.ignore.json"
+          "$ref": "../../../enums/vehicleConfigurationHgvPsv.enum.json"
         }
       ]
     },
diff --git a/json-definitions/v3/tech-record/get/hgv/skeleton/index.json b/json-definitions/v3/tech-record/get/hgv/skeleton/index.json
index fbb753d2..710a0e27 100644
--- a/json-definitions/v3/tech-record/get/hgv/skeleton/index.json
+++ b/json-definitions/v3/tech-record/get/hgv/skeleton/index.json
@@ -911,7 +911,7 @@
     "techRecord_vehicleConfiguration": {
       "anyOf": [
         {
-          "$ref": "../../../enums/vehicleConfiguration.ignore.json"
+          "$ref": "../../../enums/vehicleConfigurationHgvPsv.enum.json"
         },
         {
           "type": "null"
diff --git a/json-definitions/v3/tech-record/get/hgv/testable/index.json b/json-definitions/v3/tech-record/get/hgv/testable/index.json
index 64abd464..08cea3a4 100644
--- a/json-definitions/v3/tech-record/get/hgv/testable/index.json
+++ b/json-definitions/v3/tech-record/get/hgv/testable/index.json
@@ -905,7 +905,7 @@
     "techRecord_vehicleConfiguration": {
       "anyOf": [
         {
-          "$ref": "../../../enums/vehicleConfiguration.ignore.json"
+          "$ref": "../../../enums/vehicleConfigurationHgvPsv.enum.json"
         }
       ]
     },
diff --git a/json-definitions/v3/tech-record/get/lgv/complete/index.json b/json-definitions/v3/tech-record/get/lgv/complete/index.json
index ceff5e07..c78eeb7d 100644
--- a/json-definitions/v3/tech-record/get/lgv/complete/index.json
+++ b/json-definitions/v3/tech-record/get/lgv/complete/index.json
@@ -170,7 +170,7 @@
       ]
     },
     "techRecord_vehicleConfiguration": {
-      "$ref": "../../../enums/vehicleConfiguration.ignore.json"
+      "$ref": "../../../enums/vehicleConfigurationLightVehicle.enum.json"
     },
     "techRecord_vehicleType": {
       "const": "lgv"
diff --git a/json-definitions/v3/tech-record/get/lgv/skeleton/index.json b/json-definitions/v3/tech-record/get/lgv/skeleton/index.json
index 696cba17..7146f932 100644
--- a/json-definitions/v3/tech-record/get/lgv/skeleton/index.json
+++ b/json-definitions/v3/tech-record/get/lgv/skeleton/index.json
@@ -175,7 +175,7 @@
           "type": "null"
         },
         {
-          "$ref": "../../../enums/vehicleConfiguration.ignore.json"
+          "$ref": "../../../enums/vehicleConfigurationLightVehicle.enum.json"
         }
       ]
     },
diff --git a/json-definitions/v3/tech-record/get/motorcycle/complete/index.json b/json-definitions/v3/tech-record/get/motorcycle/complete/index.json
index 183a97c0..3bb63197 100644
--- a/json-definitions/v3/tech-record/get/motorcycle/complete/index.json
+++ b/json-definitions/v3/tech-record/get/motorcycle/complete/index.json
@@ -191,7 +191,7 @@
       "type": "string"
     },
     "techRecord_vehicleConfiguration": {
-      "$ref": "../../../enums/vehicleConfiguration.ignore.json"
+      "$ref": "../../../enums/vehicleConfigurationLightVehicle.enum.json"
     },  
     "techRecord_vehicleType": {
       "const": "motorcycle"
diff --git a/json-definitions/v3/tech-record/get/motorcycle/skeleton/index.json b/json-definitions/v3/tech-record/get/motorcycle/skeleton/index.json
index 8f34fb92..2156f6c0 100644
--- a/json-definitions/v3/tech-record/get/motorcycle/skeleton/index.json
+++ b/json-definitions/v3/tech-record/get/motorcycle/skeleton/index.json
@@ -188,7 +188,7 @@
           "type": "null"
         },
         {
-          "$ref": "../../../enums/vehicleConfiguration.ignore.json"
+          "$ref": "../../../enums/vehicleConfigurationLightVehicle.enum.json"
         }
       ]
     },
diff --git a/json-definitions/v3/tech-record/get/psv/complete/index.json b/json-definitions/v3/tech-record/get/psv/complete/index.json
index 17684178..e88d598c 100644
--- a/json-definitions/v3/tech-record/get/psv/complete/index.json
+++ b/json-definitions/v3/tech-record/get/psv/complete/index.json
@@ -81,7 +81,7 @@
       "type": "string"
     },
     "techRecord_vehicleConfiguration": {
-      "$ref": "../../../enums/vehicleConfiguration.ignore.json"
+      "$ref": "../../../enums/vehicleConfigurationHgvPsv.enum.json"
     },
     "techRecord_vehicleSize": {
       "$ref": "../../../enums/vehicleSize.ignore.json"
diff --git a/json-definitions/v3/tech-record/get/psv/skeleton/index.json b/json-definitions/v3/tech-record/get/psv/skeleton/index.json
index 120cb105..361c4ada 100644
--- a/json-definitions/v3/tech-record/get/psv/skeleton/index.json
+++ b/json-definitions/v3/tech-record/get/psv/skeleton/index.json
@@ -51,7 +51,7 @@
     "techRecord_vehicleConfiguration": {
       "anyOf": [
         {
-          "$ref": "../../../enums/vehicleConfiguration.ignore.json"
+          "$ref": "../../../enums/vehicleConfigurationHgvPsv.enum.json"
         },
         {
           "type": "null"
diff --git a/json-definitions/v3/tech-record/get/psv/testable/index.json b/json-definitions/v3/tech-record/get/psv/testable/index.json
index 551a7eaf..1d07657d 100644
--- a/json-definitions/v3/tech-record/get/psv/testable/index.json
+++ b/json-definitions/v3/tech-record/get/psv/testable/index.json
@@ -52,7 +52,7 @@
       "type": "string"
     },
     "techRecord_vehicleConfiguration": {
-      "$ref": "../../../enums/vehicleConfiguration.ignore.json"
+      "$ref": "../../../enums/vehicleConfigurationHgvPsv.enum.json"
     },
     "techRecord_vehicleSize": {
       "$ref": "../../../enums/vehicleSize.ignore.json"
diff --git a/json-definitions/v3/tech-record/get/small trl/complete/index.json b/json-definitions/v3/tech-record/get/small trl/complete/index.json
index 278ec085..356b37f3 100644
--- a/json-definitions/v3/tech-record/get/small trl/complete/index.json	
+++ b/json-definitions/v3/tech-record/get/small trl/complete/index.json	
@@ -132,7 +132,7 @@
             "$ref": "../../../enums/vehicleClassDescription.enum.json"
         },
         "techRecord_vehicleConfiguration": {
-            "$ref": "../../../enums/vehicleConfiguration.ignore.json"
+            "$ref": "../../../enums/vehicleConfigurationLightVehicle.enum.json"
         },
         "techRecord_vehicleSubclass": {
             "$ref": "../../../enums/vehicleSubclass.ignore.json"
diff --git a/json-definitions/v3/tech-record/get/small trl/skeleton/index.json b/json-definitions/v3/tech-record/get/small trl/skeleton/index.json
index 94b1e37b..10163362 100644
--- a/json-definitions/v3/tech-record/get/small trl/skeleton/index.json	
+++ b/json-definitions/v3/tech-record/get/small trl/skeleton/index.json	
@@ -138,7 +138,7 @@
                     "type": "null"
                 },
                 {
-                    "$ref": "../../../enums/vehicleConfiguration.ignore.json"
+                    "$ref": "../../../enums/vehicleConfigurationLightVehicle.enum.json"
                 }
             ]
         },
diff --git a/json-definitions/v3/tech-record/get/trl/complete/index.json b/json-definitions/v3/tech-record/get/trl/complete/index.json
index 35b7bc01..c5378d84 100644
--- a/json-definitions/v3/tech-record/get/trl/complete/index.json
+++ b/json-definitions/v3/tech-record/get/trl/complete/index.json
@@ -929,7 +929,7 @@
       "const": "trailer"
     },
     "techRecord_vehicleConfiguration": {
-      "$ref": "../../../enums/vehicleConfiguration.ignore.json"
+      "$ref": "../../../enums/vehicleConfigurationTrl.enum.json"
     },
     "techRecord_vehicleType": {
       "const": "trl"
diff --git a/json-definitions/v3/tech-record/get/trl/skeleton/index.json b/json-definitions/v3/tech-record/get/trl/skeleton/index.json
index 29906750..717fdef0 100644
--- a/json-definitions/v3/tech-record/get/trl/skeleton/index.json
+++ b/json-definitions/v3/tech-record/get/trl/skeleton/index.json
@@ -1109,7 +1109,7 @@
     "techRecord_vehicleConfiguration": {
       "anyOf": [
         {
-          "$ref": "../../../enums/vehicleConfiguration.ignore.json"
+          "$ref": "../../../enums/vehicleConfigurationTrl.enum.json"
         },
         {
           "type": "null"
diff --git a/json-definitions/v3/tech-record/get/trl/testable/index.json b/json-definitions/v3/tech-record/get/trl/testable/index.json
index 9de82e75..c80ac42d 100644
--- a/json-definitions/v3/tech-record/get/trl/testable/index.json
+++ b/json-definitions/v3/tech-record/get/trl/testable/index.json
@@ -966,7 +966,7 @@
     "techRecord_vehicleConfiguration": {
       "anyOf": [
         {
-          "$ref": "../../../enums/vehicleConfiguration.ignore.json"
+          "$ref": "../../../enums/vehicleConfigurationTrl.enum.json"
         }
       ]
     },
diff --git a/json-definitions/v3/tech-record/put/car/complete/index.json b/json-definitions/v3/tech-record/put/car/complete/index.json
index 3eb739e9..a7a541f6 100644
--- a/json-definitions/v3/tech-record/put/car/complete/index.json
+++ b/json-definitions/v3/tech-record/put/car/complete/index.json
@@ -73,7 +73,7 @@
       }
     },
     "techRecord_vehicleConfiguration": {
-      "$ref": "../../../enums/vehicleConfiguration.ignore.json"
+      "$ref": "../../../enums/vehicleConfigurationLightVehicle.enum.json"
     },
     "techRecord_euVehicleCategory": {
       "anyOf": [
diff --git a/json-definitions/v3/tech-record/put/car/skeleton/index.json b/json-definitions/v3/tech-record/put/car/skeleton/index.json
index 352d31d4..a4440a26 100644
--- a/json-definitions/v3/tech-record/put/car/skeleton/index.json
+++ b/json-definitions/v3/tech-record/put/car/skeleton/index.json
@@ -78,7 +78,7 @@
           "type": "null"
         },
         {
-          "$ref": "../../../enums/vehicleConfiguration.ignore.json"
+          "$ref": "../../../enums/vehicleConfigurationLightVehicle.enum.json"
         }
       ]
     },
diff --git a/json-definitions/v3/tech-record/put/hgv/complete/index.json b/json-definitions/v3/tech-record/put/hgv/complete/index.json
index 9db11e1d..1b7e9cab 100644
--- a/json-definitions/v3/tech-record/put/hgv/complete/index.json
+++ b/json-definitions/v3/tech-record/put/hgv/complete/index.json
@@ -800,7 +800,7 @@
     "techRecord_vehicleConfiguration": {
       "anyOf": [
         {
-          "$ref": "../../../enums/vehicleConfiguration.ignore.json"
+          "$ref": "../../../enums/vehicleConfigurationHgvPsv.enum.json"
         }
       ]
     },
diff --git a/json-definitions/v3/tech-record/put/hgv/skeleton/index.json b/json-definitions/v3/tech-record/put/hgv/skeleton/index.json
index c891f9e7..1c60ba25 100644
--- a/json-definitions/v3/tech-record/put/hgv/skeleton/index.json
+++ b/json-definitions/v3/tech-record/put/hgv/skeleton/index.json
@@ -870,7 +870,7 @@
     "techRecord_vehicleConfiguration": {
       "anyOf": [
         {
-          "$ref": "../../../enums/vehicleConfiguration.ignore.json"
+          "$ref": "../../../enums/vehicleConfigurationHgvPsv.enum.json"
         },
         {
           "type": "null"
diff --git a/json-definitions/v3/tech-record/put/hgv/testable/index.json b/json-definitions/v3/tech-record/put/hgv/testable/index.json
index 0ab91a0c..824d7a92 100644
--- a/json-definitions/v3/tech-record/put/hgv/testable/index.json
+++ b/json-definitions/v3/tech-record/put/hgv/testable/index.json
@@ -856,7 +856,7 @@
     "techRecord_vehicleConfiguration": {
       "anyOf": [
         {
-          "$ref": "../../../enums/vehicleConfiguration.ignore.json"
+          "$ref": "../../../enums/vehicleConfigurationHgvPsv.enum.json"
         }
       ]
     },
diff --git a/json-definitions/v3/tech-record/put/lgv/complete/index.json b/json-definitions/v3/tech-record/put/lgv/complete/index.json
index b6a2de2a..cda2a702 100644
--- a/json-definitions/v3/tech-record/put/lgv/complete/index.json
+++ b/json-definitions/v3/tech-record/put/lgv/complete/index.json
@@ -97,21 +97,10 @@
       }
     },
     "techRecord_vehicleConfiguration": {
-      "title": "Vehicle Configuration",
-      "type": "string",
-      "enum": [
-        "rigid",
-        "articulated",
-        "centre axle drawbar",
-        "semi-car transporter",
-        "semi-trailer",
-        "long semi-trailer",
-        "low loader",
-        "other",
-        "drawbar",
-        "four-in-line",
-        "dolly",
-        "full drawbar"
+      "anyOf": [
+        {
+          "$ref": "../../../enums/vehicleConfigurationLightVehicle.enum.json"
+        }
       ]
     }
   }
diff --git a/json-definitions/v3/tech-record/put/lgv/skeleton/index.json b/json-definitions/v3/tech-record/put/lgv/skeleton/index.json
index 7c70b556..d709a66b 100644
--- a/json-definitions/v3/tech-record/put/lgv/skeleton/index.json
+++ b/json-definitions/v3/tech-record/put/lgv/skeleton/index.json
@@ -129,29 +129,14 @@
       "$ref": "../../../enums/vehicleSubclass.ignore.json"
     },
     "techRecord_vehicleConfiguration": {
-			"anyOf": [
-				{
-					"type": "null"
-				},
-				{
-					"title": "Vehicle Configuration",
-					"type": "string",
-					"enum": [
-						"rigid",
-						"articulated",
-						"centre axle drawbar",
-						"semi-car transporter",
-						"semi-trailer",
-						"long semi-trailer",
-						"low loader",
-						"other",
-						"drawbar",
-						"four-in-line",
-						"dolly",
-						"full drawbar"
-					]
-				}
-			]
-		}
+      "anyOf": [
+        {
+          "type": "null"
+        },
+        {
+          "$ref": "../../../enums/vehicleConfigurationLightVehicle.enum.json"
+        }
+      ]
+    }
   }
-}
+}
\ No newline at end of file
diff --git a/json-definitions/v3/tech-record/put/motorcycle/complete/index.json b/json-definitions/v3/tech-record/put/motorcycle/complete/index.json
index b86726b3..ac8336d1 100644
--- a/json-definitions/v3/tech-record/put/motorcycle/complete/index.json
+++ b/json-definitions/v3/tech-record/put/motorcycle/complete/index.json
@@ -145,7 +145,7 @@
       "$ref": "../../../enums/vehicleClassDescription.enum.json"
     },
     "techRecord_vehicleConfiguration": {
-      "$ref": "../../../enums/vehicleConfiguration.ignore.json"
+      "$ref": "../../../enums/vehicleConfigurationLightVehicle.enum.json"
     },
     "techRecord_vehicleType": {
       "const": "motorcycle"
diff --git a/json-definitions/v3/tech-record/put/motorcycle/skeleton/index.json b/json-definitions/v3/tech-record/put/motorcycle/skeleton/index.json
index 293c5b39..f534b11e 100644
--- a/json-definitions/v3/tech-record/put/motorcycle/skeleton/index.json
+++ b/json-definitions/v3/tech-record/put/motorcycle/skeleton/index.json
@@ -145,7 +145,7 @@
           "type": "null"
         },
         {
-          "$ref": "../../../enums/vehicleConfiguration.ignore.json"
+          "$ref": "../../../enums/vehicleConfigurationLightVehicle.enum.json"
         }
       ]
     },
diff --git a/json-definitions/v3/tech-record/put/psv/complete/index.json b/json-definitions/v3/tech-record/put/psv/complete/index.json
index fa4278b1..6e8e1ed5 100644
--- a/json-definitions/v3/tech-record/put/psv/complete/index.json
+++ b/json-definitions/v3/tech-record/put/psv/complete/index.json
@@ -66,7 +66,7 @@
       "type": "string"
     },
     "techRecord_vehicleConfiguration": {
-      "$ref": "../../../enums/vehicleConfiguration.ignore.json"
+      "$ref": "../../../enums/vehicleConfigurationHgvPsv.enum.json"
     },
     "techRecord_vehicleSize": {
       "$ref": "../../../enums/vehicleSize.ignore.json"
diff --git a/json-definitions/v3/tech-record/put/psv/skeleton/index.json b/json-definitions/v3/tech-record/put/psv/skeleton/index.json
index 8ac55695..5aa52cff 100644
--- a/json-definitions/v3/tech-record/put/psv/skeleton/index.json
+++ b/json-definitions/v3/tech-record/put/psv/skeleton/index.json
@@ -48,7 +48,7 @@
     "techRecord_vehicleConfiguration": {
       "anyOf": [
         {
-          "$ref": "../../../enums/vehicleConfiguration.ignore.json"
+          "$ref": "../../../enums/vehicleConfigurationHgvPsv.enum.json"
         },
         {
           "type": "null"
diff --git a/json-definitions/v3/tech-record/put/psv/testable/index.json b/json-definitions/v3/tech-record/put/psv/testable/index.json
index d8bab983..b2f610e1 100644
--- a/json-definitions/v3/tech-record/put/psv/testable/index.json
+++ b/json-definitions/v3/tech-record/put/psv/testable/index.json
@@ -47,7 +47,7 @@
       "type": "string"
     },
     "techRecord_vehicleConfiguration": {
-      "$ref": "../../../enums/vehicleConfiguration.ignore.json"
+      "$ref": "../../../enums/vehicleConfigurationHgvPsv.enum.json"
     },
     "techRecord_vehicleSize": {
       "$ref": "../../../enums/vehicleSize.ignore.json"
diff --git a/json-definitions/v3/tech-record/put/small trl/complete/index.json b/json-definitions/v3/tech-record/put/small trl/complete/index.json
index 6c355d46..12cae654 100644
--- a/json-definitions/v3/tech-record/put/small trl/complete/index.json	
+++ b/json-definitions/v3/tech-record/put/small trl/complete/index.json	
@@ -96,7 +96,7 @@
             "$ref": "../../../enums/vehicleClassDescription.enum.json"
         },
         "techRecord_vehicleConfiguration": {
-            "$ref": "../../../enums/vehicleConfiguration.ignore.json"
+            "$ref": "../../../enums/vehicleConfigurationLightVehicle.enum.json"
         },
         "techRecord_vehicleSubclass": {
             "anyOf": [
diff --git a/json-definitions/v3/tech-record/put/small trl/skeleton/index.json b/json-definitions/v3/tech-record/put/small trl/skeleton/index.json
index db0ce616..5c44c7d6 100644
--- a/json-definitions/v3/tech-record/put/small trl/skeleton/index.json	
+++ b/json-definitions/v3/tech-record/put/small trl/skeleton/index.json	
@@ -106,7 +106,7 @@
                     "type": "null"
                 },
                 {
-                    "$ref": "../../../enums/vehicleConfiguration.ignore.json"
+                    "$ref": "../../../enums/vehicleConfigurationLightVehicle.enum.json"
                 }
             ]
         },
diff --git a/json-definitions/v3/tech-record/put/trl/complete/index.json b/json-definitions/v3/tech-record/put/trl/complete/index.json
index 40213e12..7bbe6676 100644
--- a/json-definitions/v3/tech-record/put/trl/complete/index.json
+++ b/json-definitions/v3/tech-record/put/trl/complete/index.json
@@ -877,7 +877,7 @@
       "const": "trailer"
     },
     "techRecord_vehicleConfiguration": {
-      "$ref": "../../../enums/vehicleConfiguration.ignore.json"
+      "$ref": "../../../enums/vehicleConfigurationTrl.enum.json"
     },
     "techRecord_vehicleType": {
       "const": "trl"
diff --git a/json-definitions/v3/tech-record/put/trl/skeleton/index.json b/json-definitions/v3/tech-record/put/trl/skeleton/index.json
index 7fe2c66a..fddd394d 100644
--- a/json-definitions/v3/tech-record/put/trl/skeleton/index.json
+++ b/json-definitions/v3/tech-record/put/trl/skeleton/index.json
@@ -851,7 +851,7 @@
     "techRecord_vehicleConfiguration": {
       "anyOf": [
         {
-          "$ref": "../../../enums/vehicleConfiguration.ignore.json"
+          "$ref": "../../../enums/vehicleConfigurationTrl.enum.json"
         },
         {
           "type": "null"
diff --git a/json-definitions/v3/tech-record/put/trl/testable/index.json b/json-definitions/v3/tech-record/put/trl/testable/index.json
index f1f78e56..4fb7dabb 100644
--- a/json-definitions/v3/tech-record/put/trl/testable/index.json
+++ b/json-definitions/v3/tech-record/put/trl/testable/index.json
@@ -932,7 +932,7 @@
       "const": "trailer"
     },
     "techRecord_vehicleConfiguration": {
-      "$ref": "../../../enums/vehicleConfiguration.ignore.json"
+      "$ref": "../../../enums/vehicleConfigurationTrl.enum.json"
     },
     "techRecord_vehicleType": {
       "const": "trl"
diff --git a/json-schemas/v3/tech-record/enums/vehicleConfigurationHgvPsv.enum.json b/json-schemas/v3/tech-record/enums/vehicleConfigurationHgvPsv.enum.json
new file mode 100644
index 00000000..00ea1af0
--- /dev/null
+++ b/json-schemas/v3/tech-record/enums/vehicleConfigurationHgvPsv.enum.json
@@ -0,0 +1,12 @@
+{
+	"title": "Vehicle Configuration",
+	"type": "string",
+	"tsEnumNames": [
+		"RIGID",
+		"ARTICULATED"
+	],
+	"enum": [
+		"rigid",
+		"articulated"
+	]
+}
\ No newline at end of file
diff --git a/json-schemas/v3/tech-record/enums/vehicleConfigurationLightVehicle.enum.json b/json-schemas/v3/tech-record/enums/vehicleConfigurationLightVehicle.enum.json
new file mode 100644
index 00000000..4da2e880
--- /dev/null
+++ b/json-schemas/v3/tech-record/enums/vehicleConfigurationLightVehicle.enum.json
@@ -0,0 +1,32 @@
+{
+	"title": "Vehicle Configuration",
+	"type": "string",
+	"tsEnumNames": [
+		"RIGID",
+		"ARTICULATED",
+		"CENTRE_AXLE_DRAWBAR",
+		"SEMI_CAR_TRANSPORTER",
+		"SEMI_TRAILER",
+		"LONG_SEMI_TRAILER",
+		"LOW_LOADER",
+		"OTHER",
+		"DRAWBAR",
+		"FOUR_IN_LINE",
+		"DOLLY",
+		"FULL_DRAWBAR"
+	],
+	"enum": [
+		"rigid",
+		"articulated",
+		"centre axle drawbar",
+		"semi-car transporter",
+		"semi-trailer",
+		"long semi-trailer",
+		"low loader",
+		"other",
+		"drawbar",
+		"four-in-line",
+		"dolly",
+		"full drawbar"
+	]
+}
\ No newline at end of file
diff --git a/json-schemas/v3/tech-record/enums/vehicleConfigurationTrl.enum.json b/json-schemas/v3/tech-record/enums/vehicleConfigurationTrl.enum.json
new file mode 100644
index 00000000..afb03371
--- /dev/null
+++ b/json-schemas/v3/tech-record/enums/vehicleConfigurationTrl.enum.json
@@ -0,0 +1,28 @@
+{
+	"title": "Vehicle Configuration",
+	"type": "string",
+	"tsEnumNames": [
+		"CENTRE_AXLE_DRAWBAR",
+		"SEMI_CAR_TRANSPORTER",
+		"SEMI_TRAILER",
+		"LONG_SEMI_TRAILER",
+		"LOW_LOADER",
+		"OTHER",
+		"DRAWBAR",
+		"FOUR_IN_LINE",
+		"DOLLY",
+		"FULL_DRAWBAR"
+	],
+	"enum": [
+		"centre axle drawbar",
+		"semi-car transporter",
+		"semi-trailer",
+		"long semi-trailer",
+		"low loader",
+		"other",
+		"drawbar",
+		"four-in-line",
+		"dolly",
+		"full drawbar"
+	]
+}
\ No newline at end of file
diff --git a/json-schemas/v3/tech-record/get/car/complete/index.json b/json-schemas/v3/tech-record/get/car/complete/index.json
index fb037073..579e7d05 100644
--- a/json-schemas/v3/tech-record/get/car/complete/index.json
+++ b/json-schemas/v3/tech-record/get/car/complete/index.json
@@ -219,6 +219,20 @@
 				{
 					"title": "Vehicle Configuration",
 					"type": "string",
+					"tsEnumNames": [
+						"RIGID",
+						"ARTICULATED",
+						"CENTRE_AXLE_DRAWBAR",
+						"SEMI_CAR_TRANSPORTER",
+						"SEMI_TRAILER",
+						"LONG_SEMI_TRAILER",
+						"LOW_LOADER",
+						"OTHER",
+						"DRAWBAR",
+						"FOUR_IN_LINE",
+						"DOLLY",
+						"FULL_DRAWBAR"
+					],
 					"enum": [
 						"rigid",
 						"articulated",
diff --git a/json-schemas/v3/tech-record/get/car/skeleton/index.json b/json-schemas/v3/tech-record/get/car/skeleton/index.json
index 048d3ef3..8d6cd0f4 100644
--- a/json-schemas/v3/tech-record/get/car/skeleton/index.json
+++ b/json-schemas/v3/tech-record/get/car/skeleton/index.json
@@ -216,6 +216,20 @@
 				{
 					"title": "Vehicle Configuration",
 					"type": "string",
+					"tsEnumNames": [
+						"RIGID",
+						"ARTICULATED",
+						"CENTRE_AXLE_DRAWBAR",
+						"SEMI_CAR_TRANSPORTER",
+						"SEMI_TRAILER",
+						"LONG_SEMI_TRAILER",
+						"LOW_LOADER",
+						"OTHER",
+						"DRAWBAR",
+						"FOUR_IN_LINE",
+						"DOLLY",
+						"FULL_DRAWBAR"
+					],
 					"enum": [
 						"rigid",
 						"articulated",
diff --git a/json-schemas/v3/tech-record/get/hgv/complete/index.json b/json-schemas/v3/tech-record/get/hgv/complete/index.json
index ea920569..30c8b5b0 100644
--- a/json-schemas/v3/tech-record/get/hgv/complete/index.json
+++ b/json-schemas/v3/tech-record/get/hgv/complete/index.json
@@ -958,19 +958,13 @@
 				{
 					"title": "Vehicle Configuration",
 					"type": "string",
+					"tsEnumNames": [
+						"RIGID",
+						"ARTICULATED"
+					],
 					"enum": [
 						"rigid",
-						"articulated",
-						"centre axle drawbar",
-						"semi-car transporter",
-						"semi-trailer",
-						"long semi-trailer",
-						"low loader",
-						"other",
-						"drawbar",
-						"four-in-line",
-						"dolly",
-						"full drawbar"
+						"articulated"
 					]
 				}
 			]
diff --git a/json-schemas/v3/tech-record/get/hgv/skeleton/index.json b/json-schemas/v3/tech-record/get/hgv/skeleton/index.json
index 11eb1c55..ab20360d 100644
--- a/json-schemas/v3/tech-record/get/hgv/skeleton/index.json
+++ b/json-schemas/v3/tech-record/get/hgv/skeleton/index.json
@@ -1033,19 +1033,13 @@
 				{
 					"title": "Vehicle Configuration",
 					"type": "string",
+					"tsEnumNames": [
+						"RIGID",
+						"ARTICULATED"
+					],
 					"enum": [
 						"rigid",
-						"articulated",
-						"centre axle drawbar",
-						"semi-car transporter",
-						"semi-trailer",
-						"long semi-trailer",
-						"low loader",
-						"other",
-						"drawbar",
-						"four-in-line",
-						"dolly",
-						"full drawbar"
+						"articulated"
 					]
 				},
 				{
diff --git a/json-schemas/v3/tech-record/get/hgv/testable/index.json b/json-schemas/v3/tech-record/get/hgv/testable/index.json
index 2d5e250f..f11d9651 100644
--- a/json-schemas/v3/tech-record/get/hgv/testable/index.json
+++ b/json-schemas/v3/tech-record/get/hgv/testable/index.json
@@ -1027,19 +1027,13 @@
 				{
 					"title": "Vehicle Configuration",
 					"type": "string",
+					"tsEnumNames": [
+						"RIGID",
+						"ARTICULATED"
+					],
 					"enum": [
 						"rigid",
-						"articulated",
-						"centre axle drawbar",
-						"semi-car transporter",
-						"semi-trailer",
-						"long semi-trailer",
-						"low loader",
-						"other",
-						"drawbar",
-						"four-in-line",
-						"dolly",
-						"full drawbar"
+						"articulated"
 					]
 				}
 			]
diff --git a/json-schemas/v3/tech-record/get/lgv/complete/index.json b/json-schemas/v3/tech-record/get/lgv/complete/index.json
index 1f4332a3..e1982d63 100644
--- a/json-schemas/v3/tech-record/get/lgv/complete/index.json
+++ b/json-schemas/v3/tech-record/get/lgv/complete/index.json
@@ -219,6 +219,20 @@
 		"techRecord_vehicleConfiguration": {
 			"title": "Vehicle Configuration",
 			"type": "string",
+			"tsEnumNames": [
+				"RIGID",
+				"ARTICULATED",
+				"CENTRE_AXLE_DRAWBAR",
+				"SEMI_CAR_TRANSPORTER",
+				"SEMI_TRAILER",
+				"LONG_SEMI_TRAILER",
+				"LOW_LOADER",
+				"OTHER",
+				"DRAWBAR",
+				"FOUR_IN_LINE",
+				"DOLLY",
+				"FULL_DRAWBAR"
+			],
 			"enum": [
 				"rigid",
 				"articulated",
diff --git a/json-schemas/v3/tech-record/get/lgv/skeleton/index.json b/json-schemas/v3/tech-record/get/lgv/skeleton/index.json
index 23220d10..9fe5183e 100644
--- a/json-schemas/v3/tech-record/get/lgv/skeleton/index.json
+++ b/json-schemas/v3/tech-record/get/lgv/skeleton/index.json
@@ -224,6 +224,20 @@
 				{
 					"title": "Vehicle Configuration",
 					"type": "string",
+					"tsEnumNames": [
+						"RIGID",
+						"ARTICULATED",
+						"CENTRE_AXLE_DRAWBAR",
+						"SEMI_CAR_TRANSPORTER",
+						"SEMI_TRAILER",
+						"LONG_SEMI_TRAILER",
+						"LOW_LOADER",
+						"OTHER",
+						"DRAWBAR",
+						"FOUR_IN_LINE",
+						"DOLLY",
+						"FULL_DRAWBAR"
+					],
 					"enum": [
 						"rigid",
 						"articulated",
diff --git a/json-schemas/v3/tech-record/get/motorcycle/complete/index.json b/json-schemas/v3/tech-record/get/motorcycle/complete/index.json
index fd05a291..6cebcf81 100644
--- a/json-schemas/v3/tech-record/get/motorcycle/complete/index.json
+++ b/json-schemas/v3/tech-record/get/motorcycle/complete/index.json
@@ -267,6 +267,20 @@
 		"techRecord_vehicleConfiguration": {
 			"title": "Vehicle Configuration",
 			"type": "string",
+			"tsEnumNames": [
+				"RIGID",
+				"ARTICULATED",
+				"CENTRE_AXLE_DRAWBAR",
+				"SEMI_CAR_TRANSPORTER",
+				"SEMI_TRAILER",
+				"LONG_SEMI_TRAILER",
+				"LOW_LOADER",
+				"OTHER",
+				"DRAWBAR",
+				"FOUR_IN_LINE",
+				"DOLLY",
+				"FULL_DRAWBAR"
+			],
 			"enum": [
 				"rigid",
 				"articulated",
diff --git a/json-schemas/v3/tech-record/get/motorcycle/skeleton/index.json b/json-schemas/v3/tech-record/get/motorcycle/skeleton/index.json
index 857bf738..53475f52 100644
--- a/json-schemas/v3/tech-record/get/motorcycle/skeleton/index.json
+++ b/json-schemas/v3/tech-record/get/motorcycle/skeleton/index.json
@@ -264,6 +264,20 @@
 				{
 					"title": "Vehicle Configuration",
 					"type": "string",
+					"tsEnumNames": [
+						"RIGID",
+						"ARTICULATED",
+						"CENTRE_AXLE_DRAWBAR",
+						"SEMI_CAR_TRANSPORTER",
+						"SEMI_TRAILER",
+						"LONG_SEMI_TRAILER",
+						"LOW_LOADER",
+						"OTHER",
+						"DRAWBAR",
+						"FOUR_IN_LINE",
+						"DOLLY",
+						"FULL_DRAWBAR"
+					],
 					"enum": [
 						"rigid",
 						"articulated",
diff --git a/json-schemas/v3/tech-record/get/psv/complete/index.json b/json-schemas/v3/tech-record/get/psv/complete/index.json
index 8f1a3c2e..3a7def90 100644
--- a/json-schemas/v3/tech-record/get/psv/complete/index.json
+++ b/json-schemas/v3/tech-record/get/psv/complete/index.json
@@ -89,19 +89,13 @@
 		"techRecord_vehicleConfiguration": {
 			"title": "Vehicle Configuration",
 			"type": "string",
+			"tsEnumNames": [
+				"RIGID",
+				"ARTICULATED"
+			],
 			"enum": [
 				"rigid",
-				"articulated",
-				"centre axle drawbar",
-				"semi-car transporter",
-				"semi-trailer",
-				"long semi-trailer",
-				"low loader",
-				"other",
-				"drawbar",
-				"four-in-line",
-				"dolly",
-				"full drawbar"
+				"articulated"
 			]
 		},
 		"techRecord_vehicleSize": {
diff --git a/json-schemas/v3/tech-record/get/psv/skeleton/index.json b/json-schemas/v3/tech-record/get/psv/skeleton/index.json
index 7d955555..42b6aacb 100644
--- a/json-schemas/v3/tech-record/get/psv/skeleton/index.json
+++ b/json-schemas/v3/tech-record/get/psv/skeleton/index.json
@@ -59,19 +59,13 @@
 				{
 					"title": "Vehicle Configuration",
 					"type": "string",
+					"tsEnumNames": [
+						"RIGID",
+						"ARTICULATED"
+					],
 					"enum": [
 						"rigid",
-						"articulated",
-						"centre axle drawbar",
-						"semi-car transporter",
-						"semi-trailer",
-						"long semi-trailer",
-						"low loader",
-						"other",
-						"drawbar",
-						"four-in-line",
-						"dolly",
-						"full drawbar"
+						"articulated"
 					]
 				},
 				{
diff --git a/json-schemas/v3/tech-record/get/psv/testable/index.json b/json-schemas/v3/tech-record/get/psv/testable/index.json
index 64bb6400..e5e6d982 100644
--- a/json-schemas/v3/tech-record/get/psv/testable/index.json
+++ b/json-schemas/v3/tech-record/get/psv/testable/index.json
@@ -60,19 +60,13 @@
 		"techRecord_vehicleConfiguration": {
 			"title": "Vehicle Configuration",
 			"type": "string",
+			"tsEnumNames": [
+				"RIGID",
+				"ARTICULATED"
+			],
 			"enum": [
 				"rigid",
-				"articulated",
-				"centre axle drawbar",
-				"semi-car transporter",
-				"semi-trailer",
-				"long semi-trailer",
-				"low loader",
-				"other",
-				"drawbar",
-				"four-in-line",
-				"dolly",
-				"full drawbar"
+				"articulated"
 			]
 		},
 		"techRecord_vehicleSize": {
diff --git a/json-schemas/v3/tech-record/get/small trl/complete/index.json b/json-schemas/v3/tech-record/get/small trl/complete/index.json
index 49d32cf8..bc24ba05 100644
--- a/json-schemas/v3/tech-record/get/small trl/complete/index.json	
+++ b/json-schemas/v3/tech-record/get/small trl/complete/index.json	
@@ -167,6 +167,20 @@
 		"techRecord_vehicleConfiguration": {
 			"title": "Vehicle Configuration",
 			"type": "string",
+			"tsEnumNames": [
+				"RIGID",
+				"ARTICULATED",
+				"CENTRE_AXLE_DRAWBAR",
+				"SEMI_CAR_TRANSPORTER",
+				"SEMI_TRAILER",
+				"LONG_SEMI_TRAILER",
+				"LOW_LOADER",
+				"OTHER",
+				"DRAWBAR",
+				"FOUR_IN_LINE",
+				"DOLLY",
+				"FULL_DRAWBAR"
+			],
 			"enum": [
 				"rigid",
 				"articulated",
diff --git a/json-schemas/v3/tech-record/get/small trl/skeleton/index.json b/json-schemas/v3/tech-record/get/small trl/skeleton/index.json
index 93d27c23..d2514515 100644
--- a/json-schemas/v3/tech-record/get/small trl/skeleton/index.json	
+++ b/json-schemas/v3/tech-record/get/small trl/skeleton/index.json	
@@ -173,6 +173,20 @@
 				{
 					"title": "Vehicle Configuration",
 					"type": "string",
+					"tsEnumNames": [
+						"RIGID",
+						"ARTICULATED",
+						"CENTRE_AXLE_DRAWBAR",
+						"SEMI_CAR_TRANSPORTER",
+						"SEMI_TRAILER",
+						"LONG_SEMI_TRAILER",
+						"LOW_LOADER",
+						"OTHER",
+						"DRAWBAR",
+						"FOUR_IN_LINE",
+						"DOLLY",
+						"FULL_DRAWBAR"
+					],
 					"enum": [
 						"rigid",
 						"articulated",
diff --git a/json-schemas/v3/tech-record/get/trl/complete/index.json b/json-schemas/v3/tech-record/get/trl/complete/index.json
index 05dc3b1c..95c74163 100644
--- a/json-schemas/v3/tech-record/get/trl/complete/index.json
+++ b/json-schemas/v3/tech-record/get/trl/complete/index.json
@@ -1128,9 +1128,19 @@
 		"techRecord_vehicleConfiguration": {
 			"title": "Vehicle Configuration",
 			"type": "string",
+			"tsEnumNames": [
+				"CENTRE_AXLE_DRAWBAR",
+				"SEMI_CAR_TRANSPORTER",
+				"SEMI_TRAILER",
+				"LONG_SEMI_TRAILER",
+				"LOW_LOADER",
+				"OTHER",
+				"DRAWBAR",
+				"FOUR_IN_LINE",
+				"DOLLY",
+				"FULL_DRAWBAR"
+			],
 			"enum": [
-				"rigid",
-				"articulated",
 				"centre axle drawbar",
 				"semi-car transporter",
 				"semi-trailer",
diff --git a/json-schemas/v3/tech-record/get/trl/skeleton/index.json b/json-schemas/v3/tech-record/get/trl/skeleton/index.json
index 86d3dccf..b7749bd1 100644
--- a/json-schemas/v3/tech-record/get/trl/skeleton/index.json
+++ b/json-schemas/v3/tech-record/get/trl/skeleton/index.json
@@ -1331,9 +1331,19 @@
 				{
 					"title": "Vehicle Configuration",
 					"type": "string",
+					"tsEnumNames": [
+						"CENTRE_AXLE_DRAWBAR",
+						"SEMI_CAR_TRANSPORTER",
+						"SEMI_TRAILER",
+						"LONG_SEMI_TRAILER",
+						"LOW_LOADER",
+						"OTHER",
+						"DRAWBAR",
+						"FOUR_IN_LINE",
+						"DOLLY",
+						"FULL_DRAWBAR"
+					],
 					"enum": [
-						"rigid",
-						"articulated",
 						"centre axle drawbar",
 						"semi-car transporter",
 						"semi-trailer",
diff --git a/json-schemas/v3/tech-record/get/trl/testable/index.json b/json-schemas/v3/tech-record/get/trl/testable/index.json
index da0e4e48..526b7c1d 100644
--- a/json-schemas/v3/tech-record/get/trl/testable/index.json
+++ b/json-schemas/v3/tech-record/get/trl/testable/index.json
@@ -1165,9 +1165,19 @@
 				{
 					"title": "Vehicle Configuration",
 					"type": "string",
+					"tsEnumNames": [
+						"CENTRE_AXLE_DRAWBAR",
+						"SEMI_CAR_TRANSPORTER",
+						"SEMI_TRAILER",
+						"LONG_SEMI_TRAILER",
+						"LOW_LOADER",
+						"OTHER",
+						"DRAWBAR",
+						"FOUR_IN_LINE",
+						"DOLLY",
+						"FULL_DRAWBAR"
+					],
 					"enum": [
-						"rigid",
-						"articulated",
 						"centre axle drawbar",
 						"semi-car transporter",
 						"semi-trailer",
diff --git a/json-schemas/v3/tech-record/put/car/complete/index.json b/json-schemas/v3/tech-record/put/car/complete/index.json
index d3135bf1..bd38f826 100644
--- a/json-schemas/v3/tech-record/put/car/complete/index.json
+++ b/json-schemas/v3/tech-record/put/car/complete/index.json
@@ -98,6 +98,20 @@
 		"techRecord_vehicleConfiguration": {
 			"title": "Vehicle Configuration",
 			"type": "string",
+			"tsEnumNames": [
+				"RIGID",
+				"ARTICULATED",
+				"CENTRE_AXLE_DRAWBAR",
+				"SEMI_CAR_TRANSPORTER",
+				"SEMI_TRAILER",
+				"LONG_SEMI_TRAILER",
+				"LOW_LOADER",
+				"OTHER",
+				"DRAWBAR",
+				"FOUR_IN_LINE",
+				"DOLLY",
+				"FULL_DRAWBAR"
+			],
 			"enum": [
 				"rigid",
 				"articulated",
diff --git a/json-schemas/v3/tech-record/put/car/skeleton/index.json b/json-schemas/v3/tech-record/put/car/skeleton/index.json
index 5959d059..cde832bf 100644
--- a/json-schemas/v3/tech-record/put/car/skeleton/index.json
+++ b/json-schemas/v3/tech-record/put/car/skeleton/index.json
@@ -103,6 +103,20 @@
 				{
 					"title": "Vehicle Configuration",
 					"type": "string",
+					"tsEnumNames": [
+						"RIGID",
+						"ARTICULATED",
+						"CENTRE_AXLE_DRAWBAR",
+						"SEMI_CAR_TRANSPORTER",
+						"SEMI_TRAILER",
+						"LONG_SEMI_TRAILER",
+						"LOW_LOADER",
+						"OTHER",
+						"DRAWBAR",
+						"FOUR_IN_LINE",
+						"DOLLY",
+						"FULL_DRAWBAR"
+					],
 					"enum": [
 						"rigid",
 						"articulated",
diff --git a/json-schemas/v3/tech-record/put/hgv/complete/index.json b/json-schemas/v3/tech-record/put/hgv/complete/index.json
index 0e0ba84e..da84c073 100644
--- a/json-schemas/v3/tech-record/put/hgv/complete/index.json
+++ b/json-schemas/v3/tech-record/put/hgv/complete/index.json
@@ -922,19 +922,13 @@
 				{
 					"title": "Vehicle Configuration",
 					"type": "string",
+					"tsEnumNames": [
+						"RIGID",
+						"ARTICULATED"
+					],
 					"enum": [
 						"rigid",
-						"articulated",
-						"centre axle drawbar",
-						"semi-car transporter",
-						"semi-trailer",
-						"long semi-trailer",
-						"low loader",
-						"other",
-						"drawbar",
-						"four-in-line",
-						"dolly",
-						"full drawbar"
+						"articulated"
 					]
 				}
 			]
diff --git a/json-schemas/v3/tech-record/put/hgv/skeleton/index.json b/json-schemas/v3/tech-record/put/hgv/skeleton/index.json
index 0967d4ae..22467140 100644
--- a/json-schemas/v3/tech-record/put/hgv/skeleton/index.json
+++ b/json-schemas/v3/tech-record/put/hgv/skeleton/index.json
@@ -992,19 +992,13 @@
 				{
 					"title": "Vehicle Configuration",
 					"type": "string",
+					"tsEnumNames": [
+						"RIGID",
+						"ARTICULATED"
+					],
 					"enum": [
 						"rigid",
-						"articulated",
-						"centre axle drawbar",
-						"semi-car transporter",
-						"semi-trailer",
-						"long semi-trailer",
-						"low loader",
-						"other",
-						"drawbar",
-						"four-in-line",
-						"dolly",
-						"full drawbar"
+						"articulated"
 					]
 				},
 				{
diff --git a/json-schemas/v3/tech-record/put/hgv/testable/index.json b/json-schemas/v3/tech-record/put/hgv/testable/index.json
index 6ab0626b..eef0b8d8 100644
--- a/json-schemas/v3/tech-record/put/hgv/testable/index.json
+++ b/json-schemas/v3/tech-record/put/hgv/testable/index.json
@@ -978,19 +978,13 @@
 				{
 					"title": "Vehicle Configuration",
 					"type": "string",
+					"tsEnumNames": [
+						"RIGID",
+						"ARTICULATED"
+					],
 					"enum": [
 						"rigid",
-						"articulated",
-						"centre axle drawbar",
-						"semi-car transporter",
-						"semi-trailer",
-						"long semi-trailer",
-						"low loader",
-						"other",
-						"drawbar",
-						"four-in-line",
-						"dolly",
-						"full drawbar"
+						"articulated"
 					]
 				}
 			]
diff --git a/json-schemas/v3/tech-record/put/lgv/complete/index.json b/json-schemas/v3/tech-record/put/lgv/complete/index.json
index 636d40e0..f6968a60 100644
--- a/json-schemas/v3/tech-record/put/lgv/complete/index.json
+++ b/json-schemas/v3/tech-record/put/lgv/complete/index.json
@@ -191,21 +191,39 @@
 			}
 		},
 		"techRecord_vehicleConfiguration": {
-			"title": "Vehicle Configuration",
-			"type": "string",
-			"enum": [
-				"rigid",
-				"articulated",
-				"centre axle drawbar",
-				"semi-car transporter",
-				"semi-trailer",
-				"long semi-trailer",
-				"low loader",
-				"other",
-				"drawbar",
-				"four-in-line",
-				"dolly",
-				"full drawbar"
+			"anyOf": [
+				{
+					"title": "Vehicle Configuration",
+					"type": "string",
+					"tsEnumNames": [
+						"RIGID",
+						"ARTICULATED",
+						"CENTRE_AXLE_DRAWBAR",
+						"SEMI_CAR_TRANSPORTER",
+						"SEMI_TRAILER",
+						"LONG_SEMI_TRAILER",
+						"LOW_LOADER",
+						"OTHER",
+						"DRAWBAR",
+						"FOUR_IN_LINE",
+						"DOLLY",
+						"FULL_DRAWBAR"
+					],
+					"enum": [
+						"rigid",
+						"articulated",
+						"centre axle drawbar",
+						"semi-car transporter",
+						"semi-trailer",
+						"long semi-trailer",
+						"low loader",
+						"other",
+						"drawbar",
+						"four-in-line",
+						"dolly",
+						"full drawbar"
+					]
+				}
 			]
 		}
 	}
diff --git a/json-schemas/v3/tech-record/put/lgv/skeleton/index.json b/json-schemas/v3/tech-record/put/lgv/skeleton/index.json
index 426f65e6..2c6020ce 100644
--- a/json-schemas/v3/tech-record/put/lgv/skeleton/index.json
+++ b/json-schemas/v3/tech-record/put/lgv/skeleton/index.json
@@ -200,6 +200,20 @@
 				{
 					"title": "Vehicle Configuration",
 					"type": "string",
+					"tsEnumNames": [
+						"RIGID",
+						"ARTICULATED",
+						"CENTRE_AXLE_DRAWBAR",
+						"SEMI_CAR_TRANSPORTER",
+						"SEMI_TRAILER",
+						"LONG_SEMI_TRAILER",
+						"LOW_LOADER",
+						"OTHER",
+						"DRAWBAR",
+						"FOUR_IN_LINE",
+						"DOLLY",
+						"FULL_DRAWBAR"
+					],
 					"enum": [
 						"rigid",
 						"articulated",
diff --git a/json-schemas/v3/tech-record/put/motorcycle/complete/index.json b/json-schemas/v3/tech-record/put/motorcycle/complete/index.json
index 3677e74d..54e33ff4 100644
--- a/json-schemas/v3/tech-record/put/motorcycle/complete/index.json
+++ b/json-schemas/v3/tech-record/put/motorcycle/complete/index.json
@@ -221,6 +221,20 @@
 		"techRecord_vehicleConfiguration": {
 			"title": "Vehicle Configuration",
 			"type": "string",
+			"tsEnumNames": [
+				"RIGID",
+				"ARTICULATED",
+				"CENTRE_AXLE_DRAWBAR",
+				"SEMI_CAR_TRANSPORTER",
+				"SEMI_TRAILER",
+				"LONG_SEMI_TRAILER",
+				"LOW_LOADER",
+				"OTHER",
+				"DRAWBAR",
+				"FOUR_IN_LINE",
+				"DOLLY",
+				"FULL_DRAWBAR"
+			],
 			"enum": [
 				"rigid",
 				"articulated",
diff --git a/json-schemas/v3/tech-record/put/motorcycle/skeleton/index.json b/json-schemas/v3/tech-record/put/motorcycle/skeleton/index.json
index 6b6de83b..0647b1ba 100644
--- a/json-schemas/v3/tech-record/put/motorcycle/skeleton/index.json
+++ b/json-schemas/v3/tech-record/put/motorcycle/skeleton/index.json
@@ -221,6 +221,20 @@
 				{
 					"title": "Vehicle Configuration",
 					"type": "string",
+					"tsEnumNames": [
+						"RIGID",
+						"ARTICULATED",
+						"CENTRE_AXLE_DRAWBAR",
+						"SEMI_CAR_TRANSPORTER",
+						"SEMI_TRAILER",
+						"LONG_SEMI_TRAILER",
+						"LOW_LOADER",
+						"OTHER",
+						"DRAWBAR",
+						"FOUR_IN_LINE",
+						"DOLLY",
+						"FULL_DRAWBAR"
+					],
 					"enum": [
 						"rigid",
 						"articulated",
diff --git a/json-schemas/v3/tech-record/put/psv/complete/index.json b/json-schemas/v3/tech-record/put/psv/complete/index.json
index e9d5fe9a..18b8770b 100644
--- a/json-schemas/v3/tech-record/put/psv/complete/index.json
+++ b/json-schemas/v3/tech-record/put/psv/complete/index.json
@@ -74,19 +74,13 @@
 		"techRecord_vehicleConfiguration": {
 			"title": "Vehicle Configuration",
 			"type": "string",
+			"tsEnumNames": [
+				"RIGID",
+				"ARTICULATED"
+			],
 			"enum": [
 				"rigid",
-				"articulated",
-				"centre axle drawbar",
-				"semi-car transporter",
-				"semi-trailer",
-				"long semi-trailer",
-				"low loader",
-				"other",
-				"drawbar",
-				"four-in-line",
-				"dolly",
-				"full drawbar"
+				"articulated"
 			]
 		},
 		"techRecord_vehicleSize": {
diff --git a/json-schemas/v3/tech-record/put/psv/skeleton/index.json b/json-schemas/v3/tech-record/put/psv/skeleton/index.json
index b7ee16c8..e26f0ac8 100644
--- a/json-schemas/v3/tech-record/put/psv/skeleton/index.json
+++ b/json-schemas/v3/tech-record/put/psv/skeleton/index.json
@@ -56,19 +56,13 @@
 				{
 					"title": "Vehicle Configuration",
 					"type": "string",
+					"tsEnumNames": [
+						"RIGID",
+						"ARTICULATED"
+					],
 					"enum": [
 						"rigid",
-						"articulated",
-						"centre axle drawbar",
-						"semi-car transporter",
-						"semi-trailer",
-						"long semi-trailer",
-						"low loader",
-						"other",
-						"drawbar",
-						"four-in-line",
-						"dolly",
-						"full drawbar"
+						"articulated"
 					]
 				},
 				{
diff --git a/json-schemas/v3/tech-record/put/psv/testable/index.json b/json-schemas/v3/tech-record/put/psv/testable/index.json
index 90753c57..2d63e21a 100644
--- a/json-schemas/v3/tech-record/put/psv/testable/index.json
+++ b/json-schemas/v3/tech-record/put/psv/testable/index.json
@@ -55,19 +55,13 @@
 		"techRecord_vehicleConfiguration": {
 			"title": "Vehicle Configuration",
 			"type": "string",
+			"tsEnumNames": [
+				"RIGID",
+				"ARTICULATED"
+			],
 			"enum": [
 				"rigid",
-				"articulated",
-				"centre axle drawbar",
-				"semi-car transporter",
-				"semi-trailer",
-				"long semi-trailer",
-				"low loader",
-				"other",
-				"drawbar",
-				"four-in-line",
-				"dolly",
-				"full drawbar"
+				"articulated"
 			]
 		},
 		"techRecord_vehicleSize": {
diff --git a/json-schemas/v3/tech-record/put/small trl/complete/index.json b/json-schemas/v3/tech-record/put/small trl/complete/index.json
index 405a2554..45efb2d8 100644
--- a/json-schemas/v3/tech-record/put/small trl/complete/index.json	
+++ b/json-schemas/v3/tech-record/put/small trl/complete/index.json	
@@ -131,6 +131,20 @@
 		"techRecord_vehicleConfiguration": {
 			"title": "Vehicle Configuration",
 			"type": "string",
+			"tsEnumNames": [
+				"RIGID",
+				"ARTICULATED",
+				"CENTRE_AXLE_DRAWBAR",
+				"SEMI_CAR_TRANSPORTER",
+				"SEMI_TRAILER",
+				"LONG_SEMI_TRAILER",
+				"LOW_LOADER",
+				"OTHER",
+				"DRAWBAR",
+				"FOUR_IN_LINE",
+				"DOLLY",
+				"FULL_DRAWBAR"
+			],
 			"enum": [
 				"rigid",
 				"articulated",
diff --git a/json-schemas/v3/tech-record/put/small trl/skeleton/index.json b/json-schemas/v3/tech-record/put/small trl/skeleton/index.json
index 481930de..33397004 100644
--- a/json-schemas/v3/tech-record/put/small trl/skeleton/index.json	
+++ b/json-schemas/v3/tech-record/put/small trl/skeleton/index.json	
@@ -141,6 +141,20 @@
 				{
 					"title": "Vehicle Configuration",
 					"type": "string",
+					"tsEnumNames": [
+						"RIGID",
+						"ARTICULATED",
+						"CENTRE_AXLE_DRAWBAR",
+						"SEMI_CAR_TRANSPORTER",
+						"SEMI_TRAILER",
+						"LONG_SEMI_TRAILER",
+						"LOW_LOADER",
+						"OTHER",
+						"DRAWBAR",
+						"FOUR_IN_LINE",
+						"DOLLY",
+						"FULL_DRAWBAR"
+					],
 					"enum": [
 						"rigid",
 						"articulated",
diff --git a/json-schemas/v3/tech-record/put/trl/complete/index.json b/json-schemas/v3/tech-record/put/trl/complete/index.json
index a7cc4536..12b8edf0 100644
--- a/json-schemas/v3/tech-record/put/trl/complete/index.json
+++ b/json-schemas/v3/tech-record/put/trl/complete/index.json
@@ -1076,9 +1076,19 @@
 		"techRecord_vehicleConfiguration": {
 			"title": "Vehicle Configuration",
 			"type": "string",
+			"tsEnumNames": [
+				"CENTRE_AXLE_DRAWBAR",
+				"SEMI_CAR_TRANSPORTER",
+				"SEMI_TRAILER",
+				"LONG_SEMI_TRAILER",
+				"LOW_LOADER",
+				"OTHER",
+				"DRAWBAR",
+				"FOUR_IN_LINE",
+				"DOLLY",
+				"FULL_DRAWBAR"
+			],
 			"enum": [
-				"rigid",
-				"articulated",
 				"centre axle drawbar",
 				"semi-car transporter",
 				"semi-trailer",
diff --git a/json-schemas/v3/tech-record/put/trl/skeleton/index.json b/json-schemas/v3/tech-record/put/trl/skeleton/index.json
index 1db39882..31060da2 100644
--- a/json-schemas/v3/tech-record/put/trl/skeleton/index.json
+++ b/json-schemas/v3/tech-record/put/trl/skeleton/index.json
@@ -1050,9 +1050,19 @@
 				{
 					"title": "Vehicle Configuration",
 					"type": "string",
+					"tsEnumNames": [
+						"CENTRE_AXLE_DRAWBAR",
+						"SEMI_CAR_TRANSPORTER",
+						"SEMI_TRAILER",
+						"LONG_SEMI_TRAILER",
+						"LOW_LOADER",
+						"OTHER",
+						"DRAWBAR",
+						"FOUR_IN_LINE",
+						"DOLLY",
+						"FULL_DRAWBAR"
+					],
 					"enum": [
-						"rigid",
-						"articulated",
 						"centre axle drawbar",
 						"semi-car transporter",
 						"semi-trailer",
diff --git a/json-schemas/v3/tech-record/put/trl/testable/index.json b/json-schemas/v3/tech-record/put/trl/testable/index.json
index 8b344c6b..b05c65b5 100644
--- a/json-schemas/v3/tech-record/put/trl/testable/index.json
+++ b/json-schemas/v3/tech-record/put/trl/testable/index.json
@@ -1131,9 +1131,19 @@
 		"techRecord_vehicleConfiguration": {
 			"title": "Vehicle Configuration",
 			"type": "string",
+			"tsEnumNames": [
+				"CENTRE_AXLE_DRAWBAR",
+				"SEMI_CAR_TRANSPORTER",
+				"SEMI_TRAILER",
+				"LONG_SEMI_TRAILER",
+				"LOW_LOADER",
+				"OTHER",
+				"DRAWBAR",
+				"FOUR_IN_LINE",
+				"DOLLY",
+				"FULL_DRAWBAR"
+			],
 			"enum": [
-				"rigid",
-				"articulated",
 				"centre axle drawbar",
 				"semi-car transporter",
 				"semi-trailer",
diff --git a/schemas.ts b/schemas.ts
index 742f6ea1..4901aaf0 100644
--- a/schemas.ts
+++ b/schemas.ts
@@ -22,6 +22,9 @@ export const schemas = [
   "v3/tech-record/enums/tyreUseCodeTrl.enum.json",
   "v3/tech-record/enums/vehicleClassDescription.enum.json",
   "v3/tech-record/enums/vehicleClassDescriptionPSV.enum.json",
+  "v3/tech-record/enums/vehicleConfigurationHgvPsv.enum.json",
+  "v3/tech-record/enums/vehicleConfigurationLightVehicle.enum.json",
+  "v3/tech-record/enums/vehicleConfigurationTrl.enum.json",
   "v3/tech-record/get/car/complete/index.json",
   "v3/tech-record/get/car/skeleton/index.json",
   "v3/tech-record/get/hgv/complete/index.json",
diff --git a/tests/resources/data/trlSkeleton.json b/tests/resources/data/trlSkeleton.json
index 605eeff1..e65b2a32 100644
--- a/tests/resources/data/trlSkeleton.json
+++ b/tests/resources/data/trlSkeleton.json
@@ -69,7 +69,7 @@
     "techRecord_tyreUseCode": null,
     "techRecord_vehicleClass_code": "t",
     "techRecord_vehicleClass_description": "trailer",
-    "techRecord_vehicleConfiguration": "rigid",
+    "techRecord_vehicleConfiguration": "semi-trailer",
     "techRecord_vehicleType": "trl",
     "trailerId": "C530005",
     "vin": "9080977997"
@@ -145,7 +145,7 @@
     "foo": "bar",
     "techRecord_vehicleClass_code": "t",
     "techRecord_vehicleClass_description": "trailer",
-    "techRecord_vehicleConfiguration": "rigid",
+    "techRecord_vehicleConfiguration": "semi-trailer",
     "techRecord_vehicleType": "trl",
     "trailerId": "C530005",
     "vin": "9080977997"
@@ -161,7 +161,7 @@
     "techRecord_recordCompleteness": "skeleton",
     "techRecord_vehicleClass_code": "t",
     "techRecord_vehicleClass_description": "trailer",
-    "techRecord_vehicleConfiguration": "rigid",
+    "techRecord_vehicleConfiguration": "low loader",
     "techRecord_vehicleType": "trl",
     "techRecord_statusCode": "provisional",
     "techRecord_bodyType_code": "l",
@@ -180,7 +180,7 @@
     "techRecord_statusCode": "provisional",
     "techRecord_vehicleClass_code": "t",
     "techRecord_vehicleClass_description": "trailer",
-    "techRecord_vehicleConfiguration": "rigid",
+    "techRecord_vehicleConfiguration": "semi-trailer",
     "techRecord_vehicleType": "trl",
     "trailerId": "C530005",
     "vin": "9080977997"
@@ -197,7 +197,7 @@
     "techRecord_statusCode": "foo",
     "techRecord_vehicleClass_code": "t",
     "techRecord_vehicleClass_description": "trailer",
-    "techRecord_vehicleConfiguration": "rigid",
+    "techRecord_vehicleConfiguration": "semi-trailer",
     "techRecord_vehicleType": "trl",
     "trailerId": "C530005",
     "vin": "9080977997"
diff --git a/types/v3/tech-record/enums/vehicleConfigurationHgvPsv.enum.ts b/types/v3/tech-record/enums/vehicleConfigurationHgvPsv.enum.ts
new file mode 100644
index 00000000..fdbd7ee2
--- /dev/null
+++ b/types/v3/tech-record/enums/vehicleConfigurationHgvPsv.enum.ts
@@ -0,0 +1,11 @@
+/* tslint:disable */
+/**
+ * This file was automatically generated by json-schema-to-typescript.
+ * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+ * and run json-schema-to-typescript to regenerate this file.
+ */
+
+export enum VehicleConfiguration {
+  RIGID = "rigid",
+  ARTICULATED = "articulated"
+}
diff --git a/types/v3/tech-record/enums/vehicleConfigurationLightVehicle.enum.ts b/types/v3/tech-record/enums/vehicleConfigurationLightVehicle.enum.ts
new file mode 100644
index 00000000..fab4d6e3
--- /dev/null
+++ b/types/v3/tech-record/enums/vehicleConfigurationLightVehicle.enum.ts
@@ -0,0 +1,21 @@
+/* tslint:disable */
+/**
+ * This file was automatically generated by json-schema-to-typescript.
+ * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+ * and run json-schema-to-typescript to regenerate this file.
+ */
+
+export enum VehicleConfiguration {
+  RIGID = "rigid",
+  ARTICULATED = "articulated",
+  CENTRE_AXLE_DRAWBAR = "centre axle drawbar",
+  SEMI_CAR_TRANSPORTER = "semi-car transporter",
+  SEMI_TRAILER = "semi-trailer",
+  LONG_SEMI_TRAILER = "long semi-trailer",
+  LOW_LOADER = "low loader",
+  OTHER = "other",
+  DRAWBAR = "drawbar",
+  FOUR_IN_LINE = "four-in-line",
+  DOLLY = "dolly",
+  FULL_DRAWBAR = "full drawbar"
+}
diff --git a/types/v3/tech-record/enums/vehicleConfigurationTrl.enum.ts b/types/v3/tech-record/enums/vehicleConfigurationTrl.enum.ts
new file mode 100644
index 00000000..6e88cf76
--- /dev/null
+++ b/types/v3/tech-record/enums/vehicleConfigurationTrl.enum.ts
@@ -0,0 +1,19 @@
+/* tslint:disable */
+/**
+ * This file was automatically generated by json-schema-to-typescript.
+ * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+ * and run json-schema-to-typescript to regenerate this file.
+ */
+
+export enum VehicleConfiguration {
+  CENTRE_AXLE_DRAWBAR = "centre axle drawbar",
+  SEMI_CAR_TRANSPORTER = "semi-car transporter",
+  SEMI_TRAILER = "semi-trailer",
+  LONG_SEMI_TRAILER = "long semi-trailer",
+  LOW_LOADER = "low loader",
+  OTHER = "other",
+  DRAWBAR = "drawbar",
+  FOUR_IN_LINE = "four-in-line",
+  DOLLY = "dolly",
+  FULL_DRAWBAR = "full drawbar"
+}
diff --git a/types/v3/tech-record/get/car/complete/index.d.ts b/types/v3/tech-record/get/car/complete/index.d.ts
index 335b2d26..b40fa0d1 100644
--- a/types/v3/tech-record/get/car/complete/index.d.ts
+++ b/types/v3/tech-record/get/car/complete/index.d.ts
@@ -6,19 +6,6 @@
  */
 
 export type StatusCode = "provisional" | "current" | "archived";
-export type VehicleConfiguration =
-  | "rigid"
-  | "articulated"
-  | "centre axle drawbar"
-  | "semi-car transporter"
-  | "semi-trailer"
-  | "long semi-trailer"
-  | "low loader"
-  | "other"
-  | "drawbar"
-  | "four-in-line"
-  | "dolly"
-  | "full drawbar";
 export type VehicleSubclass = ("n" | "p" | "a" | "s" | "c" | "l" | "t" | "e" | "m" | "r" | "w")[];
 
 export interface TechRecordGETCarComplete {
@@ -77,3 +64,17 @@ export enum EUVehicleCategory {
   L6E = "l6e",
   L7E = "l7e"
 }
+export enum VehicleConfiguration {
+  RIGID = "rigid",
+  ARTICULATED = "articulated",
+  CENTRE_AXLE_DRAWBAR = "centre axle drawbar",
+  SEMI_CAR_TRANSPORTER = "semi-car transporter",
+  SEMI_TRAILER = "semi-trailer",
+  LONG_SEMI_TRAILER = "long semi-trailer",
+  LOW_LOADER = "low loader",
+  OTHER = "other",
+  DRAWBAR = "drawbar",
+  FOUR_IN_LINE = "four-in-line",
+  DOLLY = "dolly",
+  FULL_DRAWBAR = "full drawbar"
+}
diff --git a/types/v3/tech-record/get/car/skeleton/index.d.ts b/types/v3/tech-record/get/car/skeleton/index.d.ts
index aa7ba01b..d9baffcd 100644
--- a/types/v3/tech-record/get/car/skeleton/index.d.ts
+++ b/types/v3/tech-record/get/car/skeleton/index.d.ts
@@ -6,19 +6,6 @@
  */
 
 export type StatusCode = "provisional" | "current" | "archived";
-export type VehicleConfiguration =
-  | "rigid"
-  | "articulated"
-  | "centre axle drawbar"
-  | "semi-car transporter"
-  | "semi-trailer"
-  | "long semi-trailer"
-  | "low loader"
-  | "other"
-  | "drawbar"
-  | "four-in-line"
-  | "dolly"
-  | "full drawbar";
 export type VehicleSubclass = ("n" | "p" | "a" | "s" | "c" | "l" | "t" | "e" | "m" | "r" | "w")[];
 
 export interface TechRecordGETCarSkeleton {
@@ -77,3 +64,17 @@ export enum EUVehicleCategory {
   L6E = "l6e",
   L7E = "l7e"
 }
+export enum VehicleConfiguration {
+  RIGID = "rigid",
+  ARTICULATED = "articulated",
+  CENTRE_AXLE_DRAWBAR = "centre axle drawbar",
+  SEMI_CAR_TRANSPORTER = "semi-car transporter",
+  SEMI_TRAILER = "semi-trailer",
+  LONG_SEMI_TRAILER = "long semi-trailer",
+  LOW_LOADER = "low loader",
+  OTHER = "other",
+  DRAWBAR = "drawbar",
+  FOUR_IN_LINE = "four-in-line",
+  DOLLY = "dolly",
+  FULL_DRAWBAR = "full drawbar"
+}
diff --git a/types/v3/tech-record/get/hgv/complete/index.d.ts b/types/v3/tech-record/get/hgv/complete/index.d.ts
index d7760506..8594aaee 100644
--- a/types/v3/tech-record/get/hgv/complete/index.d.ts
+++ b/types/v3/tech-record/get/hgv/complete/index.d.ts
@@ -82,19 +82,6 @@ export type PlateReasonForIssue =
   | "Original"
   | "Manual";
 export type StatusCode = "provisional" | "current" | "archived";
-export type VehicleConfiguration =
-  | "rigid"
-  | "articulated"
-  | "centre axle drawbar"
-  | "semi-car transporter"
-  | "semi-trailer"
-  | "long semi-trailer"
-  | "low loader"
-  | "other"
-  | "drawbar"
-  | "four-in-line"
-  | "dolly"
-  | "full drawbar";
 
 export interface TechRecordGETHGVComplete {
   secondaryVrms?: string[];
@@ -256,6 +243,10 @@ export enum TyreUseCode {
   _2R = "2R",
   _2B = "2B"
 }
+export enum VehicleConfiguration {
+  RIGID = "rigid",
+  ARTICULATED = "articulated"
+}
 export enum ApprovalType {
   NTA = "NTA",
   ECTA = "ECTA",
diff --git a/types/v3/tech-record/get/hgv/skeleton/index.d.ts b/types/v3/tech-record/get/hgv/skeleton/index.d.ts
index 88b7f9f1..ad78ca83 100644
--- a/types/v3/tech-record/get/hgv/skeleton/index.d.ts
+++ b/types/v3/tech-record/get/hgv/skeleton/index.d.ts
@@ -82,19 +82,6 @@ export type PlateReasonForIssue =
   | "Original"
   | "Manual";
 export type StatusCode = "provisional" | "current" | "archived";
-export type VehicleConfiguration =
-  | "rigid"
-  | "articulated"
-  | "centre axle drawbar"
-  | "semi-car transporter"
-  | "semi-trailer"
-  | "long semi-trailer"
-  | "low loader"
-  | "other"
-  | "drawbar"
-  | "four-in-line"
-  | "dolly"
-  | "full drawbar";
 
 export interface TechRecordGETHGVSkeleton {
   secondaryVrms?: null | string[];
@@ -253,6 +240,10 @@ export enum TyreUseCode {
   _2R = "2R",
   _2B = "2B"
 }
+export enum VehicleConfiguration {
+  RIGID = "rigid",
+  ARTICULATED = "articulated"
+}
 export enum ApprovalType {
   NTA = "NTA",
   ECTA = "ECTA",
diff --git a/types/v3/tech-record/get/hgv/testable/index.d.ts b/types/v3/tech-record/get/hgv/testable/index.d.ts
index 19ae1a1c..d444b284 100644
--- a/types/v3/tech-record/get/hgv/testable/index.d.ts
+++ b/types/v3/tech-record/get/hgv/testable/index.d.ts
@@ -82,19 +82,6 @@ export type PlateReasonForIssue =
   | "Original"
   | "Manual";
 export type StatusCode = "provisional" | "current" | "archived";
-export type VehicleConfiguration =
-  | "rigid"
-  | "articulated"
-  | "centre axle drawbar"
-  | "semi-car transporter"
-  | "semi-trailer"
-  | "long semi-trailer"
-  | "low loader"
-  | "other"
-  | "drawbar"
-  | "four-in-line"
-  | "dolly"
-  | "full drawbar";
 
 export interface TechRecordGETHGVTestable {
   secondaryVrms?: null | string[];
@@ -253,6 +240,10 @@ export enum TyreUseCode {
   _2R = "2R",
   _2B = "2B"
 }
+export enum VehicleConfiguration {
+  RIGID = "rigid",
+  ARTICULATED = "articulated"
+}
 export enum ApprovalType {
   NTA = "NTA",
   ECTA = "ECTA",
diff --git a/types/v3/tech-record/get/lgv/complete/index.d.ts b/types/v3/tech-record/get/lgv/complete/index.d.ts
index cdd7e1cb..36e82aea 100644
--- a/types/v3/tech-record/get/lgv/complete/index.d.ts
+++ b/types/v3/tech-record/get/lgv/complete/index.d.ts
@@ -6,19 +6,6 @@
  */
 
 export type StatusCode = "provisional" | "current" | "archived";
-export type VehicleConfiguration =
-  | "rigid"
-  | "articulated"
-  | "centre axle drawbar"
-  | "semi-car transporter"
-  | "semi-trailer"
-  | "long semi-trailer"
-  | "low loader"
-  | "other"
-  | "drawbar"
-  | "four-in-line"
-  | "dolly"
-  | "full drawbar";
 export type VehicleSubclass = ("n" | "p" | "a" | "s" | "c" | "l" | "t" | "e" | "m" | "r" | "w")[];
 
 export interface TechRecordGETLGVComplete {
@@ -77,3 +64,17 @@ export enum EUVehicleCategory {
   L6E = "l6e",
   L7E = "l7e"
 }
+export enum VehicleConfiguration {
+  RIGID = "rigid",
+  ARTICULATED = "articulated",
+  CENTRE_AXLE_DRAWBAR = "centre axle drawbar",
+  SEMI_CAR_TRANSPORTER = "semi-car transporter",
+  SEMI_TRAILER = "semi-trailer",
+  LONG_SEMI_TRAILER = "long semi-trailer",
+  LOW_LOADER = "low loader",
+  OTHER = "other",
+  DRAWBAR = "drawbar",
+  FOUR_IN_LINE = "four-in-line",
+  DOLLY = "dolly",
+  FULL_DRAWBAR = "full drawbar"
+}
diff --git a/types/v3/tech-record/get/lgv/skeleton/index.d.ts b/types/v3/tech-record/get/lgv/skeleton/index.d.ts
index 12a9d9bb..e4c94814 100644
--- a/types/v3/tech-record/get/lgv/skeleton/index.d.ts
+++ b/types/v3/tech-record/get/lgv/skeleton/index.d.ts
@@ -6,19 +6,6 @@
  */
 
 export type StatusCode = "provisional" | "current" | "archived";
-export type VehicleConfiguration =
-  | "rigid"
-  | "articulated"
-  | "centre axle drawbar"
-  | "semi-car transporter"
-  | "semi-trailer"
-  | "long semi-trailer"
-  | "low loader"
-  | "other"
-  | "drawbar"
-  | "four-in-line"
-  | "dolly"
-  | "full drawbar";
 export type VehicleSubclass = ("n" | "p" | "a" | "s" | "c" | "l" | "t" | "e" | "m" | "r" | "w")[];
 
 export interface TechRecordGETLGVSkeleton {
@@ -77,3 +64,17 @@ export enum EUVehicleCategory {
   L6E = "l6e",
   L7E = "l7e"
 }
+export enum VehicleConfiguration {
+  RIGID = "rigid",
+  ARTICULATED = "articulated",
+  CENTRE_AXLE_DRAWBAR = "centre axle drawbar",
+  SEMI_CAR_TRANSPORTER = "semi-car transporter",
+  SEMI_TRAILER = "semi-trailer",
+  LONG_SEMI_TRAILER = "long semi-trailer",
+  LOW_LOADER = "low loader",
+  OTHER = "other",
+  DRAWBAR = "drawbar",
+  FOUR_IN_LINE = "four-in-line",
+  DOLLY = "dolly",
+  FULL_DRAWBAR = "full drawbar"
+}
diff --git a/types/v3/tech-record/get/motorcycle/complete/index.d.ts b/types/v3/tech-record/get/motorcycle/complete/index.d.ts
index 890f1625..d6e68b57 100644
--- a/types/v3/tech-record/get/motorcycle/complete/index.d.ts
+++ b/types/v3/tech-record/get/motorcycle/complete/index.d.ts
@@ -6,19 +6,6 @@
  */
 
 export type StatusCode = "provisional" | "current" | "archived";
-export type VehicleConfiguration =
-  | "rigid"
-  | "articulated"
-  | "centre axle drawbar"
-  | "semi-car transporter"
-  | "semi-trailer"
-  | "long semi-trailer"
-  | "low loader"
-  | "other"
-  | "drawbar"
-  | "four-in-line"
-  | "dolly"
-  | "full drawbar";
 
 export interface TechRecordGETMotorcycleComplete {
   secondaryVrms?: string[];
@@ -91,3 +78,17 @@ export enum VehicleClassDescription {
   MOTClass7 = "MOT class 7",
   MOTClass5 = "MOT class 5"
 }
+export enum VehicleConfiguration {
+  RIGID = "rigid",
+  ARTICULATED = "articulated",
+  CENTRE_AXLE_DRAWBAR = "centre axle drawbar",
+  SEMI_CAR_TRANSPORTER = "semi-car transporter",
+  SEMI_TRAILER = "semi-trailer",
+  LONG_SEMI_TRAILER = "long semi-trailer",
+  LOW_LOADER = "low loader",
+  OTHER = "other",
+  DRAWBAR = "drawbar",
+  FOUR_IN_LINE = "four-in-line",
+  DOLLY = "dolly",
+  FULL_DRAWBAR = "full drawbar"
+}
diff --git a/types/v3/tech-record/get/motorcycle/skeleton/index.d.ts b/types/v3/tech-record/get/motorcycle/skeleton/index.d.ts
index 264fe92c..8cbf12d8 100644
--- a/types/v3/tech-record/get/motorcycle/skeleton/index.d.ts
+++ b/types/v3/tech-record/get/motorcycle/skeleton/index.d.ts
@@ -6,19 +6,6 @@
  */
 
 export type StatusCode = "provisional" | "current" | "archived";
-export type VehicleConfiguration =
-  | "rigid"
-  | "articulated"
-  | "centre axle drawbar"
-  | "semi-car transporter"
-  | "semi-trailer"
-  | "long semi-trailer"
-  | "low loader"
-  | "other"
-  | "drawbar"
-  | "four-in-line"
-  | "dolly"
-  | "full drawbar";
 
 export interface TechRecordGETMotorcycleSkeleton {
   techRecord_applicantDetails_name?: string | null;
@@ -91,3 +78,17 @@ export enum VehicleClassDescription {
   MOTClass7 = "MOT class 7",
   MOTClass5 = "MOT class 5"
 }
+export enum VehicleConfiguration {
+  RIGID = "rigid",
+  ARTICULATED = "articulated",
+  CENTRE_AXLE_DRAWBAR = "centre axle drawbar",
+  SEMI_CAR_TRANSPORTER = "semi-car transporter",
+  SEMI_TRAILER = "semi-trailer",
+  LONG_SEMI_TRAILER = "long semi-trailer",
+  LOW_LOADER = "low loader",
+  OTHER = "other",
+  DRAWBAR = "drawbar",
+  FOUR_IN_LINE = "four-in-line",
+  DOLLY = "dolly",
+  FULL_DRAWBAR = "full drawbar"
+}
diff --git a/types/v3/tech-record/get/psv/complete/index.d.ts b/types/v3/tech-record/get/psv/complete/index.d.ts
index 3a70df29..291809a2 100644
--- a/types/v3/tech-record/get/psv/complete/index.d.ts
+++ b/types/v3/tech-record/get/psv/complete/index.d.ts
@@ -6,19 +6,6 @@
  */
 
 export type StatusCode = "provisional" | "current" | "archived";
-export type VehicleConfiguration =
-  | "rigid"
-  | "articulated"
-  | "centre axle drawbar"
-  | "semi-car transporter"
-  | "semi-trailer"
-  | "long semi-trailer"
-  | "low loader"
-  | "other"
-  | "drawbar"
-  | "four-in-line"
-  | "dolly"
-  | "full drawbar";
 export type VehicleSize = "small" | "large";
 export type BodyTypeDescription =
   | "artic"
@@ -270,6 +257,10 @@ export interface PSVAxlesComplete {
   tyres_speedCategorySymbol: SpeedCategorySymbol;
 }
 
+export enum VehicleConfiguration {
+  RIGID = "rigid",
+  ARTICULATED = "articulated"
+}
 export enum VehicleClassDescription {
   SMALL_PSV = "small psv (ie: less than or equal to 22 seats)",
   LARGE_PSV = "large psv(ie: greater than 23 seats)"
diff --git a/types/v3/tech-record/get/psv/skeleton/index.d.ts b/types/v3/tech-record/get/psv/skeleton/index.d.ts
index 9147e55d..e5e7dda9 100644
--- a/types/v3/tech-record/get/psv/skeleton/index.d.ts
+++ b/types/v3/tech-record/get/psv/skeleton/index.d.ts
@@ -6,19 +6,6 @@
  */
 
 export type StatusCode = "provisional" | "current" | "archived";
-export type VehicleConfiguration =
-  | "rigid"
-  | "articulated"
-  | "centre axle drawbar"
-  | "semi-car transporter"
-  | "semi-trailer"
-  | "long semi-trailer"
-  | "low loader"
-  | "other"
-  | "drawbar"
-  | "four-in-line"
-  | "dolly"
-  | "full drawbar";
 export type VehicleSize = "small" | "large";
 export type BodyTypeDescription =
   | "artic"
@@ -267,6 +254,10 @@ export interface PSVAxles {
   tyres_speedCategorySymbol?: SpeedCategorySymbol | null;
 }
 
+export enum VehicleConfiguration {
+  RIGID = "rigid",
+  ARTICULATED = "articulated"
+}
 export enum VehicleClassDescription {
   SMALL_PSV = "small psv (ie: less than or equal to 22 seats)",
   LARGE_PSV = "large psv(ie: greater than 23 seats)"
diff --git a/types/v3/tech-record/get/psv/testable/index.d.ts b/types/v3/tech-record/get/psv/testable/index.d.ts
index eeaf8bc6..d7faaaba 100644
--- a/types/v3/tech-record/get/psv/testable/index.d.ts
+++ b/types/v3/tech-record/get/psv/testable/index.d.ts
@@ -6,19 +6,6 @@
  */
 
 export type StatusCode = "provisional" | "current" | "archived";
-export type VehicleConfiguration =
-  | "rigid"
-  | "articulated"
-  | "centre axle drawbar"
-  | "semi-car transporter"
-  | "semi-trailer"
-  | "long semi-trailer"
-  | "low loader"
-  | "other"
-  | "drawbar"
-  | "four-in-line"
-  | "dolly"
-  | "full drawbar";
 export type VehicleSize = "small" | "large";
 export type BodyTypeDescription =
   | "artic"
@@ -267,6 +254,10 @@ export interface PSVAxles {
   tyres_speedCategorySymbol?: SpeedCategorySymbol | null;
 }
 
+export enum VehicleConfiguration {
+  RIGID = "rigid",
+  ARTICULATED = "articulated"
+}
 export enum VehicleClassDescription {
   SMALL_PSV = "small psv (ie: less than or equal to 22 seats)",
   LARGE_PSV = "large psv(ie: greater than 23 seats)"
diff --git a/types/v3/tech-record/get/small trl/complete/index.d.ts b/types/v3/tech-record/get/small trl/complete/index.d.ts
index f343dfdb..0e075ce5 100644
--- a/types/v3/tech-record/get/small trl/complete/index.d.ts	
+++ b/types/v3/tech-record/get/small trl/complete/index.d.ts	
@@ -6,19 +6,6 @@
  */
 
 export type StatusCode = "provisional" | "current" | "archived";
-export type VehicleConfiguration =
-  | "rigid"
-  | "articulated"
-  | "centre axle drawbar"
-  | "semi-car transporter"
-  | "semi-trailer"
-  | "long semi-trailer"
-  | "low loader"
-  | "other"
-  | "drawbar"
-  | "four-in-line"
-  | "dolly"
-  | "full drawbar";
 export type VehicleSubclass = ("n" | "p" | "a" | "s" | "c" | "l" | "t" | "e" | "m" | "r" | "w")[];
 
 export interface TechRecordGETSmallTRLComplete {
@@ -68,3 +55,17 @@ export enum VehicleClassDescription {
   MOTClass7 = "MOT class 7",
   MOTClass5 = "MOT class 5"
 }
+export enum VehicleConfiguration {
+  RIGID = "rigid",
+  ARTICULATED = "articulated",
+  CENTRE_AXLE_DRAWBAR = "centre axle drawbar",
+  SEMI_CAR_TRANSPORTER = "semi-car transporter",
+  SEMI_TRAILER = "semi-trailer",
+  LONG_SEMI_TRAILER = "long semi-trailer",
+  LOW_LOADER = "low loader",
+  OTHER = "other",
+  DRAWBAR = "drawbar",
+  FOUR_IN_LINE = "four-in-line",
+  DOLLY = "dolly",
+  FULL_DRAWBAR = "full drawbar"
+}
diff --git a/types/v3/tech-record/get/small trl/skeleton/index.d.ts b/types/v3/tech-record/get/small trl/skeleton/index.d.ts
index 78b2c062..5b36e10a 100644
--- a/types/v3/tech-record/get/small trl/skeleton/index.d.ts	
+++ b/types/v3/tech-record/get/small trl/skeleton/index.d.ts	
@@ -6,19 +6,6 @@
  */
 
 export type StatusCode = "provisional" | "current" | "archived";
-export type VehicleConfiguration =
-  | "rigid"
-  | "articulated"
-  | "centre axle drawbar"
-  | "semi-car transporter"
-  | "semi-trailer"
-  | "long semi-trailer"
-  | "low loader"
-  | "other"
-  | "drawbar"
-  | "four-in-line"
-  | "dolly"
-  | "full drawbar";
 export type VehicleSubclass = ("n" | "p" | "a" | "s" | "c" | "l" | "t" | "e" | "m" | "r" | "w")[];
 
 export interface TechRecordGETSmallTRLSkeleton {
@@ -68,3 +55,17 @@ export enum VehicleClassDescription {
   MOTClass7 = "MOT class 7",
   MOTClass5 = "MOT class 5"
 }
+export enum VehicleConfiguration {
+  RIGID = "rigid",
+  ARTICULATED = "articulated",
+  CENTRE_AXLE_DRAWBAR = "centre axle drawbar",
+  SEMI_CAR_TRANSPORTER = "semi-car transporter",
+  SEMI_TRAILER = "semi-trailer",
+  LONG_SEMI_TRAILER = "long semi-trailer",
+  LOW_LOADER = "low loader",
+  OTHER = "other",
+  DRAWBAR = "drawbar",
+  FOUR_IN_LINE = "four-in-line",
+  DOLLY = "dolly",
+  FULL_DRAWBAR = "full drawbar"
+}
diff --git a/types/v3/tech-record/get/trl/complete/index.d.ts b/types/v3/tech-record/get/trl/complete/index.d.ts
index d6dde569..938fcdec 100644
--- a/types/v3/tech-record/get/trl/complete/index.d.ts
+++ b/types/v3/tech-record/get/trl/complete/index.d.ts
@@ -83,19 +83,6 @@ export type PlateReasonForIssue =
   | "Original"
   | "Manual";
 export type StatusCode = "provisional" | "current" | "archived";
-export type VehicleConfiguration =
-  | "rigid"
-  | "articulated"
-  | "centre axle drawbar"
-  | "semi-car transporter"
-  | "semi-trailer"
-  | "long semi-trailer"
-  | "low loader"
-  | "other"
-  | "drawbar"
-  | "four-in-line"
-  | "dolly"
-  | "full drawbar";
 export type FitmentCode = "single" | "double";
 export type SpeedCategorySymbol =
   | "a7"
@@ -339,3 +326,15 @@ export enum TyreUseCode {
   _2J = "2J",
   _2M = "2M"
 }
+export enum VehicleConfiguration {
+  CENTRE_AXLE_DRAWBAR = "centre axle drawbar",
+  SEMI_CAR_TRANSPORTER = "semi-car transporter",
+  SEMI_TRAILER = "semi-trailer",
+  LONG_SEMI_TRAILER = "long semi-trailer",
+  LOW_LOADER = "low loader",
+  OTHER = "other",
+  DRAWBAR = "drawbar",
+  FOUR_IN_LINE = "four-in-line",
+  DOLLY = "dolly",
+  FULL_DRAWBAR = "full drawbar"
+}
diff --git a/types/v3/tech-record/get/trl/skeleton/index.d.ts b/types/v3/tech-record/get/trl/skeleton/index.d.ts
index 8c8225ff..072579a8 100644
--- a/types/v3/tech-record/get/trl/skeleton/index.d.ts
+++ b/types/v3/tech-record/get/trl/skeleton/index.d.ts
@@ -100,19 +100,6 @@ export type PlateReasonForIssue =
   | "Original"
   | "Manual";
 export type StatusCode = "provisional" | "current" | "archived";
-export type VehicleConfiguration =
-  | "rigid"
-  | "articulated"
-  | "centre axle drawbar"
-  | "semi-car transporter"
-  | "semi-trailer"
-  | "long semi-trailer"
-  | "low loader"
-  | "other"
-  | "drawbar"
-  | "four-in-line"
-  | "dolly"
-  | "full drawbar";
 
 export interface TechRecordGETTRLSkeleton {
   createdTimestamp: string;
@@ -336,3 +323,15 @@ export enum TyreUseCode {
   _2J = "2J",
   _2M = "2M"
 }
+export enum VehicleConfiguration {
+  CENTRE_AXLE_DRAWBAR = "centre axle drawbar",
+  SEMI_CAR_TRANSPORTER = "semi-car transporter",
+  SEMI_TRAILER = "semi-trailer",
+  LONG_SEMI_TRAILER = "long semi-trailer",
+  LOW_LOADER = "low loader",
+  OTHER = "other",
+  DRAWBAR = "drawbar",
+  FOUR_IN_LINE = "four-in-line",
+  DOLLY = "dolly",
+  FULL_DRAWBAR = "full drawbar"
+}
diff --git a/types/v3/tech-record/get/trl/testable/index.d.ts b/types/v3/tech-record/get/trl/testable/index.d.ts
index 086bd698..27acd1ef 100644
--- a/types/v3/tech-record/get/trl/testable/index.d.ts
+++ b/types/v3/tech-record/get/trl/testable/index.d.ts
@@ -83,19 +83,6 @@ export type PlateReasonForIssue =
   | "Original"
   | "Manual";
 export type StatusCode = "provisional" | "current" | "archived";
-export type VehicleConfiguration =
-  | "rigid"
-  | "articulated"
-  | "centre axle drawbar"
-  | "semi-car transporter"
-  | "semi-trailer"
-  | "long semi-trailer"
-  | "low loader"
-  | "other"
-  | "drawbar"
-  | "four-in-line"
-  | "dolly"
-  | "full drawbar";
 export type FitmentCode = "single" | "double";
 export type SpeedCategorySymbol =
   | "a7"
@@ -336,3 +323,15 @@ export enum TyreUseCode {
   _2J = "2J",
   _2M = "2M"
 }
+export enum VehicleConfiguration {
+  CENTRE_AXLE_DRAWBAR = "centre axle drawbar",
+  SEMI_CAR_TRANSPORTER = "semi-car transporter",
+  SEMI_TRAILER = "semi-trailer",
+  LONG_SEMI_TRAILER = "long semi-trailer",
+  LOW_LOADER = "low loader",
+  OTHER = "other",
+  DRAWBAR = "drawbar",
+  FOUR_IN_LINE = "four-in-line",
+  DOLLY = "dolly",
+  FULL_DRAWBAR = "full drawbar"
+}
diff --git a/types/v3/tech-record/put/car/complete/index.d.ts b/types/v3/tech-record/put/car/complete/index.d.ts
index 8a7cc49d..4feeefc6 100644
--- a/types/v3/tech-record/put/car/complete/index.d.ts
+++ b/types/v3/tech-record/put/car/complete/index.d.ts
@@ -7,19 +7,6 @@
 
 export type StatusCode = "provisional" | "current" | "archived";
 export type VehicleSubclass = ("n" | "p" | "a" | "s" | "c" | "l" | "t" | "e" | "m" | "r" | "w")[];
-export type VehicleConfiguration =
-  | "rigid"
-  | "articulated"
-  | "centre axle drawbar"
-  | "semi-car transporter"
-  | "semi-trailer"
-  | "long semi-trailer"
-  | "low loader"
-  | "other"
-  | "drawbar"
-  | "four-in-line"
-  | "dolly"
-  | "full drawbar";
 
 export interface TechRecordPUTCarComplete {
   vin: string;
@@ -47,6 +34,20 @@ export interface TechRecordPUTCarComplete {
   techRecord_applicantDetails_emailAddress?: null | string;
 }
 
+export enum VehicleConfiguration {
+  RIGID = "rigid",
+  ARTICULATED = "articulated",
+  CENTRE_AXLE_DRAWBAR = "centre axle drawbar",
+  SEMI_CAR_TRANSPORTER = "semi-car transporter",
+  SEMI_TRAILER = "semi-trailer",
+  LONG_SEMI_TRAILER = "long semi-trailer",
+  LOW_LOADER = "low loader",
+  OTHER = "other",
+  DRAWBAR = "drawbar",
+  FOUR_IN_LINE = "four-in-line",
+  DOLLY = "dolly",
+  FULL_DRAWBAR = "full drawbar"
+}
 export enum EUVehicleCategory {
   M1 = "m1",
   M2 = "m2",
diff --git a/types/v3/tech-record/put/car/skeleton/index.d.ts b/types/v3/tech-record/put/car/skeleton/index.d.ts
index d50f5cd4..ad6b2d36 100644
--- a/types/v3/tech-record/put/car/skeleton/index.d.ts
+++ b/types/v3/tech-record/put/car/skeleton/index.d.ts
@@ -7,19 +7,6 @@
 
 export type StatusCode = "provisional" | "current" | "archived";
 export type VehicleSubclass = ("n" | "p" | "a" | "s" | "c" | "l" | "t" | "e" | "m" | "r" | "w")[];
-export type VehicleConfiguration =
-  | "rigid"
-  | "articulated"
-  | "centre axle drawbar"
-  | "semi-car transporter"
-  | "semi-trailer"
-  | "long semi-trailer"
-  | "low loader"
-  | "other"
-  | "drawbar"
-  | "four-in-line"
-  | "dolly"
-  | "full drawbar";
 
 export interface TechRecordPUTCarSkeleton {
   vin: string;
@@ -47,6 +34,20 @@ export interface TechRecordPUTCarSkeleton {
   techRecord_applicantDetails_emailAddress?: null | string;
 }
 
+export enum VehicleConfiguration {
+  RIGID = "rigid",
+  ARTICULATED = "articulated",
+  CENTRE_AXLE_DRAWBAR = "centre axle drawbar",
+  SEMI_CAR_TRANSPORTER = "semi-car transporter",
+  SEMI_TRAILER = "semi-trailer",
+  LONG_SEMI_TRAILER = "long semi-trailer",
+  LOW_LOADER = "low loader",
+  OTHER = "other",
+  DRAWBAR = "drawbar",
+  FOUR_IN_LINE = "four-in-line",
+  DOLLY = "dolly",
+  FULL_DRAWBAR = "full drawbar"
+}
 export enum EUVehicleCategory {
   M1 = "m1",
   M2 = "m2",
diff --git a/types/v3/tech-record/put/hgv/complete/index.d.ts b/types/v3/tech-record/put/hgv/complete/index.d.ts
index af844238..a2d222c2 100644
--- a/types/v3/tech-record/put/hgv/complete/index.d.ts
+++ b/types/v3/tech-record/put/hgv/complete/index.d.ts
@@ -82,19 +82,6 @@ export type PlateReasonForIssue =
   | "Original"
   | "Manual";
 export type StatusCode = "provisional" | "current" | "archived";
-export type VehicleConfiguration =
-  | "rigid"
-  | "articulated"
-  | "centre axle drawbar"
-  | "semi-car transporter"
-  | "semi-trailer"
-  | "long semi-trailer"
-  | "low loader"
-  | "other"
-  | "drawbar"
-  | "four-in-line"
-  | "dolly"
-  | "full drawbar";
 
 export interface TechRecordPUTHGVComplete {
   secondaryVrms?: string[];
@@ -244,6 +231,10 @@ export enum TyreUseCode {
   _2R = "2R",
   _2B = "2B"
 }
+export enum VehicleConfiguration {
+  RIGID = "rigid",
+  ARTICULATED = "articulated"
+}
 export enum ApprovalType {
   NTA = "NTA",
   ECTA = "ECTA",
diff --git a/types/v3/tech-record/put/hgv/skeleton/index.d.ts b/types/v3/tech-record/put/hgv/skeleton/index.d.ts
index c5348cb3..c5de7af2 100644
--- a/types/v3/tech-record/put/hgv/skeleton/index.d.ts
+++ b/types/v3/tech-record/put/hgv/skeleton/index.d.ts
@@ -82,19 +82,6 @@ export type PlateReasonForIssue =
   | "Original"
   | "Manual";
 export type StatusCode = "provisional" | "current" | "archived";
-export type VehicleConfiguration =
-  | "rigid"
-  | "articulated"
-  | "centre axle drawbar"
-  | "semi-car transporter"
-  | "semi-trailer"
-  | "long semi-trailer"
-  | "low loader"
-  | "other"
-  | "drawbar"
-  | "four-in-line"
-  | "dolly"
-  | "full drawbar";
 
 export interface TechRecordPUTHGVSkeleton {
   secondaryVrms?: string[];
@@ -241,6 +228,10 @@ export enum TyreUseCode {
   _2R = "2R",
   _2B = "2B"
 }
+export enum VehicleConfiguration {
+  RIGID = "rigid",
+  ARTICULATED = "articulated"
+}
 export enum ApprovalType {
   NTA = "NTA",
   ECTA = "ECTA",
diff --git a/types/v3/tech-record/put/hgv/testable/index.d.ts b/types/v3/tech-record/put/hgv/testable/index.d.ts
index 5a6784a2..b960fc7c 100644
--- a/types/v3/tech-record/put/hgv/testable/index.d.ts
+++ b/types/v3/tech-record/put/hgv/testable/index.d.ts
@@ -82,19 +82,6 @@ export type PlateReasonForIssue =
   | "Original"
   | "Manual";
 export type StatusCode = "provisional" | "current" | "archived";
-export type VehicleConfiguration =
-  | "rigid"
-  | "articulated"
-  | "centre axle drawbar"
-  | "semi-car transporter"
-  | "semi-trailer"
-  | "long semi-trailer"
-  | "low loader"
-  | "other"
-  | "drawbar"
-  | "four-in-line"
-  | "dolly"
-  | "full drawbar";
 
 export interface TechRecordPUTHGVTestable {
   secondaryVrms?: string[];
@@ -241,6 +228,10 @@ export enum TyreUseCode {
   _2R = "2R",
   _2B = "2B"
 }
+export enum VehicleConfiguration {
+  RIGID = "rigid",
+  ARTICULATED = "articulated"
+}
 export enum ApprovalType {
   NTA = "NTA",
   ECTA = "ECTA",
diff --git a/types/v3/tech-record/put/lgv/complete/index.d.ts b/types/v3/tech-record/put/lgv/complete/index.d.ts
index 4c0bf1b3..e005b25c 100644
--- a/types/v3/tech-record/put/lgv/complete/index.d.ts
+++ b/types/v3/tech-record/put/lgv/complete/index.d.ts
@@ -7,19 +7,6 @@
 
 export type StatusCode = "provisional" | "current" | "archived";
 export type VehicleSubclass = ("n" | "p" | "a" | "s" | "c" | "l" | "t" | "e" | "m" | "r" | "w")[];
-export type VehicleConfiguration =
-  | "rigid"
-  | "articulated"
-  | "centre axle drawbar"
-  | "semi-car transporter"
-  | "semi-trailer"
-  | "long semi-trailer"
-  | "low loader"
-  | "other"
-  | "drawbar"
-  | "four-in-line"
-  | "dolly"
-  | "full drawbar";
 
 export interface TechRecordPUTLGVComplete {
   vin: string;
@@ -67,3 +54,17 @@ export enum EUVehicleCategory {
   L6E = "l6e",
   L7E = "l7e"
 }
+export enum VehicleConfiguration {
+  RIGID = "rigid",
+  ARTICULATED = "articulated",
+  CENTRE_AXLE_DRAWBAR = "centre axle drawbar",
+  SEMI_CAR_TRANSPORTER = "semi-car transporter",
+  SEMI_TRAILER = "semi-trailer",
+  LONG_SEMI_TRAILER = "long semi-trailer",
+  LOW_LOADER = "low loader",
+  OTHER = "other",
+  DRAWBAR = "drawbar",
+  FOUR_IN_LINE = "four-in-line",
+  DOLLY = "dolly",
+  FULL_DRAWBAR = "full drawbar"
+}
diff --git a/types/v3/tech-record/put/lgv/skeleton/index.d.ts b/types/v3/tech-record/put/lgv/skeleton/index.d.ts
index 7093be97..7f5bcdde 100644
--- a/types/v3/tech-record/put/lgv/skeleton/index.d.ts
+++ b/types/v3/tech-record/put/lgv/skeleton/index.d.ts
@@ -7,19 +7,6 @@
 
 export type StatusCode = "provisional" | "current" | "archived";
 export type VehicleSubclass = ("n" | "p" | "a" | "s" | "c" | "l" | "t" | "e" | "m" | "r" | "w")[];
-export type VehicleConfiguration =
-  | "rigid"
-  | "articulated"
-  | "centre axle drawbar"
-  | "semi-car transporter"
-  | "semi-trailer"
-  | "long semi-trailer"
-  | "low loader"
-  | "other"
-  | "drawbar"
-  | "four-in-line"
-  | "dolly"
-  | "full drawbar";
 
 export interface TechRecordPUTLGVSkeleton {
   vin: string;
@@ -67,3 +54,17 @@ export enum EUVehicleCategory {
   L6E = "l6e",
   L7E = "l7e"
 }
+export enum VehicleConfiguration {
+  RIGID = "rigid",
+  ARTICULATED = "articulated",
+  CENTRE_AXLE_DRAWBAR = "centre axle drawbar",
+  SEMI_CAR_TRANSPORTER = "semi-car transporter",
+  SEMI_TRAILER = "semi-trailer",
+  LONG_SEMI_TRAILER = "long semi-trailer",
+  LOW_LOADER = "low loader",
+  OTHER = "other",
+  DRAWBAR = "drawbar",
+  FOUR_IN_LINE = "four-in-line",
+  DOLLY = "dolly",
+  FULL_DRAWBAR = "full drawbar"
+}
diff --git a/types/v3/tech-record/put/motorcycle/complete/index.d.ts b/types/v3/tech-record/put/motorcycle/complete/index.d.ts
index 0c8d36de..9c45f2a5 100644
--- a/types/v3/tech-record/put/motorcycle/complete/index.d.ts
+++ b/types/v3/tech-record/put/motorcycle/complete/index.d.ts
@@ -6,19 +6,6 @@
  */
 
 export type StatusCode = "provisional" | "current" | "archived";
-export type VehicleConfiguration =
-  | "rigid"
-  | "articulated"
-  | "centre axle drawbar"
-  | "semi-car transporter"
-  | "semi-trailer"
-  | "long semi-trailer"
-  | "low loader"
-  | "other"
-  | "drawbar"
-  | "four-in-line"
-  | "dolly"
-  | "full drawbar";
 
 export interface TechRecordPUTMotorcycleComplete {
   secondaryVrms?: null | string[];
@@ -83,3 +70,17 @@ export enum VehicleClassDescription {
   MOTClass7 = "MOT class 7",
   MOTClass5 = "MOT class 5"
 }
+export enum VehicleConfiguration {
+  RIGID = "rigid",
+  ARTICULATED = "articulated",
+  CENTRE_AXLE_DRAWBAR = "centre axle drawbar",
+  SEMI_CAR_TRANSPORTER = "semi-car transporter",
+  SEMI_TRAILER = "semi-trailer",
+  LONG_SEMI_TRAILER = "long semi-trailer",
+  LOW_LOADER = "low loader",
+  OTHER = "other",
+  DRAWBAR = "drawbar",
+  FOUR_IN_LINE = "four-in-line",
+  DOLLY = "dolly",
+  FULL_DRAWBAR = "full drawbar"
+}
diff --git a/types/v3/tech-record/put/motorcycle/skeleton/index.d.ts b/types/v3/tech-record/put/motorcycle/skeleton/index.d.ts
index a584e39e..412e76c2 100644
--- a/types/v3/tech-record/put/motorcycle/skeleton/index.d.ts
+++ b/types/v3/tech-record/put/motorcycle/skeleton/index.d.ts
@@ -6,19 +6,6 @@
  */
 
 export type StatusCode = "provisional" | "current" | "archived";
-export type VehicleConfiguration =
-  | "rigid"
-  | "articulated"
-  | "centre axle drawbar"
-  | "semi-car transporter"
-  | "semi-trailer"
-  | "long semi-trailer"
-  | "low loader"
-  | "other"
-  | "drawbar"
-  | "four-in-line"
-  | "dolly"
-  | "full drawbar";
 
 export interface TechRecordPUTMotorcycleSkeleton {
   techRecord_applicantDetails_name?: string | null;
@@ -83,3 +70,17 @@ export enum VehicleClassDescription {
   MOTClass7 = "MOT class 7",
   MOTClass5 = "MOT class 5"
 }
+export enum VehicleConfiguration {
+  RIGID = "rigid",
+  ARTICULATED = "articulated",
+  CENTRE_AXLE_DRAWBAR = "centre axle drawbar",
+  SEMI_CAR_TRANSPORTER = "semi-car transporter",
+  SEMI_TRAILER = "semi-trailer",
+  LONG_SEMI_TRAILER = "long semi-trailer",
+  LOW_LOADER = "low loader",
+  OTHER = "other",
+  DRAWBAR = "drawbar",
+  FOUR_IN_LINE = "four-in-line",
+  DOLLY = "dolly",
+  FULL_DRAWBAR = "full drawbar"
+}
diff --git a/types/v3/tech-record/put/psv/complete/index.d.ts b/types/v3/tech-record/put/psv/complete/index.d.ts
index 1788b737..46ece2cf 100644
--- a/types/v3/tech-record/put/psv/complete/index.d.ts
+++ b/types/v3/tech-record/put/psv/complete/index.d.ts
@@ -6,19 +6,6 @@
  */
 
 export type StatusCode = "provisional" | "current" | "archived";
-export type VehicleConfiguration =
-  | "rigid"
-  | "articulated"
-  | "centre axle drawbar"
-  | "semi-car transporter"
-  | "semi-trailer"
-  | "long semi-trailer"
-  | "low loader"
-  | "other"
-  | "drawbar"
-  | "four-in-line"
-  | "dolly"
-  | "full drawbar";
 export type VehicleSize = "small" | "large";
 export type BodyTypeDescription =
   | "artic"
@@ -258,6 +245,10 @@ export interface PSVAxlesComplete {
   tyres_speedCategorySymbol: SpeedCategorySymbol;
 }
 
+export enum VehicleConfiguration {
+  RIGID = "rigid",
+  ARTICULATED = "articulated"
+}
 export enum VehicleClassDescription {
   SMALL_PSV = "small psv (ie: less than or equal to 22 seats)",
   LARGE_PSV = "large psv(ie: greater than 23 seats)"
diff --git a/types/v3/tech-record/put/psv/skeleton/index.d.ts b/types/v3/tech-record/put/psv/skeleton/index.d.ts
index 9d626eac..6787bebf 100644
--- a/types/v3/tech-record/put/psv/skeleton/index.d.ts
+++ b/types/v3/tech-record/put/psv/skeleton/index.d.ts
@@ -6,19 +6,6 @@
  */
 
 export type StatusCode = "provisional" | "current" | "archived";
-export type VehicleConfiguration =
-  | "rigid"
-  | "articulated"
-  | "centre axle drawbar"
-  | "semi-car transporter"
-  | "semi-trailer"
-  | "long semi-trailer"
-  | "low loader"
-  | "other"
-  | "drawbar"
-  | "four-in-line"
-  | "dolly"
-  | "full drawbar";
 export type VehicleSize = "small" | "large";
 export type BodyTypeDescription =
   | "artic"
@@ -255,6 +242,10 @@ export interface PSVAxles {
   tyres_speedCategorySymbol?: SpeedCategorySymbol | null;
 }
 
+export enum VehicleConfiguration {
+  RIGID = "rigid",
+  ARTICULATED = "articulated"
+}
 export enum VehicleClassDescription {
   SMALL_PSV = "small psv (ie: less than or equal to 22 seats)",
   LARGE_PSV = "large psv(ie: greater than 23 seats)"
diff --git a/types/v3/tech-record/put/psv/testable/index.d.ts b/types/v3/tech-record/put/psv/testable/index.d.ts
index 4e4d64e2..e3b5aca9 100644
--- a/types/v3/tech-record/put/psv/testable/index.d.ts
+++ b/types/v3/tech-record/put/psv/testable/index.d.ts
@@ -6,19 +6,6 @@
  */
 
 export type StatusCode = "provisional" | "current" | "archived";
-export type VehicleConfiguration =
-  | "rigid"
-  | "articulated"
-  | "centre axle drawbar"
-  | "semi-car transporter"
-  | "semi-trailer"
-  | "long semi-trailer"
-  | "low loader"
-  | "other"
-  | "drawbar"
-  | "four-in-line"
-  | "dolly"
-  | "full drawbar";
 export type VehicleSize = "small" | "large";
 export type BodyTypeDescription =
   | "artic"
@@ -255,6 +242,10 @@ export interface PSVAxles {
   tyres_speedCategorySymbol?: SpeedCategorySymbol | null;
 }
 
+export enum VehicleConfiguration {
+  RIGID = "rigid",
+  ARTICULATED = "articulated"
+}
 export enum VehicleClassDescription {
   SMALL_PSV = "small psv (ie: less than or equal to 22 seats)",
   LARGE_PSV = "large psv(ie: greater than 23 seats)"
diff --git a/types/v3/tech-record/put/small trl/complete/index.d.ts b/types/v3/tech-record/put/small trl/complete/index.d.ts
index 9c67d707..d66d4643 100644
--- a/types/v3/tech-record/put/small trl/complete/index.d.ts	
+++ b/types/v3/tech-record/put/small trl/complete/index.d.ts	
@@ -6,19 +6,6 @@
  */
 
 export type StatusCode = "provisional" | "current" | "archived";
-export type VehicleConfiguration =
-  | "rigid"
-  | "articulated"
-  | "centre axle drawbar"
-  | "semi-car transporter"
-  | "semi-trailer"
-  | "long semi-trailer"
-  | "low loader"
-  | "other"
-  | "drawbar"
-  | "four-in-line"
-  | "dolly"
-  | "full drawbar";
 export type VehicleSubclass = ("n" | "p" | "a" | "s" | "c" | "l" | "t" | "e" | "m" | "r" | "w")[];
 
 export interface TechRecordPUTSmallTRLComplete {
@@ -58,3 +45,17 @@ export enum VehicleClassDescription {
   MOTClass7 = "MOT class 7",
   MOTClass5 = "MOT class 5"
 }
+export enum VehicleConfiguration {
+  RIGID = "rigid",
+  ARTICULATED = "articulated",
+  CENTRE_AXLE_DRAWBAR = "centre axle drawbar",
+  SEMI_CAR_TRANSPORTER = "semi-car transporter",
+  SEMI_TRAILER = "semi-trailer",
+  LONG_SEMI_TRAILER = "long semi-trailer",
+  LOW_LOADER = "low loader",
+  OTHER = "other",
+  DRAWBAR = "drawbar",
+  FOUR_IN_LINE = "four-in-line",
+  DOLLY = "dolly",
+  FULL_DRAWBAR = "full drawbar"
+}
diff --git a/types/v3/tech-record/put/small trl/skeleton/index.d.ts b/types/v3/tech-record/put/small trl/skeleton/index.d.ts
index b2cb12ba..cab9b94d 100644
--- a/types/v3/tech-record/put/small trl/skeleton/index.d.ts	
+++ b/types/v3/tech-record/put/small trl/skeleton/index.d.ts	
@@ -6,19 +6,6 @@
  */
 
 export type StatusCode = "provisional" | "current" | "archived";
-export type VehicleConfiguration =
-  | "rigid"
-  | "articulated"
-  | "centre axle drawbar"
-  | "semi-car transporter"
-  | "semi-trailer"
-  | "long semi-trailer"
-  | "low loader"
-  | "other"
-  | "drawbar"
-  | "four-in-line"
-  | "dolly"
-  | "full drawbar";
 export type VehicleSubclass = ("n" | "p" | "a" | "s" | "c" | "l" | "t" | "e" | "m" | "r" | "w")[];
 
 export interface TechRecordPUTSmallTRLSkeleton {
@@ -58,3 +45,17 @@ export enum VehicleClassDescription {
   MOTClass7 = "MOT class 7",
   MOTClass5 = "MOT class 5"
 }
+export enum VehicleConfiguration {
+  RIGID = "rigid",
+  ARTICULATED = "articulated",
+  CENTRE_AXLE_DRAWBAR = "centre axle drawbar",
+  SEMI_CAR_TRANSPORTER = "semi-car transporter",
+  SEMI_TRAILER = "semi-trailer",
+  LONG_SEMI_TRAILER = "long semi-trailer",
+  LOW_LOADER = "low loader",
+  OTHER = "other",
+  DRAWBAR = "drawbar",
+  FOUR_IN_LINE = "four-in-line",
+  DOLLY = "dolly",
+  FULL_DRAWBAR = "full drawbar"
+}
diff --git a/types/v3/tech-record/put/trl/complete/index.d.ts b/types/v3/tech-record/put/trl/complete/index.d.ts
index b0f078e8..a6b7a974 100644
--- a/types/v3/tech-record/put/trl/complete/index.d.ts
+++ b/types/v3/tech-record/put/trl/complete/index.d.ts
@@ -83,19 +83,6 @@ export type PlateReasonForIssue =
   | "Original"
   | "Manual";
 export type StatusCode = "provisional" | "current" | "archived";
-export type VehicleConfiguration =
-  | "rigid"
-  | "articulated"
-  | "centre axle drawbar"
-  | "semi-car transporter"
-  | "semi-trailer"
-  | "long semi-trailer"
-  | "low loader"
-  | "other"
-  | "drawbar"
-  | "four-in-line"
-  | "dolly"
-  | "full drawbar";
 export type FitmentCode = "single" | "double";
 export type SpeedCategorySymbol =
   | "a7"
@@ -328,3 +315,15 @@ export enum TyreUseCode {
   _2J = "2J",
   _2M = "2M"
 }
+export enum VehicleConfiguration {
+  CENTRE_AXLE_DRAWBAR = "centre axle drawbar",
+  SEMI_CAR_TRANSPORTER = "semi-car transporter",
+  SEMI_TRAILER = "semi-trailer",
+  LONG_SEMI_TRAILER = "long semi-trailer",
+  LOW_LOADER = "low loader",
+  OTHER = "other",
+  DRAWBAR = "drawbar",
+  FOUR_IN_LINE = "four-in-line",
+  DOLLY = "dolly",
+  FULL_DRAWBAR = "full drawbar"
+}
diff --git a/types/v3/tech-record/put/trl/skeleton/index.d.ts b/types/v3/tech-record/put/trl/skeleton/index.d.ts
index 9bd4be43..9f8c4a00 100644
--- a/types/v3/tech-record/put/trl/skeleton/index.d.ts
+++ b/types/v3/tech-record/put/trl/skeleton/index.d.ts
@@ -83,19 +83,6 @@ export type PlateReasonForIssue =
   | "Original"
   | "Manual";
 export type StatusCode = "provisional" | "current" | "archived";
-export type VehicleConfiguration =
-  | "rigid"
-  | "articulated"
-  | "centre axle drawbar"
-  | "semi-car transporter"
-  | "semi-trailer"
-  | "long semi-trailer"
-  | "low loader"
-  | "other"
-  | "drawbar"
-  | "four-in-line"
-  | "dolly"
-  | "full drawbar";
 export type FitmentCode = "single" | "double";
 export type SpeedCategorySymbol =
   | "a7"
@@ -325,3 +312,15 @@ export enum TyreUseCode {
   _2J = "2J",
   _2M = "2M"
 }
+export enum VehicleConfiguration {
+  CENTRE_AXLE_DRAWBAR = "centre axle drawbar",
+  SEMI_CAR_TRANSPORTER = "semi-car transporter",
+  SEMI_TRAILER = "semi-trailer",
+  LONG_SEMI_TRAILER = "long semi-trailer",
+  LOW_LOADER = "low loader",
+  OTHER = "other",
+  DRAWBAR = "drawbar",
+  FOUR_IN_LINE = "four-in-line",
+  DOLLY = "dolly",
+  FULL_DRAWBAR = "full drawbar"
+}
diff --git a/types/v3/tech-record/put/trl/testable/index.d.ts b/types/v3/tech-record/put/trl/testable/index.d.ts
index 7688b5c1..6ba64b2f 100644
--- a/types/v3/tech-record/put/trl/testable/index.d.ts
+++ b/types/v3/tech-record/put/trl/testable/index.d.ts
@@ -83,19 +83,6 @@ export type PlateReasonForIssue =
   | "Original"
   | "Manual";
 export type StatusCode = "provisional" | "current" | "archived";
-export type VehicleConfiguration =
-  | "rigid"
-  | "articulated"
-  | "centre axle drawbar"
-  | "semi-car transporter"
-  | "semi-trailer"
-  | "long semi-trailer"
-  | "low loader"
-  | "other"
-  | "drawbar"
-  | "four-in-line"
-  | "dolly"
-  | "full drawbar";
 export type FitmentCode = "single" | "double";
 export type SpeedCategorySymbol =
   | "a7"
@@ -325,3 +312,15 @@ export enum TyreUseCode {
   _2J = "2J",
   _2M = "2M"
 }
+export enum VehicleConfiguration {
+  CENTRE_AXLE_DRAWBAR = "centre axle drawbar",
+  SEMI_CAR_TRANSPORTER = "semi-car transporter",
+  SEMI_TRAILER = "semi-trailer",
+  LONG_SEMI_TRAILER = "long semi-trailer",
+  LOW_LOADER = "low loader",
+  OTHER = "other",
+  DRAWBAR = "drawbar",
+  FOUR_IN_LINE = "four-in-line",
+  DOLLY = "dolly",
+  FULL_DRAWBAR = "full drawbar"
+}