diff --git a/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/configure-certificate-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/configure-certificate-dialog.component.ts
index bbb6c2ba8..fdae0aaaa 100644
--- a/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/configure-certificate-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/configure-certificate-dialog.component.ts
@@ -1,6 +1,6 @@
 import { ChangeDetectorRef, Component, Injector, ViewChild } from '@angular/core';
 import { digitalSignatureDialogTranslations } from '../../translations/digital-signature-dialog-translations';
-import { BaseDialogComponent, LoadingService, Toaster } from '../../../../../../../../libs/common-ui/src';
+import { BaseDialogComponent, LoadingService, Toaster } from '@iqser/common-ui';
 import { MatDialogRef } from '@angular/material/dialog';
 import { PkcsSignatureConfigurationComponent } from './form/pkcs-signature-configuration/pkcs-signature-configuration.component';
 import { KmsSignatureConfigurationComponent } from './form/kms-signature-configuration/kms-signature-configuration.component';
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/form/kms-signature-configuration/kms-signature-configuration.component.html b/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/form/kms-signature-configuration/kms-signature-configuration.component.html
index 32c5ee3ab..2733c4799 100644
--- a/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/form/kms-signature-configuration/kms-signature-configuration.component.html
+++ b/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/form/kms-signature-configuration/kms-signature-configuration.component.html
@@ -1,7 +1,14 @@
 <iqser-upload-file accept=".pem" (fileChanged)="addRemoveCertificate($event)"></iqser-upload-file>
 <form [formGroup]="form">
     <div class="flex">
-        <div class="flex fields-container">
+        <div class="flex fields-container" [class.full-width]="!file">
+            <iqser-upload-file
+                accept=".p12"
+                [file]="file"
+                [readonly]="!!file"
+                (fileChanged)="addRemoveCertificate($event)"
+            ></iqser-upload-file>
+
             <div class="iqser-input-group required w-300">
                 <label translate="digital-signature-dialog.forms.kms.certificate-name"></label>
                 <input formControlName="certificateName" type="text" />
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/form/kms-signature-configuration/kms-signature-configuration.component.scss b/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/form/kms-signature-configuration/kms-signature-configuration.component.scss
index 9b54c29df..8bc5184e4 100644
--- a/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/form/kms-signature-configuration/kms-signature-configuration.component.scss
+++ b/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/form/kms-signature-configuration/kms-signature-configuration.component.scss
@@ -7,6 +7,11 @@
     }
 }
 
+.full-width {
+    width: 100%;
+    margin-right: 0;
+}
+
 iqser-upload-file {
     display: block;
     margin-top: 24px;
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/form/kms-signature-configuration/kms-signature-configuration.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/form/kms-signature-configuration/kms-signature-configuration.component.ts
index 1c6a29161..f628e488e 100644
--- a/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/form/kms-signature-configuration/kms-signature-configuration.component.ts
+++ b/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/form/kms-signature-configuration/kms-signature-configuration.component.ts
@@ -1,8 +1,7 @@
 import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core';
 import { FormBuilder, Validators } from '@angular/forms';
 import { BaseSignatureConfigurationComponent } from '../base-signature-configuration-component';
-import { IKmsDigitalSignature, IPkcsDigitalSignature } from '../../../../../../../../../../libs/red-domain/src';
-import { lastIndexOfEnd } from '../../../../../../utils';
+import { IKmsDigitalSignature } from '@red/domain';
 import { firstValueFrom } from 'rxjs';
 import { DigitalSignatureService } from '../../../../services/digital-signature.service';
 
@@ -34,10 +33,10 @@ export class KmsSignatureConfigurationComponent extends BaseSignatureConfigurati
         this.file = this.generateFile(this.digitalSignature?.certificateName, '.pem');
     }
 
-    async save() {
+    save() {
         const formValue = this.form.getRawValue();
         const digitalSignature: IKmsDigitalSignature = { ...formValue };
 
-        return await firstValueFrom(this._digitalSignatureService.saveKmsSignature(digitalSignature));
+        return firstValueFrom(this._digitalSignatureService.saveKmsSignature(digitalSignature));
     }
 }
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/form/pkcs-signature-configuration/pkcs-signature-configuration.component.html b/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/form/pkcs-signature-configuration/pkcs-signature-configuration.component.html
index 246e00946..b97ca884a 100644
--- a/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/form/pkcs-signature-configuration/pkcs-signature-configuration.component.html
+++ b/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/form/pkcs-signature-configuration/pkcs-signature-configuration.component.html
@@ -1,7 +1,13 @@
-<iqser-upload-file accept=".p12" [file]="file" [readonly]="!!file" (fileChanged)="addRemoveCertificate($event)"></iqser-upload-file>
 <form [formGroup]="form">
     <div class="flex">
