diff --git a/op/console/src/main/java/org/jboss/hal/op/skeleton/Skeleton.java b/op/console/src/main/java/org/jboss/hal/op/skeleton/Skeleton.java
index 5384b092..ef18d7ce 100644
--- a/op/console/src/main/java/org/jboss/hal/op/skeleton/Skeleton.java
+++ b/op/console/src/main/java/org/jboss/hal/op/skeleton/Skeleton.java
@@ -104,13 +104,18 @@ public static Skeleton skeleton(Navigation navigation, EndpointStorage endpointS
                                 .add(navigation))
                         .addGroup(toolbarGroup().css(modifier("align-end"))
                                 .addItem(toolbarItem().add(Button.button(search()).plain()
+                                        .ouiaId(OuiaIds.SEARCH_BTN)
                                         .onClick((e, c) -> universalSearchBox(c.element()).show())))
-                                .addItem(toolbarItem().add(notificationElements.badge()))
-                                .addItem(toolbarItem().add(themeSelector("hal").placement(bottomEnd)))
-                                .addItem(toolbarItem().add(modelGraphToolsIndicator()))
+                                .addItem(toolbarItem().add(notificationElements.badge()
+                                        .ouiaId(OuiaIds.NOTIFICATION_BADGE)))
+                                .addItem(toolbarItem().add(themeSelector("hal").placement(bottomEnd)
+                                        .ouiaId(OuiaIds.THEME_SELECTOR)))
+                                .addItem(toolbarItem().add(modelGraphToolsIndicator()
+                                        .ouiaId(OuiaIds.MODEL_GRAPH_INDICATOR)))
                                 .run(group -> {
                                     if (!uic().endpoints().sameOrigin()) {
-                                        group.addItem(toolbarItem().add(endpointSelector(endpointStorage)));
+                                        group.addItem(toolbarItem().add(endpointSelector(endpointStorage)
+                                                .ouiaId(OuiaIds.ENDPOINT_SELECTOR)));
                                     }
                                 })));
 
diff --git a/resources/src/main/java/org/jboss/hal/resources/OuiaIds.java b/resources/src/main/java/org/jboss/hal/resources/OuiaIds.java
index cc93317a..0fd3496e 100644
--- a/resources/src/main/java/org/jboss/hal/resources/OuiaIds.java
+++ b/resources/src/main/java/org/jboss/hal/resources/OuiaIds.java
@@ -54,6 +54,7 @@ public interface OuiaIds {
     String DELETE_MODAL = "hal-op-delete-modal";
     String EDIT_BTN = "hal-op-edit-btn";
     String ENDPOINT_ADD_BTN = "hal-op-endpoint-add-btn";
+    String ENDPOINT_SELECTOR = "hal-op-endpoint-selector";
     String ENDPOINT_CANCEL_BTN = "hal-op-endpoint-cancel-btn";
     String ENDPOINT_CONNECT_BTN = "hal-op-endpoint-connect-btn";
     String ENDPOINT_MODAL = "hal-op-endpoint-modal";
@@ -72,6 +73,7 @@ public interface OuiaIds {
     String LOG_SHOW_BTN = "hal-op-log-show-btn";
     String MAIN = "hal-op-main";
     String MASTHEAD = "hal-op-masthead";
+    String MODEL_GRAPH_INDICATOR = "hal-op-model-graph-indicator";
     String MASTHEAD_LOGO = "hal-op-masthead-logo";
     String MASTHEAD_TOOLBAR = "hal-op-masthead-toolbar";
     String MODEL_BROWSER_ATTRIBUTES_FILTER = "hal-op-model-browser-attributes-filter";
@@ -85,6 +87,7 @@ public interface OuiaIds {
     String MODEL_BROWSER_REFRESH_BTN = "hal-op-model-browser-refresh-btn";
     String MODEL_BROWSER_TREE = "hal-op-model-browser-tree";
     String NAV = "hal-op-nav";
+    String NOTIFICATION_BADGE = "hal-op-notification-badge";
     String NAV_CONFIGURATION = "hal-op-nav-configuration";
     String NAV_DASHBOARD = "hal-op-nav-dashboard";
     String NAV_DEPLOYMENTS = "hal-op-nav-deployments";
@@ -111,7 +114,9 @@ public interface OuiaIds {
     String RESOURCE_HEADER = "hal-op-resource-header";
     String RESOURCE_TABS = "hal-op-resource-tabs";
     String SAVE_BTN = "hal-op-save-btn";
+    String SEARCH_BTN = "hal-op-search-btn";
     String STABILITY_DISMISS_BTN = "hal-op-stability-dismiss-btn";
+    String THEME_SELECTOR = "hal-op-theme-selector";
 
     /**
      * Composes an OUIA ID with the {@code hal-op} prefix.
diff --git a/ui/src/main/java/org/jboss/hal/ui/resource/form/DefaultFormItem.java b/ui/src/main/java/org/jboss/hal/ui/resource/form/DefaultFormItem.java
index ec41f796..e363f0e3 100644
--- a/ui/src/main/java/org/jboss/hal/ui/resource/form/DefaultFormItem.java
+++ b/ui/src/main/java/org/jboss/hal/ui/resource/form/DefaultFormItem.java
@@ -20,6 +20,7 @@
 import org.jboss.hal.dmr.ModelNode;
 import org.jboss.hal.dmr.Operation;
 import org.jboss.hal.dmr.ResourceAddress;
+import org.jboss.hal.resources.OuiaIds;
 import org.jboss.hal.ui.resource.PipelineContext;
 import org.jboss.hal.ui.resource.ResolvedAttribute;
 import org.patternfly.component.form.FormGroup;
@@ -97,6 +98,7 @@ public DefaultFormItem(PipelineContext context, String identifier, ResolvedAttri
         }
 
         this.formGroup = formGroup(identifier)
+                .ouiaId(OuiaIds.ouia("form-item", identifier))
                 .required(attribute.description().required())
                 .addLabel(FormItemBricks.label(context, identifier, attribute.description()))
                 .addControl(formGroupControl);
diff --git a/ui/src/main/java/org/jboss/hal/ui/resource/shell/ResourceList.java b/ui/src/main/java/org/jboss/hal/ui/resource/shell/ResourceList.java
index 5d873e6e..f80ee73e 100644
--- a/ui/src/main/java/org/jboss/hal/ui/resource/shell/ResourceList.java
+++ b/ui/src/main/java/org/jboss/hal/ui/resource/shell/ResourceList.java
@@ -39,6 +39,7 @@
 import org.patternfly.component.toolbar.ToolbarItem;
 import org.patternfly.component.tooltip.Tooltip;
 import org.patternfly.core.ObservableValue;
+import org.jboss.hal.resources.OuiaIds;
 import org.patternfly.core.OuiaSupport;
 import org.patternfly.filter.Filter;
 import org.patternfly.filter.FilterOperator;
@@ -221,6 +222,7 @@ public ChildResource(String name, AddressTemplate template, boolean singleton, b
                 .add(listContainer = div().element())
                 .element();
         Attachable.register(this, this);
+        ouiaId(OuiaIds.ouia("resource-list", template.last().key));
         initOuia();
     }