diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/avvikelse-report-form/avvikelse-report-form.component.html b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/avvikelse-report-form/avvikelse-report-form.component.html
index 0fbd824..74cc2b2 100644
--- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/avvikelse-report-form/avvikelse-report-form.component.html
+++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/avvikelse-report-form/avvikelse-report-form.component.html
@@ -36,7 +36,7 @@
           <form class="avvikelse-report-form__form" [formGroup]="avvikelseFormGroup" (ngSubmit)="openConfirmDialog()">
             <div class="avvikelse-report-form__form-item">
               <ui-select
-                *ngIf="reasonsAsNgDigiFormSelectItems$ | async as reason; else loadingRef"
+                *ngIf="reasonsAsUiSelectOptions$ | async as reason; else loadingRef"
                 [formControlName]="reasonFormName"
                 uiLabel="Orsak till avvikelse"
                 uiPlaceholder="Välj orsak till avvikelse"
diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/avvikelse-report-form/avvikelse-report-form.component.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/avvikelse-report-form/avvikelse-report-form.component.ts
index 252f7b4..7455ec8 100644
--- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/avvikelse-report-form/avvikelse-report-form.component.ts
+++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/avvikelse-report-form/avvikelse-report-form.component.ts
@@ -1,4 +1,4 @@
-import { FormSelectItem } from '@af/digi-ng/_form/form-select';
+import { SelectOption } from '@ui/select/select-option.model';
 import { ChangeDetectionStrategy, Component, OnDestroy, OnInit } from '@angular/core';
 import { AbstractControl, FormArray, FormControl, FormGroup } from '@angular/forms';
 import { ActivatedRoute } from '@angular/router';
@@ -52,7 +52,7 @@ export class AvvikelseReportFormComponent implements OnInit, OnDestroy {
   );
 
   reasons$: Observable<AvvikelseReason[]> = this.avvikelseReportFormService.fetchAvvikelseReasons$;
-  reasonsAsNgDigiFormSelectItems$: Observable<FormSelectItem[]> = this.reasons$.pipe(
+  reasonsAsUiSelectOptions$: Observable<SelectOption[]> = this.reasons$.pipe(
     map(reasons => reasons.map(reason => ({ name: reason.name, value: reason.id.toString() })))
   );
 
diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/informativ-rapport-form/informativ-rapport-form.component.html b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/informativ-rapport-form/informativ-rapport-form.component.html
index 9fcd9ae..73ce3d1 100644
--- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/informativ-rapport-form/informativ-rapport-form.component.html
+++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/informativ-rapport-form/informativ-rapport-form.component.html
@@ -48,7 +48,8 @@
             </div>
             <ui-select
               [formControl]="categoryFormControl"
-              uiLabel=""
+              class="informativ-rapport-form__category"
+              uiLabel="Välj kategori"
               uiPlaceholder="Välj kategori"
               uiId="informativ-rapport-form-category"
               [uiAnnounceIfOptional]="true"
diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/informativ-rapport-form/informativ-rapport-form.component.scss b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/informativ-rapport-form/informativ-rapport-form.component.scss
index de1da12..47144e7 100644
--- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/informativ-rapport-form/informativ-rapport-form.component.scss
+++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/informativ-rapport-form/informativ-rapport-form.component.scss
@@ -12,6 +12,12 @@
     gap: $digi--layout--gutter--l;
   }
 
+  &__category {
+    ::ng-deep .digi-form-label {
+      display: none;
+    }
+  }
+
   &__label-wrapper {
     display: flex;
     gap: var(--digi--layout--gutter);
diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/informativ-rapport-form/informativ-rapport-form.component.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/informativ-rapport-form/informativ-rapport-form.component.ts
index fcfb31d..745d567 100644
--- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/informativ-rapport-form/informativ-rapport-form.component.ts
+++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/informativ-rapport-form/informativ-rapport-form.component.ts
@@ -1,4 +1,4 @@
-import { FormSelectItem } from '@af/digi-ng/_form/form-select';
+import { SelectOption } from '@ui/select/select-option.model';
 import { ChangeDetectionStrategy, Component } from '@angular/core';
 import { FormControl, FormGroup } from '@angular/forms';
 import { ActivatedRoute } from '@angular/router';
@@ -37,7 +37,7 @@ export class InformativRapportFormComponent {
     category: new FormControl(null, [RequiredValidator('Ett ärende måste väljas')]),
     comment: new FormControl('', [RequiredValidator('Kompletterande information är obligatoriskt')]),
   });
