diff --git a/docs/data/elasticsearch/generated/errors.json b/docs/data/elasticsearch/generated/errors.json
index 66d7cc5f853..d6edcf19027 100644
--- a/docs/data/elasticsearch/generated/errors.json
+++ b/docs/data/elasticsearch/generated/errors.json
@@ -407,7 +407,8 @@
         },
         "user_agent": {
             "device": {
-                "name": "Other"
+                "name": "Other",
+                "type": "Other"
             },
             "name": "Other",
             "original": "Mozilla Chrome Edge"
diff --git a/docs/data/elasticsearch/generated/transactions.json b/docs/data/elasticsearch/generated/transactions.json
index 33d2f2945dd..b57d7944c86 100644
--- a/docs/data/elasticsearch/generated/transactions.json
+++ b/docs/data/elasticsearch/generated/transactions.json
@@ -497,10 +497,11 @@
         },
         "user_agent": {
             "device": {
-                "name": "Other"
+                "name": "Other",
+                "type": "Other"
             },
             "name": "Other",
             "original": "Mozilla Chrome Edge"
         }
     }
-]
+]
\ No newline at end of file
diff --git a/systemtest/approvals/TestRUMErrorSourcemapping.approved.json b/systemtest/approvals/TestRUMErrorSourcemapping.approved.json
index 59b399291cb..40b3f7aee09 100644
--- a/systemtest/approvals/TestRUMErrorSourcemapping.approved.json
+++ b/systemtest/approvals/TestRUMErrorSourcemapping.approved.json
@@ -302,7 +302,8 @@
             },
             "user_agent": {
                 "device": {
-                    "name": "Other"
+                    "name": "Other",
+                    "type": "Other"
                 },
                 "name": "Go-http-client",
                 "original": "Go-http-client/1.1",
diff --git a/systemtest/approvals/TestRUMXForwardedFor.approved.json b/systemtest/approvals/TestRUMXForwardedFor.approved.json
index 865865e2398..535aefe0563 100644
--- a/systemtest/approvals/TestRUMXForwardedFor.approved.json
+++ b/systemtest/approvals/TestRUMXForwardedFor.approved.json
@@ -65,7 +65,8 @@
             },
             "user_agent": {
                 "device": {
-                    "name": "Other"
+                    "name": "Other",
+                    "type": "Other"
                 },
                 "name": "Go-http-client",
                 "original": "Go-http-client/1.1",
diff --git a/tests/system/error.approved.json b/tests/system/error.approved.json
index 66d7cc5f853..d6edcf19027 100644
--- a/tests/system/error.approved.json
+++ b/tests/system/error.approved.json
@@ -407,7 +407,8 @@
         },
         "user_agent": {
             "device": {
-                "name": "Other"
+                "name": "Other",
+                "type": "Other"
             },
             "name": "Other",
             "original": "Mozilla Chrome Edge"
diff --git a/tests/system/kibana.py b/tests/system/kibana.py
index d84706d4b1e..7baa7b5f4c5 100644
--- a/tests/system/kibana.py
+++ b/tests/system/kibana.py
@@ -61,7 +61,7 @@ def list_agent_config(self):
             }
         )
         assert resp.status_code == 200, resp.status_code
-        return resp.json()
+        return resp.json()['configurations']
 
     def delete_agent_config(self, service, env=None):
         data = {
diff --git a/tests/system/transaction.approved.json b/tests/system/transaction.approved.json
index 33d2f2945dd..b57d7944c86 100644
--- a/tests/system/transaction.approved.json
+++ b/tests/system/transaction.approved.json
@@ -497,10 +497,11 @@
         },
         "user_agent": {
             "device": {
-                "name": "Other"
+                "name": "Other",
+                "type": "Other"
             },
             "name": "Other",
             "original": "Mozilla Chrome Edge"
         }
     }
-]
+]
\ No newline at end of file