diff --git a/linux/system/sudo.yml b/linux/system/sudo.yml
index 8f03f7d..ba499d1 100644
--- a/linux/system/sudo.yml
+++ b/linux/system/sudo.yml
@@ -21,6 +21,7 @@
     - /bin/su -
     - /bin/su
     - /usr/sbin/visudo
+    - /usr/bin/sudo
     sudo_coreutils_safe:
     - /usr/bin/less
     - /usr/bin/grep
diff --git a/openssh/server/team/k8s_apps_team.yml b/openssh/server/team/k8s_apps_team.yml
index e57ed1a..1cd8bd9 100644
--- a/openssh/server/team/k8s_apps_team.yml
+++ b/openssh/server/team/k8s_apps_team.yml
@@ -1,4 +1,6 @@
 parameters:
+  _param:
+    linux_system_user_sudo: true
   linux:
     system:
       user:
diff --git a/openssh/server/team/k8s_team.yml b/openssh/server/team/k8s_team.yml
index 36f3252..9ec2b88 100644
--- a/openssh/server/team/k8s_team.yml
+++ b/openssh/server/team/k8s_team.yml
@@ -1,4 +1,6 @@
 parameters:
+  _param:
+    linux_system_user_sudo: true
   linux:
     system:
       user:
diff --git a/openssh/server/team/l1_support.yml b/openssh/server/team/l1_support.yml
index aab98c7..302dd55 100644
--- a/openssh/server/team/l1_support.yml
+++ b/openssh/server/team/l1_support.yml
@@ -1,3 +1,5 @@
+## DEPRECATED, this class will be removed 01/2018
+#  please use support.yml instead
 classes:
 - system.linux.system.sudo
 # L1
@@ -23,6 +25,8 @@
 - system.openssh.server.team.members.scottmachtmes
 - system.openssh.server.team.members.zahedkhurasani
 parameters:
+  _param:
+    linux_system_user_sudo: false
   linux:
     system:
       group:
diff --git a/openssh/server/team/l2_support.yml b/openssh/server/team/l2_support.yml
index 6c54999..d231abc 100644
--- a/openssh/server/team/l2_support.yml
+++ b/openssh/server/team/l2_support.yml
@@ -1,3 +1,5 @@
+## DEPRECATED, this class will be removed 01/2018
+#  please use support3.yml instead
 classes:
 - system.linux.system.sudo
 # L2
@@ -16,6 +18,8 @@
 - system.openssh.server.team.members.oliemieshko
 - system.openssh.server.team.members.sovsianikov
 parameters:
+  _param:
+    linux_system_user_sudo: false
   linux:
     system:
       group:
diff --git a/openssh/server/team/lab.yml b/openssh/server/team/lab.yml
index 7ede7c0..b6c90f8 100644
--- a/openssh/server/team/lab.yml
+++ b/openssh/server/team/lab.yml
@@ -1,5 +1,6 @@
 parameters:
   _param:
+    linux_system_user_sudo: true
     # This is the public key associated to the default private key setup in
     # openssh.client.lab
     cluster_public_key: >-
diff --git a/openssh/server/team/mcp_ci.yml b/openssh/server/team/mcp_ci.yml
index 4bf0a5c..829839e 100644
--- a/openssh/server/team/mcp_ci.yml
+++ b/openssh/server/team/mcp_ci.yml
@@ -1,4 +1,6 @@
 parameters:
+  _param:
+    linux_system_user_sudo: true
   linux:
     system:
       user:
diff --git a/openssh/server/team/mcp_qa.yml b/openssh/server/team/mcp_qa.yml
index 1da0d1e..e80d339 100644
--- a/openssh/server/team/mcp_qa.yml
+++ b/openssh/server/team/mcp_qa.yml
@@ -1,4 +1,6 @@
 parameters:
+  _param:
+    linux_system_user_sudo: true
   linux:
     system:
       user:
diff --git a/openssh/server/team/members/achuprin.yml b/openssh/server/team/members/achuprin.yml
index 0fbea13..08edc89 100644
--- a/openssh/server/team/members/achuprin.yml
+++ b/openssh/server/team/members/achuprin.yml
@@ -5,7 +5,7 @@
         achuprin:
           enabled: true
           name: achuprin
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Alexey Chuprin
           home: /home/achuprin
           email: achuprin@mirantis.com
diff --git a/openssh/server/team/members/aepifanov.yml b/openssh/server/team/members/aepifanov.yml
index cb7c8e9..3c50dfe 100644
--- a/openssh/server/team/members/aepifanov.yml
+++ b/openssh/server/team/members/aepifanov.yml
@@ -9,8 +9,6 @@
           full_name: Andrey Epifanov
           home: /home/aepifanov
           email: aepifanov@mirantis.com
-          groups:
-          - supportl2
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/akomarek.yml b/openssh/server/team/members/akomarek.yml
index 7fe33fb..4ccc697 100644
--- a/openssh/server/team/members/akomarek.yml
+++ b/openssh/server/team/members/akomarek.yml
@@ -5,7 +5,7 @@
         newt:
           enabled: true
           name: newt
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Ales Komarek
           home: /home/newt
           email: mail@newt.cz
diff --git a/openssh/server/team/members/aleksandrdobdin.yml b/openssh/server/team/members/aleksandrdobdin.yml
index 7739e45..6c15522 100644
--- a/openssh/server/team/members/aleksandrdobdin.yml
+++ b/openssh/server/team/members/aleksandrdobdin.yml
@@ -9,8 +9,6 @@
           full_name: Aleksandr Dobdin
           home: /home/adobdin
           email: adobdin@mirantis.com
-          groups:
-          - support
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/aleksandrrubtsov.yml b/openssh/server/team/members/aleksandrrubtsov.yml
index e9fb4a5..2746b80 100644
--- a/openssh/server/team/members/aleksandrrubtsov.yml
+++ b/openssh/server/team/members/aleksandrrubtsov.yml
@@ -9,8 +9,6 @@
           full_name: Aleksandr Rubtsov
           home: /home/arubtsov
           email: arubtsov@mirantis.com
-          groups:
-          - support
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/anatoliineliubin.yml b/openssh/server/team/members/anatoliineliubin.yml
index a86785c..665b997 100644
--- a/openssh/server/team/members/anatoliineliubin.yml
+++ b/openssh/server/team/members/anatoliineliubin.yml
@@ -9,8 +9,6 @@
           full_name: Anatolii Neliubin
           home: /home/aneliubin
           email: aneliuubin@mirantis.com
-          groups:
-          - support
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/antonrodionov.yml b/openssh/server/team/members/antonrodionov.yml
index a4347f4..74ac724 100644
--- a/openssh/server/team/members/antonrodionov.yml
+++ b/openssh/server/team/members/antonrodionov.yml
@@ -9,8 +9,6 @@
           full_name: Anton Rodionov
           home: /home/arodionov
           email: arodionov@mirantis.com
-          groups:
-          - support
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/apetrenko.yml b/openssh/server/team/members/apetrenko.yml
index e754a8e..7abc8cd 100644
--- a/openssh/server/team/members/apetrenko.yml
+++ b/openssh/server/team/members/apetrenko.yml
@@ -9,8 +9,6 @@
           full_name: Andrii Petrenko
           home: /home/apetrenko
           email: apetrenko@mirantis.com
-          groups:
-          - supportl2
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/ashestakov.yml b/openssh/server/team/members/ashestakov.yml
index c3eae16..e00e839 100644
--- a/openssh/server/team/members/ashestakov.yml
+++ b/openssh/server/team/members/ashestakov.yml
@@ -5,7 +5,7 @@
         ashestakov:
           enabled: true
           name: ashestakov
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Andrey Shestakov
           home: /home/ashestakov
           email: ashestakov@mirantis.com
diff --git a/openssh/server/team/members/ashishkin.yml b/openssh/server/team/members/ashishkin.yml
index e9a132e..b85c953 100644
--- a/openssh/server/team/members/ashishkin.yml
+++ b/openssh/server/team/members/ashishkin.yml
@@ -9,8 +9,6 @@
           full_name: Aleksei Shishkin
           home: /home/ashishkin
           email: ashishkin@mirantis.com
-          groups:
-          - supportl2
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/atarasov.yml b/openssh/server/team/members/atarasov.yml
index deada75..8ada998 100644
--- a/openssh/server/team/members/atarasov.yml
+++ b/openssh/server/team/members/atarasov.yml
@@ -9,8 +9,6 @@
           full_name: Anton Tarasov
           home: /home/atarasov
           email: atarasov@mirantis.com
-          groups:
-          - supportl2
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/atengler.yml b/openssh/server/team/members/atengler.yml
index cf06e02..34ef793 100644
--- a/openssh/server/team/members/atengler.yml
+++ b/openssh/server/team/members/atengler.yml
@@ -5,7 +5,7 @@
         tux:
           enabled: true
           name: tux
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Adam Tengler
           home: /home/tux
           email: atengler@mirantis.com
diff --git a/openssh/server/team/members/cade.yml b/openssh/server/team/members/cade.yml
index dd50b54..6b14ff3 100644
--- a/openssh/server/team/members/cade.yml
+++ b/openssh/server/team/members/cade.yml
@@ -5,7 +5,7 @@
         cade:
           enabled: true
           name: cade
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Cade Ekblad-Frank
           home: /home/cade
           email: cade@mirantis.com
diff --git a/openssh/server/team/members/collinmay.yml b/openssh/server/team/members/collinmay.yml
index cf55e05..f884652 100644
--- a/openssh/server/team/members/collinmay.yml
+++ b/openssh/server/team/members/collinmay.yml
@@ -9,8 +9,6 @@
           full_name: Collin May
           home: /home/cmay
           email: cmay@mirantis.com
-          groups:
-          - support
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/daniillapshin.yml b/openssh/server/team/members/daniillapshin.yml
index da1a274..56dfa4c 100644
--- a/openssh/server/team/members/daniillapshin.yml
+++ b/openssh/server/team/members/daniillapshin.yml
@@ -9,8 +9,6 @@
           full_name: Daniil Lapshin
           home: /home/dlapshin
           email: dlapshin@mirantis.com
-          groups:
-          - support
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/danilakhmetov.yml b/openssh/server/team/members/danilakhmetov.yml
index 1835188..a883b4e 100644
--- a/openssh/server/team/members/danilakhmetov.yml
+++ b/openssh/server/team/members/danilakhmetov.yml
@@ -9,8 +9,6 @@
           full_name: Danil Akhmetov
           home: /home/dakhmetov
           email: dakhmetov@mirantis.com
-          groups:
-          - support
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/dcech.yml b/openssh/server/team/members/dcech.yml
index 4e6dedf..2d29118 100644
--- a/openssh/server/team/members/dcech.yml
+++ b/openssh/server/team/members/dcech.yml
@@ -5,7 +5,7 @@
         dcech:
           enabled: true
           name: dcech
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Daniel Cech
           home: /home/dcech
           email: dcech@mirantis.com
diff --git a/openssh/server/team/members/deniskostriukov.yml b/openssh/server/team/members/deniskostriukov.yml
index 1f03ef3..e25514a 100644
--- a/openssh/server/team/members/deniskostriukov.yml
+++ b/openssh/server/team/members/deniskostriukov.yml
@@ -9,8 +9,6 @@
           full_name: Denis Kostriukov
           home: /home/dkostriukov
           email: dkostryukov@mirantis.com
-          groups:
-          - support
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/dklepikov.yml b/openssh/server/team/members/dklepikov.yml
index e1eeb76..6e989c1 100644
--- a/openssh/server/team/members/dklepikov.yml
+++ b/openssh/server/team/members/dklepikov.yml
@@ -9,8 +9,6 @@
           full_name: Denys Klepikov
           home: /home/dklepikov
           email: dklepikov@mirantis.com
-          groups:
-          - supportl2
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/dmitrygoloshubov.yml b/openssh/server/team/members/dmitrygoloshubov.yml
index d9e242c..1870fac 100644
--- a/openssh/server/team/members/dmitrygoloshubov.yml
+++ b/openssh/server/team/members/dmitrygoloshubov.yml
@@ -9,8 +9,6 @@
           full_name: Dmitry Goloshubov
           home: /home/dgoloshubov
           email: dgoloshubov@mirantis.com
-          groups:
-          - support
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/dsutyagin.yml b/openssh/server/team/members/dsutyagin.yml
index 66225c0..3e332f0 100644
--- a/openssh/server/team/members/dsutyagin.yml
+++ b/openssh/server/team/members/dsutyagin.yml
@@ -9,8 +9,6 @@
           full_name: Dmitry Sutyagin
           home: /home/dsutyagin
           email: dsutyagin@mirantis.com
-          groups:
-          - supportl2
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/dszeluga.yml b/openssh/server/team/members/dszeluga.yml
index 2eb2b53..6557eac 100644
--- a/openssh/server/team/members/dszeluga.yml
+++ b/openssh/server/team/members/dszeluga.yml
@@ -6,7 +6,7 @@
         dszeluga:
           enabled: false
           name: dszeluga
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Damian Szeluga
           home: /home/dszeluga
           email: dszeluga@mirantis.com
diff --git a/openssh/server/team/members/ecantwell.yml b/openssh/server/team/members/ecantwell.yml
index 68bb110..309c40b 100644
--- a/openssh/server/team/members/ecantwell.yml
+++ b/openssh/server/team/members/ecantwell.yml
@@ -5,7 +5,7 @@
         ecantwell:
           enabled: true
           name: ecantwell
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Erick Cantwell
           home: /home/ecantwell
           email: ecantwell@mirantis.com
diff --git a/openssh/server/team/members/ekozhemyakin.yml b/openssh/server/team/members/ekozhemyakin.yml
index 5f7e3f8..607d3c7 100644
--- a/openssh/server/team/members/ekozhemyakin.yml
+++ b/openssh/server/team/members/ekozhemyakin.yml
@@ -9,8 +9,6 @@
           full_name: Evgeny Kozhemyakin
           home: /home/ekozhemyakin
           email: ekozhemyakin@mirantis.com
-          groups:
-          - supportl2
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/enikanorov.yml b/openssh/server/team/members/enikanorov.yml
index 5697fa7..4a93b8c 100644
--- a/openssh/server/team/members/enikanorov.yml
+++ b/openssh/server/team/members/enikanorov.yml
@@ -9,8 +9,6 @@
           full_name: Eugene Nikanorov
           home: /home/enikanorov
           email: enikanorov@mirantis.com
-          groups:
-          - supportl2
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/fpytloun.yml b/openssh/server/team/members/fpytloun.yml
index 8cdfcec..d5b0937 100644
--- a/openssh/server/team/members/fpytloun.yml
+++ b/openssh/server/team/members/fpytloun.yml
@@ -5,7 +5,7 @@
         filip:
           enabled: true
           name: filip
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Filip Pytloun
           home: /home/filip
           email: filip@pytloun.cz
diff --git a/openssh/server/team/members/fsoppelsa.yml b/openssh/server/team/members/fsoppelsa.yml
index 6806a0e..ec7398a 100644
--- a/openssh/server/team/members/fsoppelsa.yml
+++ b/openssh/server/team/members/fsoppelsa.yml
@@ -9,8 +9,6 @@
           full_name: Fabrizio Soppelsa
           home: /home/fsoppelsa
           email: fsoppelsa@mirantis.com
-          groups:
-          - supportl2
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/javierdiaz.yml b/openssh/server/team/members/javierdiaz.yml
index 8d1e765..ebdf6dc 100644
--- a/openssh/server/team/members/javierdiaz.yml
+++ b/openssh/server/team/members/javierdiaz.yml
@@ -9,8 +9,6 @@
           full_name: Javier Diaz
           home: /home/jdiaz
           email: jdiaz@mirantis.com
-          groups:
-          - support
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/jbroulik.yml b/openssh/server/team/members/jbroulik.yml
index d7cfcff..6b25ae9 100644
--- a/openssh/server/team/members/jbroulik.yml
+++ b/openssh/server/team/members/jbroulik.yml
@@ -5,7 +5,7 @@
         jbroulik:
           enabled: true
           name: jbroulik
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Jiri Broulik
           home: /home/jbroulik
           email: jbroulik@mirantis.com
diff --git a/openssh/server/team/members/jcach.yml b/openssh/server/team/members/jcach.yml
index 8ab2a81..a9e7e6d 100644
--- a/openssh/server/team/members/jcach.yml
+++ b/openssh/server/team/members/jcach.yml
@@ -5,7 +5,7 @@
         jcach:
           enabled: true
           name: jcach
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Jan Cach
           home: /home/jcach
           email: jcach@mirantis.com
diff --git a/openssh/server/team/members/jjosef.yml b/openssh/server/team/members/jjosef.yml
index 210162a..df6d0dd 100644
--- a/openssh/server/team/members/jjosef.yml
+++ b/openssh/server/team/members/jjosef.yml
@@ -5,7 +5,7 @@
         jjosef:
           enabled: true
           name: jjosef
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Jakub Josef
           home: /home/jjosef
           email: jakub.josef@gmail.com
diff --git a/openssh/server/team/members/jmosher.yml b/openssh/server/team/members/jmosher.yml
index 00535b4..f30c92f 100644
--- a/openssh/server/team/members/jmosher.yml
+++ b/openssh/server/team/members/jmosher.yml
@@ -5,7 +5,7 @@
         jmosher:
           enabled: true
           name: jmosher
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Jaymes Mosher
           home: /home/jmosher
           email: jmosher@mirantis.com
diff --git a/openssh/server/team/members/josuepalmerin.yml b/openssh/server/team/members/josuepalmerin.yml
index 72f3eda..fdcacbe 100644
--- a/openssh/server/team/members/josuepalmerin.yml
+++ b/openssh/server/team/members/josuepalmerin.yml
@@ -9,8 +9,6 @@
           full_name: Josue Palmerin
           home: /home/jpalmerin
           email: jpalmerin@mirantis.com
-          groups:
-          - support
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/jpavlik.yml b/openssh/server/team/members/jpavlik.yml
index 135db8c..b073d7f 100644
--- a/openssh/server/team/members/jpavlik.yml
+++ b/openssh/server/team/members/jpavlik.yml
@@ -5,7 +5,7 @@
         jpavlik:
           enabled: true
           name: jpavlik
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Jakub Pavlik
           home: /home/jpavlik
           email: jpavlik@mirantis.com
diff --git a/openssh/server/team/members/korlowska.yml b/openssh/server/team/members/korlowska.yml
index 7b1c151..f175273 100644
--- a/openssh/server/team/members/korlowska.yml
+++ b/openssh/server/team/members/korlowska.yml
@@ -5,7 +5,7 @@
         korlowska:
           enabled: true
           name: korlowska
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Katarzyna Orlowska
           home: /home/korlowska
           email: korlowska@mirantis.com
diff --git a/openssh/server/team/members/krzysztoffranckowski.yml b/openssh/server/team/members/krzysztoffranckowski.yml
index 72edd3f..5158f94 100644
--- a/openssh/server/team/members/krzysztoffranckowski.yml
+++ b/openssh/server/team/members/krzysztoffranckowski.yml
@@ -9,8 +9,6 @@
           full_name: Krzysztof Franckowski
           home: /home/kfranckowski
           email: kfranckowski@mirantis.com
-          groups:
-          - support
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/lmercl.yml b/openssh/server/team/members/lmercl.yml
index 4fd4707..c735ed5 100644
--- a/openssh/server/team/members/lmercl.yml
+++ b/openssh/server/team/members/lmercl.yml
@@ -5,7 +5,7 @@
         lmercl:
           enabled: true
           name: lmercl
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Lubos Mercl
           home: /home/lmercl
           email: lmercl@mirantis.com
diff --git a/openssh/server/team/members/manashkin.yml b/openssh/server/team/members/manashkin.yml
index bfce163..a28342b 100644
--- a/openssh/server/team/members/manashkin.yml
+++ b/openssh/server/team/members/manashkin.yml
@@ -9,8 +9,6 @@
           full_name: Miroslav Anashkin
           home: /home/manashkin
           email: manashkin@mirantis.com
-          groups:
-          - support
   openssh:
     server:
       enabled: true
@@ -21,4 +19,3 @@
           - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDb1XOAU6ZoU+hSB0SPaypwK1Weu2armLzQrIQ3hhmlpAxFDV50oiF/PyPZ7W5NkJWgEr+DGYuZiKuqTDosrQV5Tt8TA4nt6bSJ9SlhJlNGltrOeWeLcP/Hf2YyWm0e9puzAIgUsKN8Np+CBrpIls4bq2JCshkz/vz9AreaFBMHrhjrh8YNn+yNbETJf9nmxDazVqYp3UI5SU4Wg0KchrFHBPNlREL099SSARfTGIsfbbJmSHx2LUw3Rt6v2fizRslv+Tuxvx2tqRsgbjeF7+NKfOFMBIloab97ag7N9EUdVvOHrjScXQ+nP/kdk3iq7O2WDpAgKYXIbSuaWA0YUk5Z manashkin@mirantis.com
           user: ${linux:system:user:manashkin}
           group:
-          - supportl2
diff --git a/openssh/server/team/members/matthewroark.yml b/openssh/server/team/members/matthewroark.yml
index 0a9eb28..97064db 100644
--- a/openssh/server/team/members/matthewroark.yml
+++ b/openssh/server/team/members/matthewroark.yml
@@ -9,8 +9,6 @@
           full_name: Matthew Roark
           home: /home/mroark
           email: mroark@mirantis.com
-          groups:
-          - support
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/maximefimov.yml b/openssh/server/team/members/maximefimov.yml
index 2dab7d7..48d0c90 100644
--- a/openssh/server/team/members/maximefimov.yml
+++ b/openssh/server/team/members/maximefimov.yml
@@ -9,8 +9,6 @@
           full_name: Maxim Efimov
           home: /home/mefimov
           email: mefimov@mirantis.com
-          groups:
-          - support
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/mceloud.yml b/openssh/server/team/members/mceloud.yml
index 62dc444..d1f3359 100644
--- a/openssh/server/team/members/mceloud.yml
+++ b/openssh/server/team/members/mceloud.yml
@@ -5,7 +5,7 @@
         marco:
           enabled: true
           name: marco
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Marek Celoud
           home: /home/marco
           email: mceloud@mirantis.com
diff --git a/openssh/server/team/members/michaelpetersen.yml b/openssh/server/team/members/michaelpetersen.yml
index 8174b6b..bab536f 100644
--- a/openssh/server/team/members/michaelpetersen.yml
+++ b/openssh/server/team/members/michaelpetersen.yml
@@ -9,8 +9,6 @@
           full_name: Michael Petersen
           home: /home/mpetersen
           email: mpetersen@mirantis.com
-          groups:
-          - support
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/mikhailkraynov.yml b/openssh/server/team/members/mikhailkraynov.yml
index 0019a41..39c58e6 100644
--- a/openssh/server/team/members/mikhailkraynov.yml
+++ b/openssh/server/team/members/mikhailkraynov.yml
@@ -9,8 +9,6 @@
           full_name: Mikhail Kraynov
           home: /home/mkraynov
           email: mkraynov@mirantis.com
-          groups:
-          - support
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/miwinski.yml b/openssh/server/team/members/miwinski.yml
index 48f91e9..5dc9d80 100644
--- a/openssh/server/team/members/miwinski.yml
+++ b/openssh/server/team/members/miwinski.yml
@@ -5,7 +5,7 @@
         miwinski:
           enabled: true
           name: miwinski
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Marcin Iwinski
           home: /home/miwinski
           email: miwinski@mirantis.com
diff --git a/openssh/server/team/members/mlos.yml b/openssh/server/team/members/mlos.yml
index 1e9da38..6b30817 100644
--- a/openssh/server/team/members/mlos.yml
+++ b/openssh/server/team/members/mlos.yml
@@ -5,7 +5,7 @@
         mlos:
           enabled: true
           name: mlos
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Mateusz Los
           home: /home/mlos
           email: mlos@mirantis.com
diff --git a/openssh/server/team/members/mpolreich.yml b/openssh/server/team/members/mpolreich.yml
index 8a01168..a4658aa 100644
--- a/openssh/server/team/members/mpolreich.yml
+++ b/openssh/server/team/members/mpolreich.yml
@@ -5,7 +5,7 @@
         mpolreich:
           enabled: true
           name: mpolreich
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Martin Polreich
           home: /home/mpolreich
           email: mpolreich@mirantis.com
diff --git a/openssh/server/team/members/mrelewicz.yml b/openssh/server/team/members/mrelewicz.yml
index 168e9b5..144379b 100644
--- a/openssh/server/team/members/mrelewicz.yml
+++ b/openssh/server/team/members/mrelewicz.yml
@@ -6,7 +6,7 @@
         mrelewicz:
           enabled: false
           name: mrelewicz
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Maciej Relewicz
           home: /home/mrelewicz
           email: mrelewicz@mirantis.com
diff --git a/openssh/server/team/members/mwilson.yml b/openssh/server/team/members/mwilson.yml
index f9280eb..720edf3 100644
--- a/openssh/server/team/members/mwilson.yml
+++ b/openssh/server/team/members/mwilson.yml
@@ -5,7 +5,7 @@
         mwilson:
           enabled: true
           name: mwilson
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Mike Wilson
           home: /home/mwilson
           email: mwilson@mirantis.com
diff --git a/openssh/server/team/members/nadezhdakabanova.yml b/openssh/server/team/members/nadezhdakabanova.yml
index 6979c5e..dee01e0 100644
--- a/openssh/server/team/members/nadezhdakabanova.yml
+++ b/openssh/server/team/members/nadezhdakabanova.yml
@@ -9,8 +9,6 @@
           full_name: Nadezhda Kabanova
           home: /home/nkabanova
           email: nkabanova@mirantis.com
-          groups:
-          - support
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/nkondra.yml b/openssh/server/team/members/nkondra.yml
index 77bfde5..a6437de 100644
--- a/openssh/server/team/members/nkondra.yml
+++ b/openssh/server/team/members/nkondra.yml
@@ -9,8 +9,6 @@
           full_name: Nazarii Kondra
           home: /home/nkondra
           email: nkondra@mirantis.com
-          groups:
-          - supportl2
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/obryndzii.yml b/openssh/server/team/members/obryndzii.yml
index 85763b3..db0f630 100644
--- a/openssh/server/team/members/obryndzii.yml
+++ b/openssh/server/team/members/obryndzii.yml
@@ -9,8 +9,6 @@
           full_name: Oleksandr Bryndzii
           home: /home/obryndzii
           email: obryndzii@mirantis.com
-          groups:
-          - supportl2
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/oliemieshko.yml b/openssh/server/team/members/oliemieshko.yml
index fdf52c7..5050d53 100644
--- a/openssh/server/team/members/oliemieshko.yml
+++ b/openssh/server/team/members/oliemieshko.yml
@@ -9,8 +9,6 @@
           full_name: Oleksandr Liemieshko
           home: /home/oliemieshko
           email: oliemieshko@mirantis.com
-          groups:
-          - supportl2
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/osmola.yml b/openssh/server/team/members/osmola.yml
index 653027b..2083ddf 100644
--- a/openssh/server/team/members/osmola.yml
+++ b/openssh/server/team/members/osmola.yml
@@ -5,7 +5,7 @@
         osmola:
           enabled: true
           name: osmola
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Ondrej Smola
           home: /home/osmola
           email: osmola@mirantis.com
diff --git a/openssh/server/team/members/pcizinsky.yml b/openssh/server/team/members/pcizinsky.yml
index d702687..e9870c3 100644
--- a/openssh/server/team/members/pcizinsky.yml
+++ b/openssh/server/team/members/pcizinsky.yml
@@ -5,7 +5,7 @@
         pcizinsky:
           enabled: true
           name: pcizinsky
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Pavel Cizinsky
           home: /home/pcizinsky
           email: pcizinsky@mirantis.com
diff --git a/openssh/server/team/members/pjediny.yml b/openssh/server/team/members/pjediny.yml
index 7a4b17d..968ec33 100644
--- a/openssh/server/team/members/pjediny.yml
+++ b/openssh/server/team/members/pjediny.yml
@@ -5,7 +5,7 @@
         pjediny:
           enabled: true
           name: pjediny
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Petr Jediny
           home: /home/pjediny
           email: pjediny@mirantis.com
diff --git a/openssh/server/team/members/pmathews.yml b/openssh/server/team/members/pmathews.yml
index 0e1761e..91904a7 100644
--- a/openssh/server/team/members/pmathews.yml
+++ b/openssh/server/team/members/pmathews.yml
@@ -5,7 +5,7 @@
         pmathews:
           enabled: true
           name: pmathews
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Paul Mathews
           home: /home/pmathews
           email: pmathews@mirantis.com
diff --git a/openssh/server/team/members/pmichalec.yml b/openssh/server/team/members/pmichalec.yml
index c397cd4..b9b9c90 100644
--- a/openssh/server/team/members/pmichalec.yml
+++ b/openssh/server/team/members/pmichalec.yml
@@ -5,7 +5,7 @@
         pmichalec:
           enabled: true
           name: pmichalec
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Petr Michalec
           home: /home/pmichalec
           email: pmichalec@mirantis.com
diff --git a/openssh/server/team/members/renesoto.yml b/openssh/server/team/members/renesoto.yml
index ad76260..9fcace6 100644
--- a/openssh/server/team/members/renesoto.yml
+++ b/openssh/server/team/members/renesoto.yml
@@ -9,8 +9,6 @@
           full_name: Rene Soto
           home: /home/rsoto
           email: rsoto@mirantis.com
-          groups:
-          - support
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/rfelkl.yml b/openssh/server/team/members/rfelkl.yml
index 1b7fbf4..a2151f9 100644
--- a/openssh/server/team/members/rfelkl.yml
+++ b/openssh/server/team/members/rfelkl.yml
@@ -5,7 +5,7 @@
         rfelkl:
           enabled: true
           name: rfelkl
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Richard Felkl
           home: /home/rfelkl
           email: rfelkl@mirantis.com
diff --git a/openssh/server/team/members/rsafonov.yml b/openssh/server/team/members/rsafonov.yml
index 5569975..3409c92 100644
--- a/openssh/server/team/members/rsafonov.yml
+++ b/openssh/server/team/members/rsafonov.yml
@@ -9,8 +9,6 @@
           full_name: Roman Safonov
           home: /home/rsafonov
           email: rsafonov@mirantis.com
-          groups:
-          - support
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/rsatek.yml b/openssh/server/team/members/rsatek.yml
index 7b99a7c..227d20d 100644
--- a/openssh/server/team/members/rsatek.yml
+++ b/openssh/server/team/members/rsatek.yml
@@ -5,7 +5,7 @@
         rsatek:
           enabled: true
           name: rsatek
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Rudolf Satek
           home: /home/rsatek
           email: rsatek@mirantis.com
diff --git a/openssh/server/team/members/scottmachtmes.yml b/openssh/server/team/members/scottmachtmes.yml
index 6feb7a2..a08b3a7 100644
--- a/openssh/server/team/members/scottmachtmes.yml
+++ b/openssh/server/team/members/scottmachtmes.yml
@@ -9,8 +9,6 @@
           full_name: Scott Machtmes
           home: /home/smachtmes
           email: smachtmes@mirantis.com
-          groups:
-          - support
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/sflorczak.yml b/openssh/server/team/members/sflorczak.yml
index d340089..152fe39 100644
--- a/openssh/server/team/members/sflorczak.yml
+++ b/openssh/server/team/members/sflorczak.yml
@@ -5,7 +5,7 @@
         sflorczak:
           enabled: true
           name: sflorczak
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Szymon Florczak
           home: /home/sflorczak
           email: sflorczak@mirantis.com
diff --git a/openssh/server/team/members/skreys.yml b/openssh/server/team/members/skreys.yml
index df76889..19a0f70 100644
--- a/openssh/server/team/members/skreys.yml
+++ b/openssh/server/team/members/skreys.yml
@@ -5,7 +5,7 @@
         skreys:
           enabled: true
           name: skreys
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Sergey Kreys
           home: /home/skreys
           email: skreys@mirantis.com
diff --git a/openssh/server/team/members/smatov.yml b/openssh/server/team/members/smatov.yml
index 8c21e28..073b02f 100644
--- a/openssh/server/team/members/smatov.yml
+++ b/openssh/server/team/members/smatov.yml
@@ -5,7 +5,7 @@
         smatov:
           enabled: true
           name: smatov
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Sergey Matov
           home: /home/smatov
           email: smatov@mirantis.com
diff --git a/openssh/server/team/members/sovsianikov.yml b/openssh/server/team/members/sovsianikov.yml
index 646bde9..cb82cc9 100644
--- a/openssh/server/team/members/sovsianikov.yml
+++ b/openssh/server/team/members/sovsianikov.yml
@@ -9,8 +9,6 @@
           full_name: Serhii Ovsianikov
           home: /home/sovsianikov
           email: sovsianikov@mirantis.com
-          groups:
-          - supportl2
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/members/tkukral.yml b/openssh/server/team/members/tkukral.yml
index e53ce2d..60b34f5 100644
--- a/openssh/server/team/members/tkukral.yml
+++ b/openssh/server/team/members/tkukral.yml
@@ -5,7 +5,7 @@
         tkukral:
           enabled: true
           name: tkukral
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Tomas Kukral
           home: /home/tkukral
           email: tkukral@mirantis.com
diff --git a/openssh/server/team/members/vmikes.yml b/openssh/server/team/members/vmikes.yml
index 07d62f3..eb506ac 100644
--- a/openssh/server/team/members/vmikes.yml
+++ b/openssh/server/team/members/vmikes.yml
@@ -5,7 +5,7 @@
         vmikes:
           enabled: true
           name: vmikes
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Vlasta Mikes
           home: /home/vmikes
           email: vmikes@mirantis.com
diff --git a/openssh/server/team/members/vnogin.yml b/openssh/server/team/members/vnogin.yml
index e8c1df9..26f9106 100644
--- a/openssh/server/team/members/vnogin.yml
+++ b/openssh/server/team/members/vnogin.yml
@@ -5,7 +5,7 @@
         vnogin:
           enabled: true
           name: vnogin
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Vitaliy Nogin
           home: /home/vnogin
           email: vnogin@mirantis.com
diff --git a/openssh/server/team/members/vsaienko.yml b/openssh/server/team/members/vsaienko.yml
index bd532f6..d47a4a6 100644
--- a/openssh/server/team/members/vsaienko.yml
+++ b/openssh/server/team/members/vsaienko.yml
@@ -5,7 +5,7 @@
         vsaienko:
           enabled: true
           name: vsaienko
-          sudo: true
+          sudo: ${_param:linux_system_user_sudo}
           full_name: Vasyl Saienko
           home: /home/vsaienko
           email: vsaienko@mirantis.com
diff --git a/openssh/server/team/members/zahedkhurasani.yml b/openssh/server/team/members/zahedkhurasani.yml
index 8504005..df1a94d 100644
--- a/openssh/server/team/members/zahedkhurasani.yml
+++ b/openssh/server/team/members/zahedkhurasani.yml
@@ -9,8 +9,6 @@
           full_name: Zahed Khurasani
           home: /home/zkhurasani
           email: zkhurasani@mirantis.com
-          groups:
-          - support
   openssh:
     server:
       enabled: true
diff --git a/openssh/server/team/mmo_devops.yml b/openssh/server/team/mmo_devops.yml
index 60fe258..fae9be2 100644
--- a/openssh/server/team/mmo_devops.yml
+++ b/openssh/server/team/mmo_devops.yml
@@ -13,3 +13,6 @@
 - system.openssh.server.team.members.pmichalec
 # Missing- team members still in flux
 # - system.openssh.server.team.members.bpiotrowski
+parameters:
+  _param:
+    linux_system_user_sudo: true
diff --git a/openssh/server/team/networking.yml b/openssh/server/team/networking.yml
index df85109..f64d69c 100644
--- a/openssh/server/team/networking.yml
+++ b/openssh/server/team/networking.yml
@@ -1,4 +1,6 @@
 parameters:
+  _param:
+    linux_system_user_sudo: true
   linux:
     system:
       user:
diff --git a/openssh/server/team/oscore_devops.yml b/openssh/server/team/oscore_devops.yml
index 0ee5dde..149d765 100644
--- a/openssh/server/team/oscore_devops.yml
+++ b/openssh/server/team/oscore_devops.yml
@@ -4,3 +4,6 @@
 - system.openssh.server.team.members.vnogin
 - system.openssh.server.team.members.ashestakov
 - system.openssh.server.team.members.mkarpin
+parameters:
+  _param:
+    linux_system_user_sudo: true
diff --git a/openssh/server/team/oss_team.yml b/openssh/server/team/oss_team.yml
index db4dbbd..d5ba940 100644
--- a/openssh/server/team/oss_team.yml
+++ b/openssh/server/team/oss_team.yml
@@ -1,4 +1,6 @@
 parameters:
+  _param:
+    linux_system_user_sudo: true
   linux:
     system:
       user:
diff --git a/openssh/server/team/presales.yml b/openssh/server/team/presales.yml
index 7efc9da..e2939be 100644
--- a/openssh/server/team/presales.yml
+++ b/openssh/server/team/presales.yml
@@ -1,4 +1,6 @@
 parameters:
+  _param:
+    linux_system_user_sudo: true
   linux:
     system:
       user:
diff --git a/openssh/server/team/qa_scale.yml b/openssh/server/team/qa_scale.yml
index 51fb260..a3f4a91 100644
--- a/openssh/server/team/qa_scale.yml
+++ b/openssh/server/team/qa_scale.yml
@@ -1,4 +1,6 @@
 parameters:
+  _param:
+    linux_system_user_sudo: true
   linux:
     system:
       user:
@@ -20,4 +22,4 @@
           user: ${linux:system:user:dburnazyan}
   public_keys:
     dburnazyan:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC4xJvnHle7Omjhnv8AsqfXlp1Sg4Ixq/p0Dpcj5SlGN5YTnIs+eRXwy7WHICCgWC1OA+o4omzWQI486u0C4qMkdv+nvuAsvJQVRGNiGVp4gi48x3KqMxlEzeCScMH5oj+W5LJLcb2czHulBPXRluKlITOlF4i5+z3GbFwb8Dg5hBnnbxhhRyh6XyUOh8WQvBqXAk2EqY8vqYAZxV9DXI8OSIYsvpM9jQo/26YrSoTWZ4caCNmL6zVVH7eXaqEzVwDHxpXHLvzSP4bIl85dKygJI1DyN9mZ1B77z1lNZnk7Fu8yQP05Guln5Hzg+VqycAZxOk6ysjRXiYNu56DVZuc3 dburnazyan@dburnazyan-pc.msk.mirantis.net
\ No newline at end of file
+      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC4xJvnHle7Omjhnv8AsqfXlp1Sg4Ixq/p0Dpcj5SlGN5YTnIs+eRXwy7WHICCgWC1OA+o4omzWQI486u0C4qMkdv+nvuAsvJQVRGNiGVp4gi48x3KqMxlEzeCScMH5oj+W5LJLcb2czHulBPXRluKlITOlF4i5+z3GbFwb8Dg5hBnnbxhhRyh6XyUOh8WQvBqXAk2EqY8vqYAZxV9DXI8OSIYsvpM9jQo/26YrSoTWZ4caCNmL6zVVH7eXaqEzVwDHxpXHLvzSP4bIl85dKygJI1DyN9mZ1B77z1lNZnk7Fu8yQP05Guln5Hzg+VqycAZxOk6ysjRXiYNu56DVZuc3 dburnazyan@dburnazyan-pc.msk.mirantis.net
diff --git a/openssh/server/team/services_qa.yml b/openssh/server/team/services_qa.yml
index ca75b5a..3e64bd3 100644
--- a/openssh/server/team/services_qa.yml
+++ b/openssh/server/team/services_qa.yml
@@ -1,4 +1,6 @@
 parameters:
+  _param:
+    linux_system_user_sudo: true
   linux:
     system:
       user:
diff --git a/openssh/server/team/stacklight.yml b/openssh/server/team/stacklight.yml
index 84a8255..1133135 100644
--- a/openssh/server/team/stacklight.yml
+++ b/openssh/server/team/stacklight.yml
@@ -1,4 +1,6 @@
 parameters:
+  _param:
+    linux_system_user_sudo: true
   linux:
     system:
       user:
diff --git a/openssh/server/team/support.yml b/openssh/server/team/support.yml
new file mode 100644
index 0000000..7c0c810
--- /dev/null
+++ b/openssh/server/team/support.yml
@@ -0,0 +1,179 @@
+classes:
+- system.linux.system.sudo
+# L1
+- 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.collinmay
+- 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.mikhailkraynov
+- system.openssh.server.team.members.nadezhdakabanova
+- system.openssh.server.team.members.renesoto
+- system.openssh.server.team.members.rsafonov
+- system.openssh.server.team.members.scottmachtmes
+- system.openssh.server.team.members.zahedkhurasani
+# L2OPS
+- system.openssh.server.team.members.aepifanov
+- system.openssh.server.team.members.apetrenko
+- 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
+# L2OPS SRE Team
+- system.openssh.server.team.members.cade
+- system.openssh.server.team.members.jmosher
+- system.openssh.server.team.members.ecantwell
+- system.openssh.server.team.members.lmercl
+- system.openssh.server.team.members.mrelewicz
+- system.openssh.server.team.members.osmola
+- system.openssh.server.team.members.pcizinsky
+- system.openssh.server.team.members.pmathews
+- system.openssh.server.team.members.pmichalec
+parameters:
+  _param:
+    linux_system_user_sudo: false
+  linux:
+    system:
+      group:
+        supportl1:
+          enabled: false
+        supportl2:
+          enabled: false
+        support0:
+          enabled: true
+          name: support0
+        support1:
+          enabled: true
+          name: support1
+          addusers:
+            # L1
+            - ${linux:system:users:ardobdin:name}
+            - ${linux:system:users:arubtsov:name}
+            - ${linux:system:users:aneliubin:name}
+            - ${linux:system:users:arodionov:name}
+            - ${linux:system:users:cmay:name}
+            - ${linux:system:users:dakhmetov:name}
+            - ${linux:system:users:dkostriukov:name}
+            - ${linux:system:users:dgoloshubov:name}
+            - ${linux:system:users:jdiaz:name}
+            - ${linux:system:users:jpalmerin:name}
+            - ${linux:system:users:kfranckowski:name}
+            - ${linux:system:users:mroark:name}
+            - ${linux:system:users:mefimov:name}
+            - ${linux:system:users:mkraynov:name}
+            - ${linux:system:users:nkabanova:name}
+            - ${linux:system:users:rsoto:name}
+            - ${linux:system:users:rsafonov:name}
+            - ${linux:system:users:smachtmes:name}
+            - ${linux:system:users:zkhurasani:name}
+        support2:
+          enabled: true
+          name: support2
+          addusers:
+            # L2OPS
+            - ${linux:system:users:aepifanov:name}
+            - ${linux:system:users:apetrenko:name}
+            - ${linux:system:users:atarasov:name}
+            - ${linux:system:users:dklepikov:name}
+            - ${linux:system:users:dsutyagin:name}
+            - ${linux:system:users:ekozhemyaki:name}
+            - ${linux:system:users:enikanorov:name}
+            - ${linux:system:users:fsoppelsa:name}
+            - ${linux:system:users:manashkin:name}
+            - ${linux:system:users:nkondra:name}
+            - ${linux:system:users:obryndzii:name}
+            - ${linux:system:users:oliemieshko:name}
+            - ${linux:system:users:sovsianikov:name}
+            # L2OPS SRE
+            - ${linux:system:users:pmichalec:name}
+            - ${linux:system:users:pmathews:name}
+            - ${linux:system:users:pcizinsky:name}
+            - ${linux:system:users:osmola:name}
+            - ${linux:system:users:cade:name}
+            - ${linux:system:users:jmosher:name}
+            - ${linux:system:users:ecantwell:name}
+            - ${linux:system:users:lmercl:name}
+            - ${linux:system:users:mrelewicz:name}
+        support3:
+          enabled: false
+          name: support3
+          addusers:
+            - ${linux:system:users:pmichalec:name}
+            - ${linux:system:users:pmathews:name}
+            - ${linux:system:users:pcizinsky:name}
+            - ${linux:system:users:osmola:name}
+            - ${linux:system:users:cade:name}
+            - ${linux:system:users:jmosher:name}
+            - ${linux:system:users:ecantwell:name}
+            - ${linux:system:users:lmercl:name}
+            - ${linux:system:users:mrelewicz:name}
+      sudo:
+        enabled: true
+        aliases:
+          command:
+            SUPPORT_SALT: ${_param:sudo_salt_safe}
+            SUPPORT_SALT_TRUSTED: ${_param:sudo_salt_trusted}
+            SUPPORT_RESTRICTED_SHELLS: ${_param:sudo_shells}
+            SUPPORT_RESTRICTED_SU: ${_param:sudo_restricted_su}
+            SUPPORT_COREUTILS: ${_param:sudo_coreutils_safe}
+            SUPPORT_RABBITMQ: ${_param:sudo_rabbitmq_safe}
+            SUPPORT_SALT_TRUSTED: ${_param:sudo_salt_trusted}
+            SUPPORT_NETWORKING: ${_param:sudo_networking}
+            SUPPORT_CONTRAIL: ${_param:sudo_contrail_utilities}
+            SUPPORT_STORAGE: ${_param:sudo_storage_utilities}
+            SUPPORT_OPENSTACK_CLIENTS: ${_param:sudo_openstack_clients}
+        groups:
+          support0:
+          # This group should have only RO access to non-sensitive data and commands
+          # assumed usage: common operations, non experienced, non technical users.
+            commands:
+                - SUPPORT_SALT
+                - '!SUPPORT_RESTRICTED_SHELLS'
+                - '!SUPPORT_RESTRICTED_SU'
+          support1:
+          # This group should have access to safe, trusted, commands
+            commands:
+                - SUPPORT_SALT
+                - SUPPORT_COREUTILS
+                - SUPPORT_RABBITMQ
+                - SUPPORT_NETWORKING
+                - SUPPORT_CONTRAIL
+                - SUPPORT_STORAGE
+                - SUPPORT_OPENSTACK_CLIENTS
+                - '!SUPPORT_RESTRICTED_SHELLS'
+                - '!SUPPORT_RESTRICTED_SU'
+          support2:
+          # This group should have access to any command using sudo
+            commands:
+                - SUPPORT_SALT
+                - SUPPORT_SALT_TRUSTED
+                - SUPPORT_COREUTILS
+                - SUPPORT_RABBITMQ
+                - SUPPORT_NETWORKING
+                - SUPPORT_CONTRAIL
+                - SUPPORT_STORAGE
+                - SUPPORT_OPENSTACK_CLIENTS
+                - '!SUPPORT_RESTRICTED_SHELLS'
+                - '!SUPPORT_RESTRICTED_SU'
+          support3:
+          # It's never safe to run unlimited number of commands with sudo.
+          # Use with caution.
+            commands:
+                - ALL
+                - '!SUPPORT_RESTRICTED_SHELLS'
+                - '!SUPPORT_RESTRICTED_SU'
diff --git a/openssh/server/team/tcpcloud.yml b/openssh/server/team/tcpcloud.yml
index ac6e107..c7b465a 100644
--- a/openssh/server/team/tcpcloud.yml
+++ b/openssh/server/team/tcpcloud.yml
@@ -22,6 +22,8 @@
 - system.openssh.server.team.members.psvimbersky
 
 parameters:
+  _param:
+    linux_system_user_sudo: true
   linux:
     system:
       user:
@@ -63,4 +65,4 @@
     askotnicky:
       key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDO6EnDYaGdF/Nn6lntxDNnKanCsheZRdh8kA/6ImyeRSjT2cgepm1Fsgv7wXBYoy0OxhB5wgCp5Az/Pj4oLkG3g+G05sUPUxxGCGRiwjcnyQ/FTz4TzHglAVqgbdgWoQYf9Hg6EKZovvPcH3STbEwcl+MhLqvxz0wm5+StE+wvp6I9dEfRV+2/e1uepauOTZ1+Ui1DMNXiMefTlbiIBHzUk7RiwJWgqzQXBndgunmbJWSed8zC0Ug97waDOFIX/oKZmAmsv0NLJ2e/kC3oUTuziGT74F9sh7Pqiw/9HZxvP45hJwEvytfUjfuiikIBbmYdF7Je93czaG/qjXGN8YvP== a.skotnicky@tcpisek.cz
     vzach:
-      key: AAAAB3NzaC1yc2EAAAABJQAAAQEAn4MJUkXbiZPPEcdKijB4MqnjPGk80x5W+8XsMvZuUqElmuLgB30kdCnSCBgipYPor3m8wakdJTTwiY6P50yhtp/tD2b4t1TC1djPwiNS/6JwjZawj30bS5ZrVKeTHtOq6E0tf927svXgEE21/ADgWpMoDeQ/pKlbt0m/U8YGBCmJ7cBa8ggGHhvJIwCNhpELn02vKV8Qfx44rk+DoxLBwQUHQ8PsEwtoSCLMIulpLflptak1pgvN6ggA5p15i36OyJkobI1yR9YEgtb+8yQqofu2DZ+v+9Qhbb+C0446RnyGzfvk/DreCeI4rJh5/6QZjwv3XfYDER5LbNCnoOQAsQ== v.zach@tcpcloud.eu
\ No newline at end of file
+      key: AAAAB3NzaC1yc2EAAAABJQAAAQEAn4MJUkXbiZPPEcdKijB4MqnjPGk80x5W+8XsMvZuUqElmuLgB30kdCnSCBgipYPor3m8wakdJTTwiY6P50yhtp/tD2b4t1TC1djPwiNS/6JwjZawj30bS5ZrVKeTHtOq6E0tf927svXgEE21/ADgWpMoDeQ/pKlbt0m/U8YGBCmJ7cBa8ggGHhvJIwCNhpELn02vKV8Qfx44rk+DoxLBwQUHQ8PsEwtoSCLMIulpLflptak1pgvN6ggA5p15i36OyJkobI1yR9YEgtb+8yQqofu2DZ+v+9Qhbb+C0446RnyGzfvk/DreCeI4rJh5/6QZjwv3XfYDER5LbNCnoOQAsQ== v.zach@tcpcloud.eu