diff --git a/projects/valtimo/components/src/lib/components/stepper/stepper-footer-step/stepper-footer-step.component.html b/projects/valtimo/components/src/lib/components/stepper/stepper-footer-step/stepper-footer-step.component.html
index f8fc15f30..03ebf9c74 100644
--- a/projects/valtimo/components/src/lib/components/stepper/stepper-footer-step/stepper-footer-step.component.html
+++ b/projects/valtimo/components/src/lib/components/stepper/stepper-footer-step/stepper-footer-step.component.html
@@ -33,36 +33,31 @@
 </div>
 
 <ng-template #cancelButton let-disabled="disabled">
-  <v-button (clickEvent)="cancel()" type="secondary" [disabled]="disabled">{{
-    cancelButtonTranslationKey
-      ? (cancelButtonTranslationKey | translate)
-      : ('stepper.cancelButtonText' | translate)
-  }}</v-button>
+  <button cdsButton="secondary" (click)="cancel()" [disabled]="disabled">
+    {{
+      cancelButtonTranslationKey
+        ? (cancelButtonTranslationKey | translate)
+        : ('stepper.cancelButtonText' | translate)
+    }}
+  </button>
 </ng-template>
 
 <ng-template #nextButton let-disabled="disabled">
-  <v-button
-    [disabled]="!nextButtonEnabled || disabled"
-    (clickEvent)="goToNextStep()"
-    mdiIcon="arrow-right"
-    >{{
+  <button cdsButton="primary" [disabled]="!nextButtonEnabled || disabled" (click)="goToNextStep()">
+    {{
       nextButtonTranslationKey
         ? (nextButtonTranslationKey | translate)
         : ('stepper.nextButtonText' | translate)
-    }}</v-button
-  >
+    }}
+  </button>
 </ng-template>
 
 <ng-template #completeButton let-disabled="disabled">
-  <v-button
-    [disabled]="!completeButtonEnabled || disabled"
-    (clickEvent)="complete()"
-    [mdiIcon]="completeButtonMdiIcon || 'check'"
-    type="success"
-    >{{
+  <button cdsButton="primary" [disabled]="!completeButtonEnabled || disabled" (click)="complete()">
+    {{
       completeButtonTranslationKey
         ? (completeButtonTranslationKey | translate)
         : ('stepper.completeButtonText' | translate)
-    }}</v-button
-  >
+    }}
+  </button>
 </ng-template>
diff --git a/projects/valtimo/components/src/lib/components/stepper/stepper.module.ts b/projects/valtimo/components/src/lib/components/stepper/stepper.module.ts
index 7e1f60653..4a89efc53 100644
--- a/projects/valtimo/components/src/lib/components/stepper/stepper.module.ts
+++ b/projects/valtimo/components/src/lib/components/stepper/stepper.module.ts
@@ -24,6 +24,7 @@ import {StepperStepComponent} from './stepper-step/stepper-step.component';
 import {TranslateModule} from '@ngx-translate/core';
 import {StepperFooterStepComponent} from './stepper-footer-step/stepper-footer-step.component';
 import {ButtonModule} from '../button/button.module';