-        <div class="flex fields-container">
+        <div class="flex fields-container" [class.full-width]="!file">
+            <iqser-upload-file
+                accept=".p12"
+                [file]="file"
+                [readonly]="!!file"
+                (fileChanged)="addRemoveCertificate($event)"
+            ></iqser-upload-file>
+
             <div class="iqser-input-group required w-300">
                 <label translate="digital-signature-dialog.forms.pkcs.certificate-name"></label>
                 <input formControlName="certificateName" type="text" />
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/form/pkcs-signature-configuration/pkcs-signature-configuration.component.scss b/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/form/pkcs-signature-configuration/pkcs-signature-configuration.component.scss
index e821f1e30..eedff7d5e 100644
--- a/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/form/pkcs-signature-configuration/pkcs-signature-configuration.component.scss
+++ b/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/form/pkcs-signature-configuration/pkcs-signature-configuration.component.scss
@@ -2,6 +2,11 @@ textarea {
     resize: none;
 }
 
+.full-width {
+    width: 100%;
+    margin-right: 0;
+}
+
 iqser-upload-file {
     display: block;
     margin-top: 24px;
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/form/pkcs-signature-configuration/pkcs-signature-configuration.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/form/pkcs-signature-configuration/pkcs-signature-configuration.component.ts
index 3559ddf26..695cfe053 100644
--- a/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/form/pkcs-signature-configuration/pkcs-signature-configuration.component.ts
+++ b/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/form/pkcs-signature-configuration/pkcs-signature-configuration.component.ts
@@ -1,10 +1,8 @@
 import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core';
-import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { FormBuilder, Validators } from '@angular/forms';
 import { BaseSignatureConfigurationComponent } from '../base-signature-configuration-component';
-import { lastIndexOfEnd } from '../../../../../../utils';
-import { IPkcsDigitalSignature } from '../../../../../../../../../../libs/red-domain/src';
+import { IPkcsDigitalSignature } from '@red/domain';
 import { firstValueFrom } from 'rxjs';
-import { LoadingService } from '../../../../../../../../../../libs/common-ui/src';
 import { DigitalSignatureService } from '../../../../services/digital-signature.service';
 
 @Component({
@@ -32,12 +30,13 @@ export class PkcsSignatureConfigurationComponent extends BaseSignatureConfigurat
         });
         this.initialFormValue = this.form.getRawValue();
         this.file = this.generateFile(this.digitalSignature?.certificateName, '.p12');
+        console.log(!this.digitalSignature);
     }
 
-    async save() {
+    save() {
         const formValue = this.form.getRawValue();
         const digitalSignature: IPkcsDigitalSignature = { ...formValue };
 
-        return await firstValueFrom(this._digitalSignatureService.saveSignature(digitalSignature));
+        return firstValueFrom(this._digitalSignatureService.saveSignature(digitalSignature));
     }
 }
diff --git a/apps/red-ui/src/app/modules/admin/screens/digital-signature/digital-signature-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/digital-signature/digital-signature-screen.component.ts
index 710669630..e35d46ed8 100644
--- a/apps/red-ui/src/app/modules/admin/screens/digital-signature/digital-signature-screen.component.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/digital-signature/digital-signature-screen.component.ts
@@ -8,8 +8,7 @@ import { firstValueFrom } from 'rxjs';
 import { AdminDialogService } from '../../services/admin-dialog.service';
 import { PkcsSignatureConfigurationComponent } from '../../dialogs/configure-digital-signature-dialog/form/pkcs-signature-configuration/pkcs-signature-configuration.component';
 import { KmsSignatureConfigurationComponent } from '../../dialogs/configure-digital-signature-dialog/form/kms-signature-configuration/kms-signature-configuration.component';
-import { IKmsDigitalSignatureRequest, IPkcsDigitalSignatureRequest } from '../../../../../../../../libs/red-domain/src';
-import { HttpStatusCode } from '@angular/common/http';
+import { IKmsDigitalSignatureRequest, IPkcsDigitalSignatureRequest } from '@red/domain';
 
 export enum CertificateType {
     PKCS = 'pkcs',
diff --git a/apps/red-ui/src/app/modules/shared/shared.module.ts b/apps/red-ui/src/app/modules/shared/shared.module.ts
index cf765e133..4dbf5004b 100644
--- a/apps/red-ui/src/app/modules/shared/shared.module.ts
+++ b/apps/red-ui/src/app/modules/shared/shared.module.ts
@@ -30,7 +30,6 @@ import { FileStatsComponent } from './components/file-stats/file-stats.component
 import { FileNameColumnComponent } from '@shared/components/file-name-column/file-name-column.component';
 import { DossierNameColumnComponent } from '@shared/components/dossier-name-column/dossier-name-column.component';
 import { MAT_DATE_FORMATS } from '@angular/material/core';
-import { DragDropFileUploadDirective } from '../../../../../../libs/common-ui/src/lib/upload-file/drag-drop-file-upload.directive';
 import { DossiersTypeSwitchComponent } from '@shared/components/dossiers-type-switch/dossiers-type-switch.component';
 import { TranslateModule } from '@ngx-translate/core';
 import { RouterModule } from '@angular/router';