diff --git a/src/portal/lib/src/config/system/system-settings.component.html b/src/portal/lib/src/config/system/system-settings.component.html
index 82f83f024..72b9458f6 100644
--- a/src/portal/lib/src/config/system/system-settings.component.html
+++ b/src/portal/lib/src/config/system/system-settings.component.html
@@ -95,7 +95,7 @@
                 <div class="clr-row width-70per">
                     <div class="clr-col position-relative">
                         <div>
-                            <button (click)="showAddModal=!showAddModal"
+                            <button id="show-add-modal-button" (click)="showAddModal=!showAddModal"
                                     class="btn btn-link">{{'CVE_WHITELIST.ADD'|translate}}</button>
                         </div>
                         <div class="add-modal" *ngIf="showAddModal">
@@ -103,13 +103,13 @@
                             <div>
                                 <clr-textarea-container>
                                     <label>{{'CVE_WHITELIST.ENTER'|translate}}</label>
-                                    <textarea class="w-100 font-italic" clrTextarea [(ngModel)]="cveIds"
+                                    <textarea id="whitelist-textarea" class="w-100 font-italic" clrTextarea [(ngModel)]="cveIds"
                                               name="cveIds"></textarea>
                                     <clr-control-helper>{{'CVE_WHITELIST.HELP'|translate}}</clr-control-helper>
                                 </clr-textarea-container>
                             </div>
                             <div>
-                                <button [disabled]="isDisabled()" (click)="addToSystemWhitelist()"
+                                <button id="add-to-system" [disabled]="isDisabled()" (click)="addToSystemWhitelist()"
                                         class="btn btn-link">{{'CVE_WHITELIST.ADD'|translate}}</button>
                             </div>
                         </div>
diff --git a/src/portal/lib/src/project-policy-config/project-policy-config.component.html b/src/portal/lib/src/project-policy-config/project-policy-config.component.html
index 01df1bbba..8d5e69f81 100644
--- a/src/portal/lib/src/project-policy-config/project-policy-config.component.html
+++ b/src/portal/lib/src/project-policy-config/project-policy-config.component.html
@@ -89,12 +89,12 @@
                 </div>
                 <clr-radio-container clrInline>
                     <clr-radio-wrapper>
-                        <input [disabled]="!hasChangeConfigRole" type="radio" clrRadio name="systemWhitelistOrProjectWhitelist" required value="true"
+                        <input id="use-system" [disabled]="!hasChangeConfigRole" type="radio" clrRadio name="systemWhitelistOrProjectWhitelist" required value="true"
                                [(ngModel)]="systemWhitelistOrProjectWhitelist"/>
                         <label>{{'CVE_WHITELIST.SYS_WHITELIST'|translate}}</label>
                     </clr-radio-wrapper>
                     <clr-radio-wrapper>
-                        <input [disabled]="!hasChangeConfigRole" type="radio" clrRadio name="systemWhitelistOrProjectWhitelist" required value="false"
+                        <input id="use-project" [disabled]="!hasChangeConfigRole" type="radio" clrRadio name="systemWhitelistOrProjectWhitelist" required value="false"
                                [(ngModel)]="systemWhitelistOrProjectWhitelist"/>
                         <label>{{'CVE_WHITELIST.PRO_WHITELIST'|translate}}</label>
                     </clr-radio-wrapper>
@@ -102,10 +102,10 @@
                 <div class="clr-row width-70per">
                     <div class="clr-col position-relative">
                         <div>
-                            <button [disabled]="isUseSystemWhitelist() || !hasChangeConfigRole"
+                            <button id="show-add-modal" [disabled]="isUseSystemWhitelist() || !hasChangeConfigRole"
                                     (click)="showAddModal=!showAddModal"
                                     class="btn btn-link">{{'CVE_WHITELIST.ADD'|translate}}</button>
-                            <button [disabled]="isUseSystemWhitelist() || !hasChangeConfigRole" (click)="addSystem()"
+                            <button id="add-system" [disabled]="isUseSystemWhitelist() || !hasChangeConfigRole" (click)="addSystem()"
                                     class="btn btn-link ml-1">{{'CVE_WHITELIST.ADD_SYSTEM'|translate}}</button>
                         </div>
                         <div class="add-modal" *ngIf="showAddModal && !isUseSystemWhitelist()">
@@ -113,12 +113,12 @@
                             <div>
                                 <clr-textarea-container>
                                     <label>{{'CVE_WHITELIST.ENTER'|translate}}</label>
-                                    <textarea class="w-100" clrTextarea [(ngModel)]="cveIds" name="cveIds"></textarea>
+                                    <textarea id="whitelist-textarea" class="w-100" clrTextarea [(ngModel)]="cveIds" name="cveIds"></textarea>
                                     <clr-control-helper>{{'CVE_WHITELIST.HELP'|translate}}</clr-control-helper>
                                 </clr-textarea-container>
                             </div>
                             <div>
-                                <button [disabled]="isDisabled()" (click)="addToProjectWhitelist()"
+                                <button id="add-to-whitelist" [disabled]="isDisabled()" (click)="addToProjectWhitelist()"
                                         class="btn btn-link">{{'CVE_WHITELIST.ADD'|translate}}</button>
                             </div>
                         </div>