+import {ButtonModule as CarbonButtonModule} from 'carbon-components-angular';
 
 /**
  * @deprecated Migrate old design to Carbon
@@ -37,7 +38,12 @@ import {ButtonModule} from '../button/button.module';
     StepperStepComponent,
     StepperFooterStepComponent,
   ],
-  imports: [CommonModule, TranslateModule, ButtonModule],
+  imports: [
+    CommonModule,
+    TranslateModule,
+    ButtonModule,
+    CarbonButtonModule
+  ],
   exports: [
     StepperContainerComponent,
     StepperContentComponent,
diff --git a/projects/valtimo/plugin-management/src/lib/components/plugin-add-modal/plugin-add-modal.component.html b/projects/valtimo/plugin-management/src/lib/components/plugin-add-modal/plugin-add-modal.component.html
index 9907db0a6..05f8c61fe 100644
--- a/projects/valtimo/plugin-management/src/lib/components/plugin-add-modal/plugin-add-modal.component.html
+++ b/projects/valtimo/plugin-management/src/lib/components/plugin-add-modal/plugin-add-modal.component.html
@@ -20,11 +20,11 @@
   [disabled]="inputDisabled$ | async"
   [returnToFirstStepSubject$]="returnToFirstStepSubject$"
 >
-  <v-modal #pluginAddModal (closeEvent)="hide()">
-    <div role="header">
+  <cds-modal #pluginAddModal [open]="open">
+    <cds-modal-header [showCloseButton]="true" (closeSelect)="hide()">
       <v-stepper-header></v-stepper-header>
-    </div>
-    <div role="content">
+    </cds-modal-header>
+    <section cdsModalContent>
       <v-stepper-content>
         <v-stepper-step titleTranslationKey="pluginManagement.addSteps.step0">
           <valtimo-plugin-add-select></valtimo-plugin-add-select>
@@ -36,9 +36,9 @@
           ></valtimo-plugin-configure>
         </v-stepper-step>
       </v-stepper-content>
-    </div>
-    <div role="footer">
-      <v-stepper-footer>
+    </section>
+    <cds-modal-footer>
+      <v-stepper-footer class="stepper-footer">
         <v-stepper-footer-step
           nextButtonTranslationKey="pluginManagement.addSteps.step1"
           [nextButtonEnabled]="selectedPluginDefinition$ | async"
@@ -48,6 +48,6 @@
           [completeButtonEnabled]="configurationValid$ | async"
         ></v-stepper-footer-step>
       </v-stepper-footer>
-    </div>
-  </v-modal>
+    </cds-modal-footer>
+  </cds-modal>
 </v-stepper-container>
diff --git a/projects/valtimo/plugin-management/src/lib/components/plugin-add-modal/plugin-add-modal.component.scss b/projects/valtimo/plugin-management/src/lib/components/plugin-add-modal/plugin-add-modal.component.scss
index c53d3159a..ea9f945cd 100644
--- a/projects/valtimo/plugin-management/src/lib/components/plugin-add-modal/plugin-add-modal.component.scss
+++ b/projects/valtimo/plugin-management/src/lib/components/plugin-add-modal/plugin-add-modal.component.scss
@@ -13,3 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+.stepper-footer {
+  width: 100%;
+}
diff --git a/projects/valtimo/plugin-management/src/lib/components/plugin-add-modal/plugin-add-modal.component.ts b/projects/valtimo/plugin-management/src/lib/components/plugin-add-modal/plugin-add-modal.component.ts
index 1c3ce6076..30abca603 100644
--- a/projects/valtimo/plugin-management/src/lib/components/plugin-add-modal/plugin-add-modal.component.ts
+++ b/projects/valtimo/plugin-management/src/lib/components/plugin-add-modal/plugin-add-modal.component.ts
@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-import {Component, OnInit, ViewChild} from '@angular/core';
+import {Component, EventEmitter, Input, Output} from '@angular/core';
 import {PluginManagementStateService} from '../../services';
 import {take} from 'rxjs/operators';
-import {VModalComponent, ModalService} from '@valtimo/components';
-import {BehaviorSubject, Subject, Subscription} from 'rxjs';
+import {BehaviorSubject, Subject} from 'rxjs';
 import {PluginConfigurationData, PluginManagementService} from '@valtimo/plugin';
 import {NGXLogger} from 'ngx-logger';
 
@@ -27,29 +26,22 @@ import {NGXLogger} from 'ngx-logger';
   templateUrl: './plugin-add-modal.component.html',
   styleUrls: ['./plugin-add-modal.component.scss'],
 })
-export class PluginAddModalComponent implements OnInit {
-  @ViewChild('pluginAddModal') pluginAddModal: VModalComponent;
+export class PluginAddModalComponent {
+  @Input() open = false;
+
+  @Output() closeModal: EventEmitter<boolean> = new EventEmitter();
 
   readonly inputDisabled$ = this.stateService.inputDisabled$;
   readonly selectedPluginDefinition$ = this.stateService.selectedPluginDefinition$;
   readonly configurationValid$ = new BehaviorSubject<boolean>(false);
   readonly returnToFirstStepSubject$ = new Subject<boolean>();
 
-  private showSubscription!: Subscription;
-  private hideSubscription!: Subscription;
-
   constructor(
     private readonly stateService: PluginManagementStateService,
-    private readonly modalService: ModalService,
     private readonly pluginManagementService: PluginManagementService,
     private readonly logger: NGXLogger
   ) {}
 
-  ngOnInit(): void {
-    this.openShowSubscription();
-    this.openHideSubscription();
-  }
-
   complete(): void {
     this.stateService.save();
   }
@@ -59,12 +51,10 @@ export class PluginAddModalComponent implements OnInit {
   }
 
   hide(): void {
-    this.stateService.disableInput();
-    this.modalService.closeModal(() => {
-      this.returnToFirstStep();
-      this.stateService.enableInput();
-      this.stateService.clear();
-    });
+    this.closeModal.emit();
+    this.returnToFirstStep();
+    this.stateService.enableInput();
+    this.stateService.clear();
   }
 
   onValid(valid: boolean): void {
@@ -98,25 +88,7 @@ export class PluginAddModalComponent implements OnInit {
     });
   }
 
-  private openShowSubscription(): void {
-    this.showSubscription = this.stateService.showModal$.subscribe(modalType => {
-      if (modalType === 'add') {
-        this.show();
-      }
-    });
-  }
-
-  private openHideSubscription(): void {
-    this.hideSubscription = this.stateService.hideModal$.subscribe(() => {
-      this.hide();
-    });
-  }
-
   private returnToFirstStep(): void {
     this.returnToFirstStepSubject$.next(true);
   }
-
-  private show(): void {
-    this.modalService.openModal(this.pluginAddModal);
-  }
 }
diff --git a/projects/valtimo/plugin-management/src/lib/components/plugin-edit-modal/plugin-edit-modal.component.html b/projects/valtimo/plugin-management/src/lib/components/plugin-edit-modal/plugin-edit-modal.component.html
index 02790bf60..997efebe5 100644
--- a/projects/valtimo/plugin-management/src/lib/components/plugin-edit-modal/plugin-edit-modal.component.html
+++ b/projects/valtimo/plugin-management/src/lib/components/plugin-edit-modal/plugin-edit-modal.component.html
@@ -14,42 +14,39 @@
   ~ limitations under the License.
   -->
 
-<v-modal
+<cds-modal
   #pluginEditModal
-  (closeEvent)="hide()"
+  [open]="open"
+  (close)="hide()"
   *ngIf="{selectedConfiguration: selectedPluginConfiguration$ | async} as obs"
 >
-  <div role="header">
-    <div class="edit-configuration-title">
-      <v-title [margin]="false" type="h2">{{
-        obs.selectedConfiguration?.title +
-          ' - ' +
-          ('title' | pluginTranslate: obs.selectedConfiguration?.pluginDefinition?.key | async)
-      }}</v-title>
-    </div>
-  </div>
-  <div role="content">
+  <cds-modal-header [showCloseButton]="true" (closeSelect)="hide()">
+    {{
+      obs.selectedConfiguration?.title +
+        ' - ' +
+        ('title' | pluginTranslate: obs.selectedConfiguration?.pluginDefinition?.key | async)
+    }}
+  </cds-modal-header>
+  <section cdsModalContent>
     <valtimo-plugin-edit
       (valid)="onPluginValid($event)"
       (configuration)="onPluginConfiguration($event)"
     ></valtimo-plugin-edit>
-  </div>
-  <div role="footer">
-    <div class="edit-plugin-buttons">
-      <v-button
-        [disabled]="inputDisabled$ | async"
-        (clickEvent)="delete()"
-        [mdiIcon]="'delete'"
-        type="danger"
-        >{{ 'pluginManagement.remove' | translate }}</v-button
-      >
-      <v-button
-        [disabled]="(configurationValid$ | async) === false || (inputDisabled$ | async)"
-        (clickEvent)="save()"
-        [mdiIcon]="'check'"
-        type="success"
-        >{{ 'pluginManagement.save' | translate }}</v-button
-      >
-    </div>
-  </div>
-</v-modal>
+  </section>
+  <cds-modal-footer>
+    <button
+      cdsButton="danger"
+      (click)="delete()"
+      [disabled]="inputDisabled$ | async"
+    >
+      {{ 'pluginManagement.remove' | translate }}
+    </button>
+    <button
+      cdsButton="primary"
+      [disabled]="(configurationValid$ | async) === false || (inputDisabled$ | async)"
+      (click)="save()"
+    >
+      {{ 'pluginManagement.save' | translate }}
+    </button>
+  </cds-modal-footer>
+</cds-modal>
diff --git a/projects/valtimo/plugin-management/src/lib/components/plugin-edit-modal/plugin-edit-modal.component.scss b/projects/valtimo/plugin-management/src/lib/components/plugin-edit-modal/plugin-edit-modal.component.scss
index 3782e72d6..c53d3159a 100644
--- a/projects/valtimo/plugin-management/src/lib/components/plugin-edit-modal/plugin-edit-modal.component.scss
+++ b/projects/valtimo/plugin-management/src/lib/components/plugin-edit-modal/plugin-edit-modal.component.scss
@@ -13,15 +13,3 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-.edit-plugin-buttons {
-  display: flex;
-  width: 100%;
-  justify-content: space-between;
-}
-
-.edit-configuration-title {
-  display: flex;
-  width: 100%;
-  justify-content: center;
-}
diff --git a/projects/valtimo/plugin-management/src/lib/components/plugin-edit-modal/plugin-edit-modal.component.ts b/projects/valtimo/plugin-management/src/lib/components/plugin-edit-modal/plugin-edit-modal.component.ts
index 3ce3e0d13..7965ae805 100644
--- a/projects/valtimo/plugin-management/src/lib/components/plugin-edit-modal/plugin-edit-modal.component.ts
+++ b/projects/valtimo/plugin-management/src/lib/components/plugin-edit-modal/plugin-edit-modal.component.ts
@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-import {Component, OnInit, ViewChild} from '@angular/core';
+import {Component, EventEmitter, Input, Output} from '@angular/core';
 import {PluginManagementStateService} from '../../services';
 import {take} from 'rxjs/operators';
-import {VModalComponent, ModalService} from '@valtimo/components';
-import {BehaviorSubject, Observable, Subject, Subscription} from 'rxjs';
+import {BehaviorSubject, Observable} from 'rxjs';
 import {
   PluginConfigurationData,
   PluginConfiguration,
@@ -31,29 +30,22 @@ import {NGXLogger} from 'ngx-logger';
   templateUrl: './plugin-edit-modal.component.html',
   styleUrls: ['./plugin-edit-modal.component.scss'],
 })
-export class PluginEditModalComponent implements OnInit {
-  @ViewChild('pluginEditModal') pluginEditModal: VModalComponent;
+export class PluginEditModalComponent {
+  @Input() open = false;
+
+  @Output() closeModal: EventEmitter<boolean> = new EventEmitter();
 
   readonly inputDisabled$ = this.stateService.inputDisabled$;
   readonly selectedPluginConfiguration$: Observable<PluginConfiguration> =
     this.stateService.selectedPluginConfiguration$;
   readonly configurationValid$ = new BehaviorSubject<boolean>(false);
 
-  private showSubscription!: Subscription;
-  private hideSubscription!: Subscription;
-
   constructor(
     private readonly stateService: PluginManagementStateService,
-    private readonly modalService: ModalService,
     private readonly pluginManagementService: PluginManagementService,
     private readonly logger: NGXLogger
   ) {}
 
-  ngOnInit(): void {
-    this.openShowSubscription();
-    this.openHideSubscription();
-  }
-
   save(): void {
     this.stateService.saveEdit();
   }
@@ -79,18 +71,16 @@ export class PluginEditModalComponent implements OnInit {
       });
   }
 
-  hide(): void {
-    this.modalService.closeModal(() => {
-      this.stateService.enableInput();
-      this.stateService.clear();
-    });
+  public hide(): void {
+    this.closeModal.emit();
+    this.stateService.enableInput();
   }
 
-  onPluginValid(valid: boolean): void {
+  public onPluginValid(valid: boolean): void {
     this.configurationValid$.next(valid);
   }
 
-  onPluginConfiguration(configuration: PluginConfigurationData): void {
+  public onPluginConfiguration(configuration: PluginConfigurationData): void {
     this.stateService.disableInput();
 
     this.stateService.selectedPluginConfiguration$
@@ -120,22 +110,4 @@ export class PluginEditModalComponent implements OnInit {
           );
       });
   }
-
-  private openShowSubscription(): void {
-    this.showSubscription = this.stateService.showModal$.subscribe(modalType => {
-      if (modalType === 'edit') {
-        this.show();
-      }
-    });
-  }
-
-  private openHideSubscription(): void {
-    this.hideSubscription = this.stateService.hideModal$.subscribe(() => {
-      this.hide();
-    });
-  }
-
-  private show(): void {
-    this.modalService.openModal(this.pluginEditModal);
-  }
 }
diff --git a/projects/valtimo/plugin-management/src/lib/components/plugin-management/plugin-management.component.html b/projects/valtimo/plugin-management/src/lib/components/plugin-management/plugin-management.component.html
index b5b3a85e4..c8428e9a5 100644
--- a/projects/valtimo/plugin-management/src/lib/components/plugin-management/plugin-management.component.html
+++ b/projects/valtimo/plugin-management/src/lib/components/plugin-management/plugin-management.component.html
@@ -44,6 +44,12 @@
   </ng-template>
 </ng-container>
 
-<valtimo-plugin-add-modal></valtimo-plugin-add-modal>
+<valtimo-plugin-add-modal
+  [open]="showAddModal$ | async"
+  (closeModal)="closeAddModal()"
+></valtimo-plugin-add-modal>
 
-<valtimo-plugin-edit-modal></valtimo-plugin-edit-modal>
+<valtimo-plugin-edit-modal
+  [open]="showEditModal$ | async"
+  (closeModal)="closeEditModal()"
+></valtimo-plugin-edit-modal>
diff --git a/projects/valtimo/plugin-management/src/lib/components/plugin-management/plugin-management.component.ts b/projects/valtimo/plugin-management/src/lib/components/plugin-management/plugin-management.component.ts
index d062bfee0..10ceecdf9 100644
--- a/projects/valtimo/plugin-management/src/lib/components/plugin-management/plugin-management.component.ts
+++ b/projects/valtimo/plugin-management/src/lib/components/plugin-management/plugin-management.component.ts
@@ -62,6 +62,8 @@ export class PluginManagementComponent {
   ];
 
   public readonly loading$ = new BehaviorSubject<boolean>(true);
+  public readonly showEditModal$ = new BehaviorSubject<boolean>(false);
+  public readonly showAddModal$ = new BehaviorSubject<boolean>(false);
   public readonly pluginConfigurations$ = this.stateService.refresh$.pipe(
     switchMap(() =>
       combineLatest([
@@ -93,12 +95,12 @@ export class PluginManagementComponent {
   ) {}
 
   public showAddModal(): void {
-    this.stateService.showModal('add');
+    this.showAddModal$.next(true);
   }
 
   public editConfiguration(configuration: PluginConfiguration): void {
+    this.showEditModal$.next(true);
     this.stateService.selectPluginConfiguration(configuration);
-    this.stateService.showModal('edit');
   }
 
   public deleteConfiguration(configuration: PluginConfiguration): void {
@@ -118,4 +120,12 @@ export class PluginManagementComponent {
         },
       });
   }
+
+  public closeEditModal(): void {
+    this.showEditModal$.next(false);
+  }
+
+  public closeAddModal(): void {
+    this.showAddModal$.next(false);
+  }
 }
diff --git a/projects/valtimo/plugin-management/src/lib/plugin-management.module.ts b/projects/valtimo/plugin-management/src/lib/plugin-management.module.ts
index 32555b551..5e7a3414c 100644
--- a/projects/valtimo/plugin-management/src/lib/plugin-management.module.ts
+++ b/projects/valtimo/plugin-management/src/lib/plugin-management.module.ts
@@ -37,7 +37,11 @@ import {
   TitleModule,
   CarbonListModule,
 } from '@valtimo/components';
-import {IconModule, ButtonModule as CarbonButtonModule} from 'carbon-components-angular';
+import {
+  IconModule,
+  ButtonModule as CarbonButtonModule,
+  ModalModule as CarbonModalModule,
+} from 'carbon-components-angular';
 
 @NgModule({
   providers: [PluginManagementStateService],
@@ -65,6 +69,7 @@ import {IconModule, ButtonModule as CarbonButtonModule} from 'carbon-components-
     PluginConfigurationContainerModule,
     CarbonButtonModule,
     CarbonListModule,
+    CarbonModalModule,
     IconModule,
   ],
   exports: [
diff --git a/projects/valtimo/plugin/src/lib/components/default-plugin-configuration/default-plugin-configuration.component.html b/projects/valtimo/plugin/src/lib/components/default-plugin-configuration/default-plugin-configuration.component.html
index f3aa797b5..5d3579532 100644
--- a/projects/valtimo/plugin/src/lib/components/default-plugin-configuration/default-plugin-configuration.component.html
+++ b/projects/valtimo/plugin/src/lib/components/default-plugin-configuration/default-plugin-configuration.component.html
@@ -29,7 +29,6 @@
     [defaultValue]="obs.prefill?.configurationId"
     [required]="false"
     [tooltip]="'plugin.configurationIdTooltip' | translate"
-    [widthPx]="350"
     placeholder="00000000-0000-0000-0000-000000000000"
   >
   </v-input>
diff --git a/projects/valtimo/plugin/src/lib/plugins/besluiten-api/components/besluiten-api-configuration/besluiten-api-configuration.component.html b/projects/valtimo/plugin/src/lib/plugins/besluiten-api/components/besluiten-api-configuration/besluiten-api-configuration.component.html
index 01e245819..c4f6418bb 100644
--- a/projects/valtimo/plugin/src/lib/plugins/besluiten-api/components/besluiten-api-configuration/besluiten-api-configuration.component.html
+++ b/projects/valtimo/plugin/src/lib/plugins/besluiten-api/components/besluiten-api-configuration/besluiten-api-configuration.component.html
@@ -29,7 +29,6 @@
     [defaultValue]="obs.prefill?.configurationTitle"
     [required]="true"
     [tooltip]="'configurationTitleTooltip' | pluginTranslate: pluginId | async"
-    [widthPx]="350"
     placeholder="Besluiten API Plugin"
   >
   </v-input>
@@ -41,14 +40,12 @@
     [defaultValue]="obs.prefill?.rsin"
     [required]="true"
     [tooltip]="'rsinTooltip' | pluginTranslate: pluginId | async"
-    [widthPx]="350"
     placeholder="123456789"
   >
   </v-input>
   <v-input
     name="url"
     [title]="'url' | pluginTranslate: pluginId | async"
-    [fullWidth]="true"
     [margin]="true"
     [disabled]="obs.disabled"
     [defaultValue]="obs.prefill?.url"
@@ -63,7 +60,6 @@
     <v-select
       [items]="authObs.authenticationPluginSelectItems"
       [margin]="true"
-      [widthInPx]="350"
       name="authenticationPluginConfiguration"
       [title]="'authenticationPluginConfiguration' | pluginTranslate: pluginId | async"
       [disabled]="obs.disabled"
diff --git a/projects/valtimo/plugin/src/lib/plugins/catalogi-api/components/catalogi-api-configuration/catalogi-api-configuration.component.html b/projects/valtimo/plugin/src/lib/plugins/catalogi-api/components/catalogi-api-configuration/catalogi-api-configuration.component.html
index d3e35b826..afbf82474 100644
--- a/projects/valtimo/plugin/src/lib/plugins/catalogi-api/components/catalogi-api-configuration/catalogi-api-configuration.component.html
+++ b/projects/valtimo/plugin/src/lib/plugins/catalogi-api/components/catalogi-api-configuration/catalogi-api-configuration.component.html
@@ -29,14 +29,12 @@
     [defaultValue]="obs.prefill?.configurationTitle"
     [required]="true"
     [tooltip]="'configurationTitleTooltip' | pluginTranslate: pluginId | async"
-    [widthPx]="350"
     placeholder="Catalogi API Plugin"
   >
   </v-input>
   <v-input
     name="url"
     [title]="'url' | pluginTranslate: pluginId | async"
-    [fullWidth]="true"
     [margin]="true"
     [disabled]="obs.disabled"
     [defaultValue]="obs.prefill?.url"
@@ -51,7 +49,6 @@
     <v-select
       [items]="authObs.authenticationPluginSelectItems"
       [margin]="true"
-      [widthInPx]="350"
       name="authenticationPluginConfiguration"
       [title]="'authenticationPluginConfiguration' | pluginTranslate: pluginId | async"
       [disabled]="obs.disabled"
diff --git a/projects/valtimo/plugin/src/lib/plugins/documenten-api/components/documenten-api-configuration/documenten-api-configuration.component.html b/projects/valtimo/plugin/src/lib/plugins/documenten-api/components/documenten-api-configuration/documenten-api-configuration.component.html
index 3ee5f3490..3b7abc9d6 100644
--- a/projects/valtimo/plugin/src/lib/plugins/documenten-api/components/documenten-api-configuration/documenten-api-configuration.component.html
+++ b/projects/valtimo/plugin/src/lib/plugins/documenten-api/components/documenten-api-configuration/documenten-api-configuration.component.html
@@ -29,14 +29,12 @@
     [defaultValue]="obs.prefill?.configurationTitle"
     [required]="true"
     [tooltip]="'configurationTitleTooltip' | pluginTranslate: pluginId | async"
-    [widthPx]="350"
     placeholder="Documenten API Plugin"
   >
   </v-input>
   <v-input
     name="url"
     [title]="'url' | pluginTranslate: pluginId | async"
-    [fullWidth]="true"
     [margin]="true"
     [disabled]="obs.disabled"
     [defaultValue]="obs.prefill?.url"
@@ -53,7 +51,6 @@
     [disabled]="obs.disabled"
     [defaultValue]="obs.prefill?.bronorganisatie"
     [required]="true"
-    [widthPx]="150"
     [tooltip]="'bronorganisatieTooltip' | pluginTranslate: pluginId | async"
     placeholder="123456789"
   >
@@ -65,7 +62,6 @@
       [loading]="!authObs.authenticationPluginSelectItems"
       [items]="authObs.authenticationPluginSelectItems"
       [margin]="true"
-      [widthInPx]="350"
       name="authenticationPluginConfiguration"
       [title]="'authenticationPluginConfiguration' | pluginTranslate: pluginId | async"
       [disabled]="obs.disabled"
@@ -79,7 +75,6 @@
       [loading]="!pObs.apiVersionItems"
       [items]="pObs.apiVersionItems"
       [margin]="true"
-      [widthInPx]="350"
       name="apiVersion"
       [title]="'apiVersion' | pluginTranslate: pluginId | async"
       [disabled]="obs.disabled"
diff --git a/projects/valtimo/plugin/src/lib/plugins/exact/components/exact-plugin-configuration/exact-plugin-configuration.component.html b/projects/valtimo/plugin/src/lib/plugins/exact/components/exact-plugin-configuration/exact-plugin-configuration.component.html
index 94b1b04c7..2f9ec31ba 100644
--- a/projects/valtimo/plugin/src/lib/plugins/exact/components/exact-plugin-configuration/exact-plugin-configuration.component.html
+++ b/projects/valtimo/plugin/src/lib/plugins/exact/components/exact-plugin-configuration/exact-plugin-configuration.component.html
@@ -29,7 +29,6 @@
     [defaultValue]="obs.prefill?.configurationTitle"
     [required]="true"
     [tooltip]="'configurationTitleTooltip' | pluginTranslate: pluginId | async"
-    [widthPx]="350"
   >
   </v-input>
   <v-input
diff --git a/projects/valtimo/plugin/src/lib/plugins/notificaties-api-authentication/components/open-notificaties-configuration/open-notificaties-configuration.component.html b/projects/valtimo/plugin/src/lib/plugins/notificaties-api-authentication/components/open-notificaties-configuration/open-notificaties-configuration.component.html
index b2e26a5ea..300fbec59 100644
--- a/projects/valtimo/plugin/src/lib/plugins/notificaties-api-authentication/components/open-notificaties-configuration/open-notificaties-configuration.component.html
+++ b/projects/valtimo/plugin/src/lib/plugins/notificaties-api-authentication/components/open-notificaties-configuration/open-notificaties-configuration.component.html
@@ -27,7 +27,6 @@
     [margin]="true"
     [disabled]="obs.disabled"
     [defaultValue]="obs.prefill?.configurationTitle"
-    [widthPx]="350"
     [required]="true"
     [tooltip]="'configurationTitleTooltip' | pluginTranslate: pluginId | async"
     placeholder="Open Notificaties Plugin"
@@ -39,7 +38,6 @@
     [margin]="true"
     [disabled]="obs.disabled"
     [defaultValue]="obs.prefill?.clientId"
-    [widthPx]="350"
     [required]="true"
     [tooltip]="'clientIdTooltip' | pluginTranslate: pluginId | async"
     placeholder="client-id"
@@ -53,7 +51,6 @@
     [disabled]="obs.disabled"
     [defaultValue]="obs.prefill?.clientSecret"
     [required]="true"
-    [fullWidth]="true"
     [tooltip]="'clientSecretTooltip' | pluginTranslate: pluginId | async"
   >
   </v-input>
diff --git a/projects/valtimo/plugin/src/lib/plugins/notificaties-api/components/notificaties-api-configuration/notificaties-api-configuration.component.html b/projects/valtimo/plugin/src/lib/plugins/notificaties-api/components/notificaties-api-configuration/notificaties-api-configuration.component.html
index 52b9b806e..39829e17d 100644
--- a/projects/valtimo/plugin/src/lib/plugins/notificaties-api/components/notificaties-api-configuration/notificaties-api-configuration.component.html
+++ b/projects/valtimo/plugin/src/lib/plugins/notificaties-api/components/notificaties-api-configuration/notificaties-api-configuration.component.html
@@ -29,14 +29,12 @@
     [defaultValue]="obs.prefill?.configurationTitle"
     [required]="true"
     [tooltip]="'configurationTitleTooltip' | pluginTranslate: pluginId | async"
-    [widthPx]="350"
     placeholder="Notificaties API Plugin"
   >
   </v-input>
   <v-input
     name="url"
     [title]="'url' | pluginTranslate: pluginId | async"
-    [fullWidth]="true"
     [margin]="true"
     [disabled]="obs.disabled"
     [defaultValue]="obs.prefill?.url"
@@ -48,7 +46,6 @@
   <v-input
     name="callbackUrl"
     [title]="'callbackUrl' | pluginTranslate: pluginId | async"
-    [fullWidth]="true"
     [margin]="true"
     [disabled]="obs.disabled"
     [defaultValue]="obs.prefill?.callbackUrl"
@@ -63,7 +60,6 @@
     <v-select
       [items]="authObs.authenticationPluginSelectItems"
       [margin]="true"
-      [widthInPx]="350"
       name="authenticationPluginConfiguration"
       [title]="'authenticationPluginConfiguration' | pluginTranslate: pluginId | async"
       [disabled]="obs.disabled"
diff --git a/projects/valtimo/plugin/src/lib/plugins/object-token-authentication/components/object-token-authentication-configuration/object-token-authencation-configuration.component.html b/projects/valtimo/plugin/src/lib/plugins/object-token-authentication/components/object-token-authentication-configuration/object-token-authencation-configuration.component.html
index df9ccc597..1db625fcd 100644
--- a/projects/valtimo/plugin/src/lib/plugins/object-token-authentication/components/object-token-authentication-configuration/object-token-authencation-configuration.component.html
+++ b/projects/valtimo/plugin/src/lib/plugins/object-token-authentication/components/object-token-authentication-configuration/object-token-authencation-configuration.component.html
@@ -27,7 +27,6 @@
     [margin]="true"
     [disabled]="obs.disabled"
     [defaultValue]="obs.prefill?.configurationTitle"
-    [widthPx]="350"
     [required]="true"
     [tooltip]="'configurationTitleTooltip' | pluginTranslate: pluginId | async"
     placeholder="Object Token Authenticatie Plugin"
@@ -42,7 +41,6 @@
     [defaultValue]="obs.prefill?.clientId"
     [required]="true"
     [tooltip]="'tokenTooltip' | pluginTranslate: pluginId | async"
-    [fullWidth]="true"
   >
   </v-input>
 </v-form>
diff --git a/projects/valtimo/plugin/src/lib/plugins/objecten-api/components/objecten-api-configuration/objecten-api-configuration.component.html b/projects/valtimo/plugin/src/lib/plugins/objecten-api/components/objecten-api-configuration/objecten-api-configuration.component.html
index 9c64fac5b..fcf4ee671 100644
--- a/projects/valtimo/plugin/src/lib/plugins/objecten-api/components/objecten-api-configuration/objecten-api-configuration.component.html
+++ b/projects/valtimo/plugin/src/lib/plugins/objecten-api/components/objecten-api-configuration/objecten-api-configuration.component.html
@@ -29,14 +29,12 @@
     [defaultValue]="obs.prefill?.configurationTitle"
     [required]="true"
     [tooltip]="'configurationTitleTooltip' | pluginTranslate: pluginId | async"
-    [widthPx]="350"
     placeholder="Objecten API Plugin"
   >
   </v-input>
   <v-input
     name="url"
     [title]="'url' | pluginTranslate: pluginId | async"
-    [fullWidth]="true"
     [margin]="true"
     [disabled]="obs.disabled"
     [defaultValue]="obs.prefill?.url"
@@ -51,7 +49,6 @@
     <v-select
       [items]="authObs.authenticationPluginSelectItems"
       [margin]="true"
-      [widthInPx]="350"
       name="authenticationPluginConfiguration"
       [title]="'authenticationPluginConfiguration' | pluginTranslate: pluginId | async"
       [disabled]="obs.disabled"
diff --git a/projects/valtimo/plugin/src/lib/plugins/objecttypen-api/components/objecttypen-api-configuration/objecttypen-api-configuration.component.html b/projects/valtimo/plugin/src/lib/plugins/objecttypen-api/components/objecttypen-api-configuration/objecttypen-api-configuration.component.html
index bf2e4b27b..72e91a25c 100644
--- a/projects/valtimo/plugin/src/lib/plugins/objecttypen-api/components/objecttypen-api-configuration/objecttypen-api-configuration.component.html
+++ b/projects/valtimo/plugin/src/lib/plugins/objecttypen-api/components/objecttypen-api-configuration/objecttypen-api-configuration.component.html
@@ -29,14 +29,12 @@
     [defaultValue]="obs.prefill?.configurationTitle"
     [required]="true"
     [tooltip]="'configurationTitleTooltip' | pluginTranslate: pluginId | async"
-    [widthPx]="350"
     placeholder="Objecttypen API Plugin"
   >
   </v-input>
   <v-input
     name="url"
     [title]="'url' | pluginTranslate: pluginId | async"
-    [fullWidth]="true"
     [margin]="true"
     [disabled]="obs.disabled"
     [defaultValue]="obs.prefill?.url"
@@ -51,7 +49,6 @@
     <v-select
       [items]="authObs.authenticationPluginSelectItems"
       [margin]="true"
-      [widthInPx]="350"
       name="authenticationPluginConfiguration"
       [title]="'authenticationPluginConfiguration' | pluginTranslate: pluginId | async"
       [disabled]="obs.disabled"
diff --git a/projects/valtimo/plugin/src/lib/plugins/open-zaak/components/open-zaak-configuration/open-zaak-configuration.component.html b/projects/valtimo/plugin/src/lib/plugins/open-zaak/components/open-zaak-configuration/open-zaak-configuration.component.html
index 819cb777f..2989753cf 100644
--- a/projects/valtimo/plugin/src/lib/plugins/open-zaak/components/open-zaak-configuration/open-zaak-configuration.component.html
+++ b/projects/valtimo/plugin/src/lib/plugins/open-zaak/components/open-zaak-configuration/open-zaak-configuration.component.html
@@ -27,7 +27,6 @@
     [margin]="true"
     [disabled]="obs.disabled"
     [defaultValue]="obs.prefill?.configurationTitle"
-    [widthPx]="350"
     [required]="true"
     [tooltip]="'configurationTitleTooltip' | pluginTranslate: pluginId | async"
     placeholder="OpenZaak Plugin"
@@ -39,7 +38,6 @@
     [margin]="true"
     [disabled]="obs.disabled"
     [defaultValue]="obs.prefill?.clientId"
-    [widthPx]="350"
     [required]="true"
     [tooltip]="'clientIdTooltip' | pluginTranslate: pluginId | async"
     placeholder="client-id"
@@ -53,7 +51,6 @@
     [disabled]="obs.disabled"
     [defaultValue]="obs.prefill?.clientSecret"
     [required]="true"
-    [fullWidth]="true"
     [tooltip]="'clientSecretTooltip' | pluginTranslate: pluginId | async"
     placeholder=""
   >
diff --git a/projects/valtimo/plugin/src/lib/plugins/portaaltaak/components/portaaltaak-configuration/portaaltaak-configuration.component.html b/projects/valtimo/plugin/src/lib/plugins/portaaltaak/components/portaaltaak-configuration/portaaltaak-configuration.component.html
index 0d0c23987..b05090b5c 100644
--- a/projects/valtimo/plugin/src/lib/plugins/portaaltaak/components/portaaltaak-configuration/portaaltaak-configuration.component.html
+++ b/projects/valtimo/plugin/src/lib/plugins/portaaltaak/components/portaaltaak-configuration/portaaltaak-configuration.component.html
@@ -29,7 +29,6 @@
     [defaultValue]="obs.prefill?.configurationTitle"
     [required]="true"
     [tooltip]="'configurationTitleTooltip' | pluginTranslate: pluginId | async"
-    [widthPx]="350"
     placeholder="Portaaltaak Plugin"
   >
   </v-input>
@@ -39,7 +38,6 @@
     <v-select
       [items]="notificatiesApiPluginSelectItems"
       [margin]="true"
-      [widthInPx]="350"
       name="notificatiesApiPluginConfiguration"
       [title]="'notificatiesApiPluginConfiguration' | pluginTranslate: pluginId | async"
       [disabled]="obs.disabled"
@@ -55,7 +53,6 @@
     <v-select
       [items]="objectManagementConfigurationItems"
       [margin]="true"
-      [widthInPx]="350"
       name="objectManagementConfigurationId"
       [title]="'objectManagementConfiguration' | pluginTranslate: pluginId | async"
       [disabled]="obs.disabled"
@@ -69,7 +66,6 @@
     <v-select
       [items]="vars.processSelectItems"
       [margin]="true"
-      [widthInPx]="350"
       name="completeTaakProcess"
       [title]="'completeTaakProcess' | pluginTranslate: pluginId | async"
       [disabled]="obs.disabled"
diff --git a/projects/valtimo/plugin/src/lib/plugins/smart-documents/components/smart-documents-configuration/smart-documents-configuration.component.html b/projects/valtimo/plugin/src/lib/plugins/smart-documents/components/smart-documents-configuration/smart-documents-configuration.component.html
index ea72c87fd..69e456538 100644
--- a/projects/valtimo/plugin/src/lib/plugins/smart-documents/components/smart-documents-configuration/smart-documents-configuration.component.html
+++ b/projects/valtimo/plugin/src/lib/plugins/smart-documents/components/smart-documents-configuration/smart-documents-configuration.component.html
@@ -28,7 +28,6 @@
     [disabled]="obs.disabled"
     [defaultValue]="obs.prefill?.configurationTitle"
     [required]="true"
-    [widthPx]="350"
     [tooltip]="'configurationTitleTooltip' | pluginTranslate: pluginId | async"
     placeholder="Smart Documents Plugin"
   >
@@ -36,7 +35,6 @@
   <v-input
     name="url"
     [title]="'url' | pluginTranslate: pluginId | async"
-    [fullWidth]="true"
     [margin]="true"
     [disabled]="obs.disabled"
     [defaultValue]="obs.prefill?.url"
@@ -51,7 +49,6 @@
     [disabled]="obs.disabled"
     [defaultValue]="obs.prefill?.username"
     [required]="true"
-    [widthPx]="350"
     placeholder=""
   >
   </v-input>
@@ -63,7 +60,6 @@
     [disabled]="obs.disabled"
     [defaultValue]="obs.prefill?.password"
     [required]="true"
-    [widthPx]="350"
   >
   </v-input>
 </v-form>
diff --git a/projects/valtimo/plugin/src/lib/plugins/verzoek/components/verzoek-configuration/verzoek-configuration.component.html b/projects/valtimo/plugin/src/lib/plugins/verzoek/components/verzoek-configuration/verzoek-configuration.component.html
index 35868f0f5..28d9e1d7f 100644
--- a/projects/valtimo/plugin/src/lib/plugins/verzoek/components/verzoek-configuration/verzoek-configuration.component.html
+++ b/projects/valtimo/plugin/src/lib/plugins/verzoek/components/verzoek-configuration/verzoek-configuration.component.html
@@ -29,7 +29,6 @@
     [defaultValue]="obs.prefill?.configurationTitle"
     [required]="true"
     [tooltip]="'configurationTitleTooltip' | pluginTranslate: pluginId | async"
-    [widthPx]="350"
     placeholder="Verzoek Plugin"
   >
   </v-input>
@@ -39,7 +38,6 @@
     <v-select
       [items]="vars.notificatiePluginSelectItems"
       [margin]="true"
-      [widthInPx]="350"
       name="notificatiesApiPluginConfiguration"
       [title]="'notificatiesApiPluginConfiguration' | pluginTranslate: pluginId | async"
       [disabled]="obs.disabled"
@@ -53,7 +51,6 @@
     <v-select
       [items]="vars.processSelectItems"
       [margin]="true"
-      [widthInPx]="350"
       name="processToStart"
       [title]="'processToStart' | pluginTranslate: pluginId | async"
       [disabled]="obs.disabled"
@@ -71,7 +68,6 @@
     [defaultValue]="obs.prefill?.rsin"
     [required]="true"
     [tooltip]="'rsinTooltip' | pluginTranslate: pluginId | async"
-    [widthPx]="350"
     placeholder=""
   >
   </v-input>
@@ -111,7 +107,6 @@
         [defaultValue]="prefill?.type"
         [required]="true"
         [tooltip]="'typeTooltip' | pluginTranslate: pluginId | async"
-        [widthPx]="350"
         [smallMargin]="true"
         placeholder=""
       >
@@ -120,7 +115,6 @@
         <v-select
           [items]="vars.documentSelectItems"
           [smallMargin]="true"
-          [widthInPx]="350"
           name="caseDefinitionName"
           [title]="'caseDefinitionName' | pluginTranslate: pluginId | async"
           [disabled]="obs.disabled"
@@ -136,7 +130,6 @@
         <v-select
           [items]="vars.objectManagementSelectItems"
           [smallMargin]="true"
-          [widthInPx]="350"
           name="objectManagementId"
           [title]="'objectManagementId' | pluginTranslate: pluginId | async"
           [disabled]="obs.disabled"
@@ -152,7 +145,6 @@
           (rolTypeSelectItemsObservables[uuid].items | async)
         "
         [smallMargin]="true"
-        [widthInPx]="350"
         name="initiatorRoltypeUrl"
         [title]="'initiatorRoltypeUrl' | pluginTranslate: pluginId | async"
         [disabled]="obs.disabled || !rolTypeSelectItemsObservables[uuid]?.caseDefinitionName"
@@ -168,7 +160,6 @@
         [defaultValue]="prefill?.initiatorRolDescription || 'Initiator'"
         [required]="true"
         [tooltip]="'initiatorRolDescriptionTooltip' | pluginTranslate: pluginId | async"
-        [widthPx]="350"
         [smallMargin]="true"
         placeholder=""
       >
@@ -177,7 +168,6 @@
         <v-select
           [items]="vars.processSelectItems"
           [smallMargin]="true"
-          [widthInPx]="350"
           name="processDefinitionKey"
           [title]="'processDefinitionKey' | pluginTranslate: pluginId | async"
           [disabled]="obs.disabled"
@@ -231,7 +221,6 @@ <h3 cdsModalHeaderHeading>{{ 'setMapping' | pluginTranslate: pluginId | async }}
             [defaultValues]="mappings[uuid] || prefill?.mapping"
             [valueColumnTitle]="'target' | pluginTranslate: pluginId | async"
             [keyColumnTitle]="'source' | pluginTranslate: pluginId | async"
-            [fullWidth]="true"
           ></valtimo-carbon-multi-input>
         </div>
       </section>
diff --git a/projects/valtimo/plugin/src/lib/plugins/zaken-api/components/zaken-api-configuration/zaken-api-configuration.component.html b/projects/valtimo/plugin/src/lib/plugins/zaken-api/components/zaken-api-configuration/zaken-api-configuration.component.html
index d907f994f..78e18651e 100644
--- a/projects/valtimo/plugin/src/lib/plugins/zaken-api/components/zaken-api-configuration/zaken-api-configuration.component.html
+++ b/projects/valtimo/plugin/src/lib/plugins/zaken-api/components/zaken-api-configuration/zaken-api-configuration.component.html
@@ -29,14 +29,12 @@
     [defaultValue]="obs.prefill?.configurationTitle"
     [required]="true"
     [tooltip]="'configurationTitleTooltip' | pluginTranslate: pluginId | async"
-    [widthPx]="350"
     placeholder="Zaken API Plugin"
   >
   </v-input>
   <v-input
     name="url"
     [title]="'url' | pluginTranslate: pluginId | async"
-    [fullWidth]="true"
     [margin]="true"
     [disabled]="obs.disabled"
     [defaultValue]="obs.prefill?.url"
@@ -52,7 +50,6 @@
       [loading]="!authObs.authenticationPluginSelectItems"
       [items]="authObs.authenticationPluginSelectItems"
       [margin]="true"
-      [widthInPx]="350"
       name="authenticationPluginConfiguration"
       [title]="'authenticationPluginConfiguration' | pluginTranslate: pluginId | async"
       [disabled]="obs.disabled"