diff --git a/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Pages/Deployment/InstanceConfigure.razor b/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Pages/Deployment/InstanceConfigure.razor
index baa1dde6..6842e5be 100644
--- a/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Pages/Deployment/InstanceConfigure.razor
+++ b/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Pages/Deployment/InstanceConfigure.razor
@@ -245,7 +245,7 @@
                         <tbody>
                             @foreach (var alarm in _overridableAlarms)
                             {
-                                <tr>
+                                <tr data-test="alarm-override-row-@alarm.Name">
                                     <td class="small">@alarm.Name</td>
                                     <td>
                                         <span class="badge bg-light text-dark border">@alarm.TriggerType</span>
@@ -257,7 +257,7 @@
                                     <td class="small">
                                         @if (HasOverride(alarm.Name))
                                         {
-                                            <span class="badge bg-warning text-dark me-1" title="Override is set">●</span>
+                                            <span class="badge bg-warning text-dark me-1" data-test="alarm-override-badge" title="Override is set">●</span>
                                             <span class="text-muted">@OverrideSummary(alarm.Name)</span>
                                         }
                                         else
@@ -267,11 +267,13 @@
                                     </td>
                                     <td>
                                         <button class="btn btn-outline-primary btn-sm me-1"
+                                                data-test="alarm-edit-btn"
                                                 @onclick="() => BeginEditOverride(alarm)"
                                                 disabled="@_saving">Edit</button>
                                         @if (HasOverride(alarm.Name))
                                         {
                                             <button class="btn btn-outline-danger btn-sm"
+                                                    data-test="alarm-clear-btn"
                                                     @onclick="() => ClearAlarmOverride(alarm.Name)"
                                                     disabled="@_saving">Clear</button>
                                         }
@@ -318,6 +320,7 @@
                                         Priority override
                                     </label>
                                     <input type="number" min="0" max="1000" class="form-control form-control-sm"
+                                           data-test="alarm-priority-input"
                                            placeholder="@_editingAlarm.PriorityLevel"
                                            @bind="_editingPriorityText" @bind:event="oninput" />
                                 </div>
@@ -339,7 +342,7 @@
                             </div>
                             <div>
                                 <button class="btn btn-outline-secondary btn-sm" @onclick="CancelEditOverride">Cancel</button>
-                                <button class="btn btn-success btn-sm" @onclick="SaveOverrideFromModal" disabled="@_saving">Save Override</button>
+                                <button class="btn btn-success btn-sm" data-test="alarm-save-override" @onclick="SaveOverrideFromModal" disabled="@_saving">Save Override</button>
                             </div>
                         </div>
                     </div>