diff --git a/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/configure-certificate-dialog.component.html b/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/configure-certificate-dialog.component.html
index a66270114..2829a491b 100644
--- a/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/configure-certificate-dialog.component.html
+++ b/apps/red-ui/src/app/modules/admin/dialogs/configure-digital-signature-dialog/configure-certificate-dialog.component.html
@@ -23,20 +23,28 @@
     <div class="dialog-actions">
         <ng-container *ngIf="!isInConfiguration">
             <iqser-icon-button
+                buttonId="configure-digital-certificate-modal-continue-btn"
                 (action)="toggleIsInConfiguration()"
                 [label]="'digital-signature-dialog.actions.continue' | translate"
                 [type]="iconButtonTypes.primary"
             ></iqser-icon-button>
-            <div [translate]="'digital-signature-dialog.actions.cancel'" class="all-caps-label cancel" mat-dialog-close></div>
+            <div
+                id="configure-digital-certificate-modal-cancel-btn"
+                [translate]="'digital-signature-dialog.actions.cancel'"
+                class="all-caps-label cancel"
+                mat-dialog-close
+            ></div>
         </ng-container>
         <ng-container *ngIf="isInConfiguration">
             <iqser-icon-button
+                buttonId="configure-digital-certificate-modal-save-btn"
                 (action)="save()"
                 [disabled]="disabled"
                 [label]="'digital-signature-dialog.actions.save' | translate"
                 [type]="iconButtonTypes.primary"
             ></iqser-icon-button>
             <div
+                id="configure-digital-certificate-modal-back-btn"
                 (click)="toggleIsInConfiguration()"
                 [translate]="'digital-signature-dialog.actions.back'"
                 class="all-caps-label cancel"
@@ -44,5 +52,10 @@
         </ng-container>
     </div>
 
-    <iqser-circle-button (action)="close()" class="dialog-close" icon="iqser:close"></iqser-circle-button>
+    <iqser-circle-button
+        buttonId="configure-digital-certificate-modal-close-btn"
+        (action)="close()"
+        class="dialog-close"
+        icon="iqser:close"
+    ></iqser-circle-button>
 </section>
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 428970caf..8029c5ec0 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
@@ -26,11 +26,13 @@ export class ConfigureCertificateDialogComponent extends BaseDialogComponent {
             label: _('digital-signature-dialog.options.pkcs.label'),
             value: DigitalSignatureOptions.PKCS,
             description: _('digital-signature-dialog.options.pkcs.description'),
+            id: 'pkcs-option',
         },
         {
             label: _('digital-signature-dialog.options.kms.label'),
             value: DigitalSignatureOptions.KMS,
             description: _('digital-signature-dialog.options.kms.description'),
+            id: 'kms-option',
         },
     ];
 
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 966b7cf6a..c695302b7 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
@@ -6,34 +6,34 @@
         <div class="flex fields-container">
             <div class="iqser-input-group required w-300">
                 <label [translate]="'digital-signature-dialog.forms.kms.certificate-name'"></label>
-                <input formControlName="certificateName" type="text" />
+                <input id="certificate-name-input" formControlName="certificateName" type="text" />
             </div>
             <div class="iqser-input-group required w-300">
                 <label [translate]="'digital-signature-dialog.forms.kms.kms-service-endpoint'"></label>
-                <input formControlName="kmsServiceEndpoint" type="text" />
+                <input id="certificate-kms-service-endpoint-input" formControlName="kmsServiceEndpoint" type="text" />
             </div>
             <div class="iqser-input-group required w-300">
                 <label [translate]="'digital-signature-dialog.forms.kms.kms-region'"></label>
-                <input formControlName="kmsRegion" type="text" />
+                <input id="certificate-kms-region-input" formControlName="kmsRegion" type="text" />
             </div>
             <div class="iqser-input-group required w-300">
                 <label [translate]="'digital-signature-dialog.forms.kms.kms-id'"></label>