-  categorySelectItems: FormSelectItem[] = Object.entries(InformativRapportCategory).map(([value, name]) => ({
+  categorySelectItems: SelectOption[] = Object.entries(InformativRapportCategory).map(([value, name]) => ({
     name,
     value,
   }));
diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/periodisk-redovisning-form/periodisk-redovisning-form.component.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/periodisk-redovisning-form/periodisk-redovisning-form.component.ts
index abd39d4..fe0b732 100644
--- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/periodisk-redovisning-form/periodisk-redovisning-form.component.ts
+++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/periodisk-redovisning-form/periodisk-redovisning-form.component.ts
@@ -1,5 +1,5 @@
 import { RadiobuttonGroupDirection } from '@af/digi-ng/_form/form-radiobutton-group';
-import { FormSelectItem } from '@af/digi-ng/_form/form-select';
+import { SelectOption } from '@ui/select/select-option.model';
 import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
 import { AbstractControl, FormArray, FormControl, FormGroup } from '@angular/forms';
 import { ActivatedRoute, Params } from '@angular/router';
@@ -94,7 +94,7 @@ export class PeriodiskRedovisningFormComponent implements OnInit {
     shareReplay(1)
   );
 
-  periodsToFormselectItems(periods: AvropPeriod[]): FormSelectItem[] {
+  periodsToFormselectItems(periods: AvropPeriod[]): SelectOption[] {
     return periods.map(period => ({
       name: this.getPeriodName(period.startDate),
       value: period.periodId,
diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/signal-form/signal-form.component.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/signal-form/signal-form.component.ts
index b2dbb34..5bca2a3 100644
--- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/signal-form/signal-form.component.ts
+++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/signal-form/signal-form.component.ts
@@ -1,4 +1,4 @@
-import { FormSelectItem } from '@af/digi-ng/_form/form-select';
+import { SelectOption } from '@ui/select/select-option.model';
 import { ChangeDetectionStrategy, Component } from '@angular/core';
 import { FormControl, FormGroup } from '@angular/forms';
 import { ActivatedRoute } from '@angular/router';
@@ -49,7 +49,7 @@ export class SignalFormComponent {
     shareReplay(1)
   );
 
-  typeSelectItems: FormSelectItem[] = [
+  typeSelectItems: SelectOption[] = [
     { name: 'Arbete', value: SignalType.Arbete },
     { name: 'Utbildning', value: SignalType.Utbildning },
   ];
diff --git a/apps/mina-sidor-fa/src/app/shared/components/handledare-picker-form/handledare-picker-form.component.ts b/apps/mina-sidor-fa/src/app/shared/components/handledare-picker-form/handledare-picker-form.component.ts
index e98b1d9..e4109b5 100644
--- a/apps/mina-sidor-fa/src/app/shared/components/handledare-picker-form/handledare-picker-form.component.ts
+++ b/apps/mina-sidor-fa/src/app/shared/components/handledare-picker-form/handledare-picker-form.component.ts
@@ -1,4 +1,4 @@
-import { FormSelectItem } from '@af/digi-ng/_form/form-select';
+import { SelectOption } from '@ui/select/select-option.model';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -32,7 +32,7 @@ export class HandledarePickerFormComponent implements OnChanges {
   formGroup: FormGroup = new FormGroup({
     handledare: new FormControl(null, [RequiredValidator('Handledare är obligatorisk')]),
   });
-  selectableHandledare: FormSelectItem[] = [];
+  selectableHandledare: SelectOption[] = [];
   submitted = false;
   lastSavedHandledare$: Observable<Handledare> = this.handledareService.lastSavedHandledare$;
   submitHandledareLoading$: Observable<boolean> = this.handledareService.submitHandledareLoading$;
diff --git a/apps/mina-sidor-fa/src/app/shared/components/organization-picker-form/organization-picker-form.component.ts b/apps/mina-sidor-fa/src/app/shared/components/organization-picker-form/organization-picker-form.component.ts
index 2d0156b..e0418d2 100644
--- a/apps/mina-sidor-fa/src/app/shared/components/organization-picker-form/organization-picker-form.component.ts
+++ b/apps/mina-sidor-fa/src/app/shared/components/organization-picker-form/organization-picker-form.component.ts
@@ -1,4 +1,4 @@
-import { FormSelectItem } from '@af/digi-ng/_form/form-select';
+import { SelectOption } from '@ui/select/select-option.model';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -29,7 +29,7 @@ export class OrganizationPickerFormComponent implements OnChanges {
   organizationPickerFormGroup: FormGroup = new FormGroup({
     organization: new FormControl(null, [RequiredValidator('Organisation är obligatorisk')]),
   });
-  selectableOrganizations: Array<FormSelectItem> = [];
+  selectableOrganizations: Array<SelectOption> = [];
 
   ngOnChanges(changes: SimpleChanges): void {
     if (changes.selectedOrganization) {