diff --git a/platform/remote-driver/OWNERSHIP b/platform/remote-driver/OWNERSHIP
new file mode 100644
index 000000000000..22257a90df89
--- /dev/null
+++ b/platform/remote-driver/OWNERSHIP
@@ -0,0 +1 @@
+owner 'Functional Automation'
\ No newline at end of file
diff --git a/plugins/performanceTesting/event-bus/OWNERSHIP b/plugins/performanceTesting/event-bus/OWNERSHIP
new file mode 100644
index 000000000000..22257a90df89
--- /dev/null
+++ b/plugins/performanceTesting/event-bus/OWNERSHIP
@@ -0,0 +1 @@
+owner 'Functional Automation'
\ No newline at end of file
diff --git a/plugins/performanceTesting/remote-driver.compose/OWNERSHIP b/plugins/performanceTesting/remote-driver.compose/OWNERSHIP
new file mode 100644
index 000000000000..22257a90df89
--- /dev/null
+++ b/plugins/performanceTesting/remote-driver.compose/OWNERSHIP
@@ -0,0 +1 @@
+owner 'Functional Automation'
\ No newline at end of file
diff --git a/plugins/performanceTesting/remote-driver.jcef/OWNERSHIP b/plugins/performanceTesting/remote-driver.jcef/OWNERSHIP
new file mode 100644
index 000000000000..22257a90df89
--- /dev/null
+++ b/plugins/performanceTesting/remote-driver.jcef/OWNERSHIP
@@ -0,0 +1 @@
+owner 'Functional Automation'
\ No newline at end of file
diff --git a/tools/intellij.lambda.sampleTests/OWNERSHIP b/tools/intellij.lambda.sampleTests/OWNERSHIP
index 733354c1ce0d..22257a90df89 100644
--- a/tools/intellij.lambda.sampleTests/OWNERSHIP
+++ b/tools/intellij.lambda.sampleTests/OWNERSHIP
@@ -1 +1 @@
-owner 'Quality Infrastructure'
\ No newline at end of file
+owner 'Functional Automation'
\ No newline at end of file
diff --git a/tools/intellij.lambda.sampleTestsWithFixtures/OWNERSHIP b/tools/intellij.lambda.sampleTestsWithFixtures/OWNERSHIP
index 733354c1ce0d..22257a90df89 100644
--- a/tools/intellij.lambda.sampleTestsWithFixtures/OWNERSHIP
+++ b/tools/intellij.lambda.sampleTestsWithFixtures/OWNERSHIP
@@ -1 +1 @@
-owner 'Quality Infrastructure'
\ No newline at end of file
+owner 'Functional Automation'
\ No newline at end of file
diff --git a/tools/intellij.lambda.sampleTestsWithPlugin/OWNERSHIP b/tools/intellij.lambda.sampleTestsWithPlugin/OWNERSHIP
index 733354c1ce0d..22257a90df89 100644
--- a/tools/intellij.lambda.sampleTestsWithPlugin/OWNERSHIP
+++ b/tools/intellij.lambda.sampleTestsWithPlugin/OWNERSHIP
@@ -1 +1 @@
-owner 'Quality Infrastructure'
\ No newline at end of file
+owner 'Functional Automation'
\ No newline at end of file
diff --git a/tools/intellij.lambda.testFramework/OWNERSHIP b/tools/intellij.lambda.testFramework/OWNERSHIP
index 733354c1ce0d..22257a90df89 100644
--- a/tools/intellij.lambda.testFramework/OWNERSHIP
+++ b/tools/intellij.lambda.testFramework/OWNERSHIP
@@ -1 +1 @@
-owner 'Quality Infrastructure'
\ No newline at end of file
+owner 'Functional Automation'
\ No newline at end of file
diff --git a/tools/intellij.tools.ide.starter.bazel/OWNERSHIP b/tools/intellij.tools.ide.starter.bazel/OWNERSHIP
index 733354c1ce0d..22257a90df89 100644
--- a/tools/intellij.tools.ide.starter.bazel/OWNERSHIP
+++ b/tools/intellij.tools.ide.starter.bazel/OWNERSHIP
@@ -1 +1 @@
-owner 'Quality Infrastructure'
\ No newline at end of file
+owner 'Functional Automation'
\ No newline at end of file
diff --git a/tools/intellij.tools.ide.starter.build.server/OWNERSHIP b/tools/intellij.tools.ide.starter.build.server/OWNERSHIP
index 733354c1ce0d..22257a90df89 100644
--- a/tools/intellij.tools.ide.starter.build.server/OWNERSHIP
+++ b/tools/intellij.tools.ide.starter.build.server/OWNERSHIP
@@ -1 +1 @@
-owner 'Quality Infrastructure'
\ No newline at end of file
+owner 'Functional Automation'
\ No newline at end of file
diff --git a/tools/intellij.tools.ide.starter.driver/OWNERSHIP b/tools/intellij.tools.ide.starter.driver/OWNERSHIP
index 733354c1ce0d..22257a90df89 100644
--- a/tools/intellij.tools.ide.starter.driver/OWNERSHIP
+++ b/tools/intellij.tools.ide.starter.driver/OWNERSHIP
@@ -1 +1 @@
-owner 'Quality Infrastructure'
\ No newline at end of file
+owner 'Functional Automation'
\ No newline at end of file
diff --git a/tools/intellij.tools.ide.starter.junit5/OWNERSHIP b/tools/intellij.tools.ide.starter.junit5/OWNERSHIP
index 733354c1ce0d..22257a90df89 100644
--- a/tools/intellij.tools.ide.starter.junit5/OWNERSHIP
+++ b/tools/intellij.tools.ide.starter.junit5/OWNERSHIP
@@ -1 +1 @@
-owner 'Quality Infrastructure'
\ No newline at end of file
+owner 'Functional Automation'
\ No newline at end of file
diff --git a/tools/intellij.tools.ide.starter/OWNERSHIP b/tools/intellij.tools.ide.starter/OWNERSHIP
index 733354c1ce0d..22257a90df89 100644
--- a/tools/intellij.tools.ide.starter/OWNERSHIP
+++ b/tools/intellij.tools.ide.starter/OWNERSHIP
@@ -1 +1 @@
-owner 'Quality Infrastructure'
\ No newline at end of file
+owner 'Functional Automation'
\ No newline at end of file