-                <input formControlName="kmsKeyId" type="text" />
+                <input id="certificate-kms-id-input" formControlName="kmsKeyId" type="text" />
             </div>
             <div class="iqser-input-group required w-300">
                 <label [translate]="'digital-signature-dialog.forms.kms.kms-access-key'"></label>
-                <input formControlName="kmsAccessKey" type="text" />
+                <input id="certificate-kms-access-key-input" formControlName="kmsAccessKey" type="text" />
             </div>
             <div *ngIf="!digitalSignature" class="iqser-input-group required w-300">
                 <label [translate]="'digital-signature-dialog.forms.kms.kms-secret-key'"></label>
-                <input formControlName="kmsSecretKey" type="text" />
+                <input id="certificate-kms-secret-input" formControlName="kmsSecretKey" type="text" />
             </div>
         </div>
 
         <div *ngIf="!digitalSignature" class="flex fields-container">
             <div class="iqser-input-group required w-400 certificate">
                 <label [translate]="'digital-signature-dialog.forms.kms.certificate-content'"></label>
-                <textarea formControlName="certificate" type="text"></textarea>
+                <textarea id="certificate-content-input" formControlName="certificate" type="text"></textarea>
             </div>
         </div>
     </div>
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 aac37ce1d..49514c66a 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
@@ -10,23 +10,23 @@
         <div class="flex fields-container">
             <div class="iqser-input-group required w-300">
                 <label [translate]="'digital-signature-dialog.forms.pkcs.certificate-name'"></label>
-                <input formControlName="certificateName" type="text" />
+                <input id="certificate-name-input" formControlName="certificateName" type="text" />
             </div>
             <div *ngIf="!digitalSignature" class="iqser-input-group required w-300">
                 <label [translate]="'digital-signature-dialog.forms.pkcs.password-key'"></label>
-                <input formControlName="password" type="password" />
+                <input id="certificate-password-input" formControlName="password" type="password" />
             </div>
             <div class="iqser-input-group w-300">
                 <label [translate]="'digital-signature-dialog.forms.pkcs.contact-information'"></label>
-                <input formControlName="contactInfo" type="text" />
+                <input id="certificate-contact-info-input" formControlName="contactInfo" type="text" />
             </div>
             <div class="iqser-input-group w-300">
                 <label [translate]="'digital-signature-dialog.forms.pkcs.location'"></label>
-                <input formControlName="location" type="text" />
+                <input id="certificate-location-input" formControlName="location" type="text" />
             </div>
             <div class="iqser-input-group w-450">
                 <label [translate]="'digital-signature-dialog.forms.pkcs.reason'"></label>
-                <textarea formControlName="reason" rows="4" type="text"></textarea>
+                <textarea id="certificate-location-input" formControlName="reason" rows="4" type="text"></textarea>
             </div>
         </div>
     </div>
diff --git a/apps/red-ui/src/app/modules/admin/screens/digital-signature/digital-signature-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/digital-signature/digital-signature-screen.component.html
index 913feb8d7..8ffc6720d 100644
--- a/apps/red-ui/src/app/modules/admin/screens/digital-signature/digital-signature-screen.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/digital-signature/digital-signature-screen.component.html
@@ -15,6 +15,7 @@
             [showButton]="permissionsService.has$(roles.digitalSignature.write) | async"
             [text]="'digital-signature-screen.no-data.title' | translate"
             icon="iqser:document"
+            buttonId="configure-certificate-btn"
         ></iqser-empty-state>
 
         <ng-container *ngIf="digitalSignature">
diff --git a/libs/common-ui b/libs/common-ui
index 03eedf10c..1fda6967b 160000
--- a/libs/common-ui
+++ b/libs/common-ui
@@ -1 +1 @@
-Subproject commit 03eedf10c842c6663175789268ec9f4084237571
+Subproject commit 1fda6967b1002a7110a117d376d0d5f3793c7598