diff --git a/runner/src/server/plugins/engine/components/DatePartsField.ts b/runner/src/server/plugins/engine/components/DatePartsField.ts
index c59455ffc..343afa755 100644
--- a/runner/src/server/plugins/engine/components/DatePartsField.ts
+++ b/runner/src/server/plugins/engine/components/DatePartsField.ts
@@ -128,7 +128,7 @@ export class DatePartsField extends FormComponent {
   // @ts-ignore - eslint does not report this as an error, only tsc
   getViewModel(formData: FormData, errors: FormSubmissionErrors) {
     const viewModel = super.getViewModel(formData, errors);
-
+    viewModel.label!.classes = "govuk-fieldset__legend--s";
     // Use the component collection to generate the subitems
     const componentViewModels = this.children
       .getViewModel(formData, errors)
diff --git a/runner/src/server/plugins/engine/components/SelectionControlField.ts b/runner/src/server/plugins/engine/components/SelectionControlField.ts
index 76efa203e..69ef14c9d 100644
--- a/runner/src/server/plugins/engine/components/SelectionControlField.ts
+++ b/runner/src/server/plugins/engine/components/SelectionControlField.ts
@@ -42,6 +42,7 @@ export class SelectionControlField extends ListFormComponent {
     const { name, items } = this;
     const options: any = this.options;
     const viewModel: ViewModel = super.getViewModel(formData, errors);
+    viewModel.label!.classes = "govuk-fieldset__legend--s";
 
     viewModel.fieldset = {
       legend: viewModel.label,