diff --git a/src/portal/src/i18n/lang/en-us-lang.json b/src/portal/src/i18n/lang/en-us-lang.json
index 82eb7df78..53e369b58 100644
--- a/src/portal/src/i18n/lang/en-us-lang.json
+++ b/src/portal/src/i18n/lang/en-us-lang.json
@@ -1124,8 +1124,8 @@
         "EXPIRES_AT": "Expires at",
         "NEVER_EXPIRES": "Never expires",
         "PRO_WHITELIST_EXPLAIN": "Project whitelist allows vulnerabilities in this list to be ignored in this project when pushing and pulling images.",
-        "PRO_OR_SYS": "Use the system whitelist as is or select “Project whitelist” to create a new whitelist.",
-        "MERGE_INTO": "Merge the system whitelist into this project, add individual CVE IDs.",
+        "PRO_OR_SYS": "You can either use the default whitelist configured at the system level or click on 'Project whitelist' to create a new whitelist",
+        "MERGE_INTO": "Add individual CVE IDs before clicking 'ADD SYSTEM' to add system whitelist as well.",
         "SYS_WHITELIST": "System whitelist",
         "PRO_WHITELIST": "Project whitelist",
         "ADD_SYSTEM": "ADD SYSTEM"
diff --git a/src/portal/src/i18n/lang/es-es-lang.json b/src/portal/src/i18n/lang/es-es-lang.json
index 2c9c5e02e..78be3a7cb 100644
--- a/src/portal/src/i18n/lang/es-es-lang.json
+++ b/src/portal/src/i18n/lang/es-es-lang.json
@@ -1121,8 +1121,8 @@
         "EXPIRES_AT": "Expires at",
         "NEVER_EXPIRES": "Never expires",
         "PRO_WHITELIST_EXPLAIN": "Project whitelist allows vulnerabilities in this list to be ignored in this project when pushing and pulling images.",
-        "PRO_OR_SYS": "Use the system whitelist as is or select “Project whitelist” to create a new whitelist.",
-        "MERGE_INTO": "Merge the system whitelist into this project, add individual CVE IDs.",
+        "PRO_OR_SYS": "You can either use the default whitelist configured at the system level or click on 'Project whitelist' to create a new whitelist",
+        "MERGE_INTO": "Add individual CVE IDs before clicking 'ADD SYSTEM' to add system whitelist as well.",
         "SYS_WHITELIST": "System whitelist",
         "PRO_WHITELIST": "Project whitelist",
         "ADD_SYSTEM": "ADD SYSTEM"
diff --git a/src/portal/src/i18n/lang/fr-fr-lang.json b/src/portal/src/i18n/lang/fr-fr-lang.json
index bd948d912..33a1ffb99 100644
--- a/src/portal/src/i18n/lang/fr-fr-lang.json
+++ b/src/portal/src/i18n/lang/fr-fr-lang.json
@@ -1093,8 +1093,8 @@
         "EXPIRES_AT": "Expires at",
         "NEVER_EXPIRES": "Never expires",
         "PRO_WHITELIST_EXPLAIN": "Project whitelist allows vulnerabilities in this list to be ignored in this project when pushing and pulling images.",
-        "PRO_OR_SYS": "Use the system whitelist as is or select “Project whitelist” to create a new whitelist.",
-        "MERGE_INTO": "Merge the system whitelist into this project, add individual CVE IDs.",
+        "PRO_OR_SYS": "You can either use the default whitelist configured at the system level or click on 'Project whitelist' to create a new whitelist",
+        "MERGE_INTO": "Add individual CVE IDs before clicking 'ADD SYSTEM' to add system whitelist as well.",
         "SYS_WHITELIST": "System whitelist",
         "PRO_WHITELIST": "Project whitelist",
         "ADD_SYSTEM": "ADD SYSTEM"
diff --git a/src/portal/src/i18n/lang/pt-br-lang.json b/src/portal/src/i18n/lang/pt-br-lang.json
index 3ecec7b91..37d3db8db 100644
--- a/src/portal/src/i18n/lang/pt-br-lang.json
+++ b/src/portal/src/i18n/lang/pt-br-lang.json
@@ -1118,8 +1118,8 @@
         "EXPIRES_AT": "Expires at",
         "NEVER_EXPIRES": "Never expires",
         "PRO_WHITELIST_EXPLAIN": "Project whitelist allows vulnerabilities in this list to be ignored in this project when pushing and pulling images.",
-        "PRO_OR_SYS": "Use the system whitelist as is or select “Project whitelist” to create a new whitelist.",
-        "MERGE_INTO": "Merge the system whitelist into this project, add individual CVE IDs.",
+        "PRO_OR_SYS": "You can either use the default whitelist configured at the system level or click on 'Project whitelist' to create a new whitelist",
+        "MERGE_INTO": "Add individual CVE IDs before clicking 'ADD SYSTEM' to add system whitelist as well.",
         "SYS_WHITELIST": "System whitelist",
         "PRO_WHITELIST": "Project whitelist",
         "ADD_SYSTEM": "ADD SYSTEM"