diff --git a/e2e-tests/admin/pages/targets.js b/e2e-tests/admin/pages/targets.js
index a71c4749d..aaa2726af 100644
--- a/e2e-tests/admin/pages/targets.js
+++ b/e2e-tests/admin/pages/targets.js
@@ -58,7 +58,7 @@ export class TargetsPage extends BaseResourcePage {
     if (alias) {
       await this.page
         .getByRole('group', { name: 'Aliases' })
-        .getByLabel('value')
+        .getByLabel('Aliases')
         .last()
         .fill(alias);
       await this.page.getByRole('button', { name: 'Add' }).click();
diff --git a/ui/admin/app/components/form/auth-method/ldap/index.hbs b/ui/admin/app/components/form/auth-method/ldap/index.hbs
index 32fc75f68..5e0083b50 100644
--- a/ui/admin/app/components/form/auth-method/ldap/index.hbs
+++ b/ui/admin/app/components/form/auth-method/ldap/index.hbs
@@ -95,6 +95,7 @@
     <:row as |R|>
       <R.Field as |F|>
         <F.Textarea
+          aria-label={{t 'resources.auth-method.form.certificates.label'}}
           data-test-value-input
           @value={{R.rowData.value}}
           {{on 'input' (fn R.updateRow 'value')}}
diff --git a/ui/admin/app/components/form/auth-method/oidc/index.hbs b/ui/admin/app/components/form/auth-method/oidc/index.hbs
index ee5f542c5..b62b37d8a 100644
--- a/ui/admin/app/components/form/auth-method/oidc/index.hbs
+++ b/ui/admin/app/components/form/auth-method/oidc/index.hbs
@@ -159,6 +159,7 @@
     <:row as |R|>
       <R.Field as |F|>
         <F.Select
+          aria-label={{t 'form.signing_algorithms.label'}}
           data-test-value-select
           {{on 'change' (fn R.updateRow 'value')}}
         >
@@ -195,6 +196,7 @@
     <:row as |R|>
       <R.Field as |F|>
         <F.TextInput
+          aria-label={{t 'form.allowed_audiences.label'}}
           data-test-value-input
           @value={{R.rowData.value}}
           {{on 'input' (fn R.updateRow 'value')}}
@@ -220,6 +222,7 @@
     <:row as |R|>
       <R.Field as |F|>
         <F.TextInput
+          aria-label={{t 'form.claims_scopes.label'}}
           data-test-value-input
           @value={{R.rowData.value}}
           {{on 'input' (fn R.updateRow 'value')}}
@@ -289,6 +292,7 @@
     <:row as |R|>
       <R.Field as |F|>
         <F.Textarea
+          aria-label={{t 'form.idp_ca_certs.label'}}
           data-test-value-input
           @value={{R.rowData.value}}
           {{on 'input' (fn R.updateRow 'value')}}
diff --git a/ui/admin/app/components/form/host-catalog/aws/index.hbs b/ui/admin/app/components/form/host-catalog/aws/index.hbs
index 10085d870..4f4c9dd36 100644
--- a/ui/admin/app/components/form/host-catalog/aws/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/aws/index.hbs
@@ -284,6 +284,7 @@
     >
       <:row as |R|>
         <R.Field as |F|>
+          <F.Label>{{t 'form.key.label'}}</F.Label>
           <F.TextInput
             data-test-key-input
             @value={{R.rowData.key}}
@@ -291,6 +292,7 @@
           />
         </R.Field>
         <R.Field as |F|>
+          <F.Label>{{t 'form.value.label'}}</F.Label>
           <F.TextInput
             data-test-value-input
             @value={{R.rowData.value}}
diff --git a/ui/admin/app/components/form/host-set/aws/index.hbs b/ui/admin/app/components/form/host-set/aws/index.hbs
index 0d69e486e..ba3381bf3 100644
--- a/ui/admin/app/components/form/host-set/aws/index.hbs
+++ b/ui/admin/app/components/form/host-set/aws/index.hbs
@@ -75,6 +75,7 @@
     <:row as |R|>
       <R.Field as |F|>
         <F.TextInput
+          aria-label={{t 'resources.host-set.form.preferred_endpoints.label'}}
           data-test-value-input
           @value={{R.rowData.value}}
           {{on 'input' (fn R.updateRow 'value')}}
@@ -99,6 +100,7 @@
     <:row as |R|>
       <R.Field as |F|>
         <F.TextInput
+          aria-label={{t 'resources.host-set.form.filter.label'}}
           data-test-value-input
           @value={{R.rowData.value}}
           {{on 'input' (fn R.updateRow 'value')}}
diff --git a/ui/admin/app/components/form/host-set/azure/index.hbs b/ui/admin/app/components/form/host-set/azure/index.hbs
index 849800c6f..89ced2e66 100644
--- a/ui/admin/app/components/form/host-set/azure/index.hbs
+++ b/ui/admin/app/components/form/host-set/azure/index.hbs
@@ -75,6 +75,7 @@
     <:row as |R|>
       <R.Field as |F|>
         <F.TextInput
+          aria-label={{t 'resources.host-set.form.preferred_endpoints.label'}}
           data-test-value-input
           @value={{R.rowData.value}}
           {{on 'input' (fn R.updateRow 'value')}}
diff --git a/ui/admin/app/components/form/host-set/gcp/index.hbs b/ui/admin/app/components/form/host-set/gcp/index.hbs
index 8b63b07b1..340a2f0a7 100644
--- a/ui/admin/app/components/form/host-set/gcp/index.hbs
+++ b/ui/admin/app/components/form/host-set/gcp/index.hbs
@@ -74,6 +74,7 @@
     <:row as |R|>
       <R.Field as |F|>
         <F.TextInput
+          aria-label={{t 'resources.host-set.form.preferred_endpoints.label'}}
           data-test-value-input
           @value={{R.rowData.value}}
           {{on 'input' (fn R.updateRow 'value')}}
@@ -98,6 +99,7 @@
     <:row as |R|>
       <R.Field as |F|>
         <F.TextInput
+          aria-label={{t 'resources.host-set.form.filter.label'}}
           data-test-value-input
           @value={{R.rowData.value}}
           {{on 'input' (fn R.updateRow 'value')}}
diff --git a/ui/admin/app/components/form/storage-bucket/aws/index.hbs b/ui/admin/app/components/form/storage-bucket/aws/index.hbs
index f4f4b67d3..cf7881398 100644
--- a/ui/admin/app/components/form/storage-bucket/aws/index.hbs
+++ b/ui/admin/app/components/form/storage-bucket/aws/index.hbs
@@ -430,6 +430,7 @@
     >
       <:row as |R|>
         <R.Field as |F|>
+          <F.Label>{{t 'form.key.label'}}</F.Label>
           <F.TextInput
             data-test-key-input
             @value={{R.rowData.key}}
@@ -437,6 +438,7 @@
           />
         </R.Field>
         <R.Field as |F|>
+          <F.Label>{{t 'form.value.label'}}</F.Label>
           <F.TextInput
             data-test-value-input
             @value={{R.rowData.value}}
diff --git a/ui/admin/app/components/form/target/details/index.hbs b/ui/admin/app/components/form/target/details/index.hbs
index 049ad55e7..d36a8e88c 100644
--- a/ui/admin/app/components/form/target/details/index.hbs
+++ b/ui/admin/app/components/form/target/details/index.hbs
@@ -257,6 +257,7 @@
       <:row as |R|>
         <R.Field as |F|>
           <F.TextInput
+            aria-label={{t 'resources.alias.form.alias.label'}}
             data-test-value-input
             @value={{R.rowData.value}}
             {{on 'input' (fn R.updateRow 'value')}}
diff --git a/ui/admin/app/components/form/worker/create-worker-led/index.hbs b/ui/admin/app/components/form/worker/create-worker-led/index.hbs
index 4c466d192..dce41cb20 100644
--- a/ui/admin/app/components/form/worker/create-worker-led/index.hbs
+++ b/ui/admin/app/components/form/worker/create-worker-led/index.hbs
@@ -92,6 +92,7 @@
     >
       <:row as |R|>
         <R.Field as |F|>
+          <F.Label>{{t 'form.key.label'}}</F.Label>
           <F.TextInput
             data-test-key-input
             @value={{R.rowData.key}}
@@ -100,6 +101,7 @@
         </R.Field>
 
         <R.Field as |F|>
+          <F.Label>{{t 'form.value.label'}}</F.Label>
           <F.TextInput
             data-test-value-input
             @value={{R.rowData.value}}
diff --git a/ui/admin/app/routes/scopes/scope/host-catalogs/new.js b/ui/admin/app/routes/scopes/scope/host-catalogs/new.js
index 64d7f37de..4ac7017ac 100644
--- a/ui/admin/app/routes/scopes/scope/host-catalogs/new.js
+++ b/ui/admin/app/routes/scopes/scope/host-catalogs/new.js
@@ -5,7 +5,6 @@
 
 import Route from '@ember/routing/route';
 import { service } from '@ember/service';
-import { TYPE_HOST_CATALOG_PLUGIN_AWS } from 'api/models/host-catalog';
 
 export default class ScopesScopeHostCatalogsNewRoute extends Route {
   // =services
@@ -61,11 +60,6 @@ export default class ScopesScopeHostCatalogsNewRoute extends Route {
       disable_credential_rotation,
     });
 
-    if (compositeType === TYPE_HOST_CATALOG_PLUGIN_AWS) {
-      // Ensure one editable role_tags row exists for dynamic credentials.
-      record.role_tags = [{ key: '', value: '' }];
-    }
-
     record.scopeModel = scopeModel;
     return record;
   }
diff --git a/ui/admin/app/routes/scopes/scope/storage-buckets/new.js b/ui/admin/app/routes/scopes/scope/storage-buckets/new.js
index 3823e4c86..26bc24b88 100644
--- a/ui/admin/app/routes/scopes/scope/storage-buckets/new.js
+++ b/ui/admin/app/routes/scopes/scope/storage-buckets/new.js
@@ -53,8 +53,7 @@ export default class ScopesScopeStorageBucketsNewRoute extends Route {
       bucket_name,
       bucket_prefix,
       region,
-      worker_filter,
-      role_tags;
+      worker_filter;
 
     if (this.currentModel?.isNew) {
       ({
@@ -65,7 +64,6 @@ export default class ScopesScopeStorageBucketsNewRoute extends Route {
         bucket_prefix,
         region,
         worker_filter,
-        role_tags,
       } = this.currentModel);
       this.currentModel.rollbackAttributes();
     }
@@ -80,7 +78,6 @@ export default class ScopesScopeStorageBucketsNewRoute extends Route {
       bucket_prefix,
       region,
       worker_filter,
-      role_tags: role_tags || [{ key: '', value: '' }],
     });
     return record;
   }
diff --git a/ui/admin/tests/acceptance/auth-methods/oidc-test.js b/ui/admin/tests/acceptance/auth-methods/oidc-test.js
index cbce5a344..0df7efe0e 100644
--- a/ui/admin/tests/acceptance/auth-methods/oidc-test.js
+++ b/ui/admin/tests/acceptance/auth-methods/oidc-test.js
@@ -80,6 +80,9 @@ module('Acceptance | auth-methods | oidc', function (hooks) {
       id: instances.authMethod.id,
     });
 
+    // Re-open dropdown to check the selected state
+    await click(selectors.CHANGE_STATE_DROPDOWN);
+
     assert
       .dom(selectors.CHANGE_STATE_DROPDOWN_CHECKED)
       .hasValue(instances.authMethod.attributes.state);
@@ -98,6 +101,9 @@ module('Acceptance | auth-methods | oidc', function (hooks) {
       id: instances.authMethod.id,
     });
 
+    // Re-open dropdown to check the selected state
+    await click(selectors.CHANGE_STATE_DROPDOWN);
+
     assert
       .dom(selectors.CHANGE_STATE_DROPDOWN_CHECKED)
       .hasValue(instances.authMethod.attributes.state);