diff --git a/openssh/server/team/l1_support.yml b/openssh/server/team/l1_support.yml
index 6b34d57..206291c 100644
--- a/openssh/server/team/l1_support.yml
+++ b/openssh/server/team/l1_support.yml
@@ -1,26 +1,26 @@
 classes:
 - system.linux.system.sudo
 # L1
-- system.openssh.server.team.support.aleksandrdobdin
-- system.openssh.server.team.support.aleksandrrubtsov
-- system.openssh.server.team.support.anatoliineliubin
-- system.openssh.server.team.support.antonrodionov
-- system.openssh.server.team.support.daniillapshin
-- system.openssh.server.team.support.danilakhmetov
-- system.openssh.server.team.support.deniskostriukov
-- system.openssh.server.team.support.dmitrygoloshubov
-- system.openssh.server.team.support.javierdiaz
-- system.openssh.server.team.support.josuepalmerin
-- system.openssh.server.team.support.krzysztoffranckowski
-- system.openssh.server.team.support.matthewroark
-- system.openssh.server.team.support.maximefimov
-- system.openssh.server.team.support.michaelpetersen
-- system.openssh.server.team.support.mikhailkraynov
-- system.openssh.server.team.support.nadezhdakabanova
-- system.openssh.server.team.support.renesoto
-- system.openssh.server.team.support.rudymccomb
-- system.openssh.server.team.support.scottmachtmes
-- system.openssh.server.team.support.zahedkhurasani
+- system.openssh.server.team.members.aleksandrdobdin
+- system.openssh.server.team.members.aleksandrrubtsov
+- system.openssh.server.team.members.anatoliineliubin
+- system.openssh.server.team.members.antonrodionov
+- system.openssh.server.team.members.daniillapshin
+- system.openssh.server.team.members.danilakhmetov
+- system.openssh.server.team.members.deniskostriukov
+- system.openssh.server.team.members.dmitrygoloshubov
+- system.openssh.server.team.members.javierdiaz
+- system.openssh.server.team.members.josuepalmerin
+- system.openssh.server.team.members.krzysztoffranckowski
+- system.openssh.server.team.members.matthewroark
+- system.openssh.server.team.members.maximefimov
+- system.openssh.server.team.members.michaelpetersen
+- system.openssh.server.team.members.mikhailkraynov
+- system.openssh.server.team.members.nadezhdakabanova
+- system.openssh.server.team.members.renesoto
+- system.openssh.server.team.members.rudymccomb
+- system.openssh.server.team.members.scottmachtmes
+- system.openssh.server.team.members.zahedkhurasani
 parameters:
   linux:
     system:
diff --git a/openssh/server/team/l2_support.yml b/openssh/server/team/l2_support.yml
index e6fd721..6c54999 100644
--- a/openssh/server/team/l2_support.yml
+++ b/openssh/server/team/l2_support.yml
@@ -1,20 +1,20 @@
 classes:
 - system.linux.system.sudo
 # L2
-- system.openssh.server.team.support.aepifanov
-- system.openssh.server.team.support.apetrenko
-- system.openssh.server.team.support.ashishkin
-- system.openssh.server.team.support.atarasov
-- system.openssh.server.team.support.dklepikov
-- system.openssh.server.team.support.dsutyagin
-- system.openssh.server.team.support.ekozhemyakin
-- system.openssh.server.team.support.enikanorov
-- system.openssh.server.team.support.fsoppelsa
-- system.openssh.server.team.support.manashkin
-- system.openssh.server.team.support.nkondra
-- system.openssh.server.team.support.obryndzii
-- system.openssh.server.team.support.oliemieshko
-- system.openssh.server.team.support.sovsianikov
+- system.openssh.server.team.members.aepifanov
+- system.openssh.server.team.members.apetrenko
+- system.openssh.server.team.members.ashishkin
+- system.openssh.server.team.members.atarasov
+- system.openssh.server.team.members.dklepikov
+- system.openssh.server.team.members.dsutyagin
+- system.openssh.server.team.members.ekozhemyakin
+- system.openssh.server.team.members.enikanorov
+- system.openssh.server.team.members.fsoppelsa
+- system.openssh.server.team.members.manashkin
+- system.openssh.server.team.members.nkondra
+- system.openssh.server.team.members.obryndzii
+- system.openssh.server.team.members.oliemieshko
+- system.openssh.server.team.members.sovsianikov
 parameters:
   linux:
     system: