diff --git a/packages/apache_tomcat/_dev/deploy/docker/variants.yml b/packages/apache_tomcat/_dev/deploy/variants.yml
similarity index 100%
rename from packages/apache_tomcat/_dev/deploy/docker/variants.yml
rename to packages/apache_tomcat/_dev/deploy/variants.yml
diff --git a/packages/apache_tomcat/data_stream/access/_dev/test/system/test-default-config.yml b/packages/apache_tomcat/data_stream/access/_dev/test/system/test-default-config.yml
index 19a90f7e20f..b2a50230bc0 100644
--- a/packages/apache_tomcat/data_stream/access/_dev/test/system/test-default-config.yml
+++ b/packages/apache_tomcat/data_stream/access/_dev/test/system/test-default-config.yml
@@ -11,3 +11,5 @@ numeric_keyword_fields:
   - log.file.idxhi
   - log.file.idxlo
   - log.file.vol
+agent:
+  user: root # Related issue: https://github.com/elastic/integrations/issues/10999
diff --git a/packages/apache_tomcat/data_stream/catalina/_dev/test/system/test-default-config.yml b/packages/apache_tomcat/data_stream/catalina/_dev/test/system/test-default-config.yml
index 439c7026fea..e6e12e377b2 100644
--- a/packages/apache_tomcat/data_stream/catalina/_dev/test/system/test-default-config.yml
+++ b/packages/apache_tomcat/data_stream/catalina/_dev/test/system/test-default-config.yml
@@ -11,3 +11,5 @@ numeric_keyword_fields:
   - log.file.idxhi
   - log.file.idxlo
   - log.file.vol
+agent:
+  user: root # Related issue: https://github.com/elastic/integrations/issues/10999
diff --git a/packages/iptables/data_stream/log/_dev/test/system/test-journald-config.yml b/packages/iptables/data_stream/log/_dev/test/system/test-journald-config.yml
index 1404515439d..073fcc11a7e 100644
--- a/packages/iptables/data_stream/log/_dev/test/system/test-journald-config.yml
+++ b/packages/iptables/data_stream/log/_dev/test/system/test-journald-config.yml
@@ -4,3 +4,5 @@ data_stream:
   vars:
     paths:
       - "/run/service_logs/iptables.journal"
+agent:
+  base_image: complete # Related issue: https://github.com/elastic/integrations/issues/10998
diff --git a/packages/journald/_dev/test/system/test-journald-config.yml b/packages/journald/_dev/test/system/test-journald-config.yml
index 5696cdd400e..e28672f3d2b 100644
--- a/packages/journald/_dev/test/system/test-journald-config.yml
+++ b/packages/journald/_dev/test/system/test-journald-config.yml
@@ -4,3 +4,5 @@ vars:
   paths:
     - "/run/service_logs/test.journal"
   tags: [forwarded]
+agent:
+  base_image: complete # Related issue: https://github.com/elastic/integrations/issues/10998
diff --git a/packages/microsoft_sqlserver/data_stream/log/_dev/test/system/test-errorlog-config.yml b/packages/microsoft_sqlserver/data_stream/log/_dev/test/system/test-errorlog-config.yml
index ad2ac3a7777..fe2ace23530 100644
--- a/packages/microsoft_sqlserver/data_stream/log/_dev/test/system/test-errorlog-config.yml
+++ b/packages/microsoft_sqlserver/data_stream/log/_dev/test/system/test-errorlog-config.yml
@@ -3,3 +3,5 @@ data_stream:
   vars:
     paths:
       - "{{SERVICE_LOGS_DIR}}/error*"
+agent:
+  user: root # Related issue: https://github.com/elastic/integrations/issues/10999
diff --git a/packages/stan/data_stream/log/_dev/test/system/test-default-config.yml b/packages/stan/data_stream/log/_dev/test/system/test-default-config.yml
index 9c2487cb7a6..6cc73ef24ec 100644
--- a/packages/stan/data_stream/log/_dev/test/system/test-default-config.yml
+++ b/packages/stan/data_stream/log/_dev/test/system/test-default-config.yml
@@ -3,3 +3,5 @@ data_stream:
   vars:
     paths:
       - "{{SERVICE_LOGS_DIR}}/stan.log*"
+agent:
+  user: root # Related issue: https://github.com/elastic/integrations/issues/10999
diff --git a/packages/system_audit/data_stream/package/_dev/test/system/test-system-package-config.yml b/packages/system_audit/data_stream/package/_dev/test/system/test-system-package-config.yml
index 650012ed828..893ecba6617 100644
--- a/packages/system_audit/data_stream/package/_dev/test/system/test-system-package-config.yml
+++ b/packages/system_audit/data_stream/package/_dev/test/system/test-system-package-config.yml
@@ -8,3 +8,5 @@ data_stream:
     state_period: 1m
     processors: |-
       - add_locale: ~
+agent:
+  base_image: systemd # Related issue: https://github.com/elastic/integrations/issues/11000