diff --git a/openssh/server/team/mcp_qa.yml b/openssh/server/team/mcp_qa.yml
index 6ecefa5..2fd001c 100644
--- a/openssh/server/team/mcp_qa.yml
+++ b/openssh/server/team/mcp_qa.yml
@@ -1,25 +1,7 @@
 classes:
 - system.linux.system.sudo
-- system.openssh.server.team.members.mshalamov
-- system.openssh.server.team.members.sandriichenko
-- system.openssh.server.team.members.abaraniuk
-- system.openssh.server.team.members.aminasyan
-- system.openssh.server.team.members.imenkov
-- system.openssh.server.team.members.aheczko
-- system.openssh.server.team.members.ddmitriev
-- system.openssh.server.team.members.dkalashnik
-- system.openssh.server.team.members.dtyzhnenko
-- system.openssh.server.team.members.obutenko
-- system.openssh.server.team.members.sgudz
-- system.openssh.server.team.members.snovikov
-- system.openssh.server.team.members.tleontovich
-- system.openssh.server.team.members.vgusev
-- system.openssh.server.team.members.vryzhenkin
-- system.openssh.server.team.members.sturivnyi
-- system.openssh.server.team.members.ylobankov
-- system.openssh.server.team.members.ozhurba
-# Deprecated users
 - system.openssh.server.team.members.deprecated.ababich
+- system.openssh.server.team.members.deprecated.aheczko
 - system.openssh.server.team.members.deprecated.akalach
 - system.openssh.server.team.members.deprecated.dderyabin
 - system.openssh.server.team.members.deprecated.esikachev
@@ -29,7 +11,24 @@
 - system.openssh.server.team.members.deprecated.schipiga
 - system.openssh.server.team.members.deprecated.ssokolov
 - system.openssh.server.team.members.deprecated.yshapovalov
-
+- system.openssh.server.team.members.mshalamov
+- system.openssh.server.team.members.sandriichenko
+- system.openssh.server.team.members.abaraniuk
+- system.openssh.server.team.members.aminasyan
+- system.openssh.server.team.members.imenkov
+- system.openssh.server.team.members.ddmitriev
+- system.openssh.server.team.members.dkalashnik
+- system.openssh.server.team.members.dtyzhnenko
+- system.openssh.server.team.members.ekhomyakova
+- system.openssh.server.team.members.obutenko
+- system.openssh.server.team.members.sgudz
+- system.openssh.server.team.members.snovikov
+- system.openssh.server.team.members.tleontovich
+- system.openssh.server.team.members.vgusev
+- system.openssh.server.team.members.vnaumov
+- system.openssh.server.team.members.vryzhenkin
+- system.openssh.server.team.members.sturivnyi
+- system.openssh.server.team.members.ylobankov
 parameters:
   _param:
     linux_system_user_sudo: true
diff --git a/openssh/server/team/members/ahecko.yml b/openssh/server/team/members/deprecated/ahecko.yml
similarity index 85%
rename from openssh/server/team/members/ahecko.yml
rename to openssh/server/team/members/deprecated/ahecko.yml
index 71821ea..a6f9c87 100644
--- a/openssh/server/team/members/ahecko.yml
+++ b/openssh/server/team/members/deprecated/ahecko.yml
@@ -3,12 +3,11 @@
     system:
       user:
         ahecko:
-          email: ahecko@mirantis.com
+          email: disabled
           enabled: true
-          full_name: Adam Hecko
+          full_name: disabled
           home: /home/ahecko
           name: ahecko
-          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
       user:
diff --git a/openssh/server/team/members/aheczko.yml b/openssh/server/team/members/deprecated/aheczko.yml
similarity index 85%
rename from openssh/server/team/members/aheczko.yml
rename to openssh/server/team/members/deprecated/aheczko.yml
index c1a4741..65e5a0e 100644
--- a/openssh/server/team/members/aheczko.yml
+++ b/openssh/server/team/members/deprecated/aheczko.yml
@@ -3,12 +3,11 @@
     system:
       user:
         aheczko:
-          email: aheczko@mirantis.com
+          email: disabled
           enabled: true
-          full_name: Adam Heczko
+          full_name: disabled
           home: /home/aheczko
           name: aheczko
-          sudo: ${_param:linux_system_user_sudo}
   openssh:
     server:
       user:
diff --git a/openssh/server/team/members/deprecated/miwinski.yml b/openssh/server/team/members/deprecated/miwinski.yml
new file mode 100644
index 0000000..f67b3c2
--- /dev/null
+++ b/openssh/server/team/members/deprecated/miwinski.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        miwinski:
+          enabled: false
+          name: miwinski
+          full_name: disabled
+          home: /home/miwinski
+          email: disabled
+  openssh:
+    server:
+      user:
+        miwinski:
+          enabled: false
+          user: ${linux:system:user:miwinski}
diff --git a/openssh/server/team/members/deprecated/mniedbala.yml b/openssh/server/team/members/deprecated/mniedbala.yml
new file mode 100644
index 0000000..dea6f0f
--- /dev/null
+++ b/openssh/server/team/members/deprecated/mniedbala.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        mniedbala:
+          enabled: false
+          name: mniedbala
+          full_name: disabled
+          home: /home/mniedbala
+          email: disabled
+  openssh:
+    server:
+      user:
+        mniedbala:
+          enabled: false
+          user: ${linux:system:user:mniedbala}
diff --git a/openssh/server/team/members/deprecated/pcizinsky.yml b/openssh/server/team/members/deprecated/pcizinsky.yml
new file mode 100644
index 0000000..89b73fe
--- /dev/null
+++ b/openssh/server/team/members/deprecated/pcizinsky.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        pcizinsky:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/pcizinsky
+          name: pcizinsky
+  openssh:
+    server:
+      user:
+        pcizinsky:
+          enabled: false
+          user: ${linux:system:user:pcizinsky}
diff --git a/openssh/server/team/members/deprecated/pmichalec.yml b/openssh/server/team/members/deprecated/pmichalec.yml
index 5c453b0..201d9fc 100644
--- a/openssh/server/team/members/deprecated/pmichalec.yml
+++ b/openssh/server/team/members/deprecated/pmichalec.yml
@@ -6,8 +6,8 @@
           email: disabled
           enabled: false
           full_name: disabled
-          name: pmichalec
           home: /home/pmichalec
+          name: pmichalec
   openssh:
     server:
       user:
diff --git a/openssh/server/team/members/deprecated/sflorczak.yml b/openssh/server/team/members/deprecated/sflorczak.yml
new file mode 100644
index 0000000..1f037d5
--- /dev/null
+++ b/openssh/server/team/members/deprecated/sflorczak.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        sflorczak:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/sflorczak
+          name: sflorczak
+  openssh:
+    server:
+      user:
+        sflorczak:
+          enabled: false
+          user: ${linux:system:user:sflorczak}
diff --git a/openssh/server/team/members/deprecated/vblokhin.yml b/openssh/server/team/members/deprecated/vblokhin.yml
new file mode 100644
index 0000000..8b61eb1
--- /dev/null
+++ b/openssh/server/team/members/deprecated/vblokhin.yml
@@ -0,0 +1,16 @@
+parameters:
+  linux:
+    system:
+      user:
+        vblokhin:
+          email: disabled
+          enabled: false
+          full_name: disabled
+          home: /home/vblokhin
+          name: vblokhin
+  openssh:
+    server:
+      user:
+        vblokhin:
+          enabled: false
+          user: ${linux:system:user:vblokhin}
diff --git a/openssh/server/team/members/miwinski.yml b/openssh/server/team/members/miwinski.yml
deleted file mode 100644
index 676fd3c..0000000
--- a/openssh/server/team/members/miwinski.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        miwinski:
-          enabled: true
-          name: miwinski
-          sudo: ${_param:linux_system_user_sudo}
-          full_name: Marcin Iwinski
-          home: /home/miwinski
-          email: miwinski@mirantis.com
-  openssh:
-    server:
-      user:
-        miwinski:
-          enabled: true
-          public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCydY97fXVWbcUiNaK5KnMHQpLT4acAVXykKqB5hAUPwKn4nFN3dFNw9dpToFpriqNpJTZrEdxVgL9obB4aouHpi+NVH6s8cMZ6ulNTiSTBM0Xkmu7jl66eMhfHNaFwgFC0vsGQ85oI813H7A601tCweKegMUW/mwOKbwHj1isEA+jbyrdRTC64icBa6zbW/G2uF0ajz9dCPe9L0rAbQFE51N1fxrnLeb6BI+5br0H6bRz1kGc5ZsNiUx3EEEOrMFbAbHQAxvD8Te/nUErdlHCiFufKlXLJSUNDPGFrW2mIfvfGlbyrLPgm24RKS6xfcD7BhJOmr54k7QbWChEp/SrX iwi@iwon
-          user: ${linux:system:user:miwinski}
diff --git a/openssh/server/team/members/mniedbala.yml b/openssh/server/team/members/mniedbala.yml
deleted file mode 100644
index a4ca5c8..0000000
--- a/openssh/server/team/members/mniedbala.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        mniedbala:
-          enabled: true
-          name: mniedbala
-          sudo: ${_param:linux_system_user_sudo}
-          full_name: Mikolaj Niedbala
-          home: /home/mniedbala
-          email: mniedbala@mirantis.com
-  openssh:
-    server:
-      user:
-        mniedbala:
-          enabled: true
-          public_keys:
-            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDNepHgtflir2vNW+h9cr3hP3llsTlg5uIvvmByykfk455Cum0vSO27mWKZJu0ebU4LXfeH+WP4MjR3tKAKvXqzjGhPVGjMO3wo4/NLlel2CDx99w0KotcjQhW6p+iqLv1AT9E5LW4Kr1NuQ65nvGn6y4SevRw2y36bNS4VJBq40HlgQFTW3oNP+5u4TVzu7QQhulsTUdQETgLswZKsarX7whgvcHvFs1dnbriZlkPXvrKhZLA/CUb7ot+ugw6KWOl+g4gTFLjnt0IXjJXMstCOL9R7/juflUku9CYFvSuq4/T67yMW7XntQ89VkwudSCMjjUWg6ilEG0ghd9+b3bPr mniedbala@mirantis.com
-          user: ${linux:system:user:mniedbala}
diff --git a/openssh/server/team/members/pcizinsky.yml b/openssh/server/team/members/pcizinsky.yml
deleted file mode 100644
index 972830b..0000000
--- a/openssh/server/team/members/pcizinsky.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        pcizinsky:
-          email: pcizinsky@mirantis.com
-          enabled: true
-          full_name: Pavel Cizinsky
-          home: /home/pcizinsky
-          name: pcizinsky
-          sudo: ${_param:linux_system_user_sudo}
-  openssh:
-    server:
-      user:
-        pcizinsky:
-          enabled: true
-          public_keys:
-          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCt9HA2bUwCVGGdUjyFzdPFp0j2z9XanLW9gHZ3BhB6Wc4ficU6zmbqYxrHUvdmUrRJbLMEAo9JDlzAIw4CPGhRkD3d7HfnmlEYcEeizLnnC+CmKo3+mrwkQIzWIz6PJOh1kvp5uaNp4ztjRGXXmPzcR0nk4jRD89gLHvH9EYStxZI6nsi3mmWR/LhgIhijb8p63duhE4HuK/RRRjeDQaUsbTG9TMEskY5ZI3p/QM55wlml9F8QJrtwxpaIPI5Fl8lflq+4YcoqgDIBFc6nwubIuiNY4gPJ8s1SQfsfxHSOJpFPZDwi76dxUpthtJrU46fqRvXPzTKoS29WZ5pSAY6p pavel.cizinsky@tcpcloud.eu
-          user: ${linux:system:user:pcizinsky}
diff --git a/openssh/server/team/members/pmichalec.yml b/openssh/server/team/members/pmichalec.yml
deleted file mode 120000
index a7159e4..0000000
--- a/openssh/server/team/members/pmichalec.yml
+++ /dev/null
@@ -1 +0,0 @@
-deprecated/pmichalec.yml
\ No newline at end of file
diff --git a/openssh/server/team/members/sflorczak.yml b/openssh/server/team/members/sflorczak.yml
deleted file mode 100644
index 8e42edb..0000000
--- a/openssh/server/team/members/sflorczak.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        sflorczak:
-          email: sflorczak@mirantis.com
-          enabled: true
-          full_name: Szymon Florczak
-          home: /home/sflorczak
-          name: sflorczak
-          sudo: ${_param:linux_system_user_sudo}
-  openssh:
-    server:
-      user:
-        sflorczak:
-          enabled: true
-          public_keys:
-          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDOdCr32ewiGJKLLwxf0Ic0naFV1j+ZflpfUVjuIPplrLeL5u8CNVlT5adPzgc48ijbee3qpzNvkOC7Ym295xQXUluo/cj2p5wVp70YnHrfhnLjGOCldm/K8B9bHmHbm1XW6hWUp7SWjMwhOdR217iveVLkuOy+hPdpXOC86hO93v7fY12UZDiqSRfrHpUqEaHHqlSyU2Eftn9GsR4UaotkeaQsiv8bi/k5nrwea/ccALZXnhrgTSTpXOVy3rfR5cCFQCA1PjMYvFEjhUofCHBSk+OA8xwOkpBOCfYrWRUmMT7MGEV5Jjm75QUrq1AuqRdFh8SM5lP39Tdwr8FMC+q5 flor3k@MacBook-Pro-Szymon.local
-          user: ${linux:system:user:sflorczak}
diff --git a/openssh/server/team/members/vblokhin.yml b/openssh/server/team/members/vblokhin.yml
deleted file mode 100644
index 122429c..0000000
--- a/openssh/server/team/members/vblokhin.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-parameters:
-  linux:
-    system:
-      user:
-        vblokhin:
-          email: vblokhin@mirantis.com
-          enabled: true
-          full_name: Volodymyr Blokhin
-          home: /home/vblokhin
-          name: vblokhin
-          sudo: ${_param:linux_system_user_sudo}
-  openssh:
-    server:
-      user:
-        vblokhin:
-          enabled: true
-          public_keys:
-          - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDY5F0bDcbiCtO5HkwIVgjwAwCHcTRDZwEIE5cwuGlXNKWk9JtlDKh724Dp8f/Yny1e30Kt9oqs23bv6xfMh4pU4vrajjSv9f+s3hCSs1X9JrlEw92CD7r+jpq2R0vz3ufeHZWSWmeMsRR62BodtYy4EkoyPKvq16guq745KHTYgATm/qJgCkjQ5lxca280i0z14Fv+JOtVxrk52xMTxHS+N6wzVOjuEjBbW2vyktsV/RidT/SoJAVMHoPISjJTR+q5usVuKb6J5U83Y2vbmUCnygAnPX6l9k8atsAvwl1v54QxWE6Qz61kMPpwZZ56BNGhCZ458HqqXiybx4lU4PN6eg/zPA9Eq+xj5ZoXaUK1hg2UpJrmrtCh8H4T+/dPySZ+HMDBp221DCuH43x9No6V0QWhifhHPaGWyeK+mGsznbaSnlZ0QxRun5qWgjG7xHu97zgxjlyxmQII8FWGaOSuv/w6jg894A4jcsDfH5oxDbgVTbqqZG9o7TszIXKTImt1f2fmKKr/CT7ixwIKO3MioUNu3PoQ/GhmKajqugV+TIRe4vJ2FD5hl11ythzLlZCchzlEoymap4P6Y5dMh60YErCtYftn7jATJKSq9EHiLEeTIQDBVqhJzdS9/QWAXBV97mNX7mib1dO0H9TBZu1mYMZio7udbx9oursrVPq3fw== vblokhin@mirantis.com
-          user: ${linux:system:user:vblokhin}
diff --git a/openssh/server/team/mmo_devops.yml b/openssh/server/team/mmo_devops.yml
index ec9e971..2afa3fe 100644
--- a/openssh/server/team/mmo_devops.yml
+++ b/openssh/server/team/mmo_devops.yml
@@ -1,17 +1 @@
-## DEPRECATED, this class will be removed 01/2018
-classes:
-# DevOps/SRE Team
-- system.openssh.server.team.members.deprecated.cade
-- system.openssh.server.team.members.deprecated.pmathews
-- system.openssh.server.team.members.deprecated.pmichalec
-- system.openssh.server.team.members.deprecated.ecantwell
-- system.openssh.server.team.members.deprecated.mwilson
-- system.openssh.server.team.members.deprecated.osmola
-- system.openssh.server.team.members.jmosher
-- system.openssh.server.team.members.lmercl
-- system.openssh.server.team.members.pcizinsky
-# Missing- team members still in flux
-# - system.openssh.server.team.members.bpiotrowski
-parameters:
-  _param:
-    linux_system_user_sudo: true
+# Deprecated since 01.2018
diff --git a/openssh/server/team/presales.yml b/openssh/server/team/presales.yml
index 770e549..ff99ff7 100644
--- a/openssh/server/team/presales.yml
+++ b/openssh/server/team/presales.yml
@@ -1,64 +1,13 @@
 classes:
-- system.openssh.server.team.members.deprecated.samstoelinga
+- system.openssh.server.team.members.deprecated.asteer
+- system.openssh.server.team.members.deprecated.iostojic
 - system.openssh.server.team.members.deprecated.pmichalec
-- system.openssh.server.team.members.sachintripathi
-- system.openssh.server.team.members.deprecated.ryanday
-- system.openssh.server.team.members.brucemathews
+- system.openssh.server.team.members.deprecated.samstoelinga
+- system.openssh.server.team.members.deprecated.sbraun
 - system.openssh.server.team.members.andreidanin
-- system.openssh.server.team.members.danielvirassamy
-- system.openssh.server.team.members.srichowdhury
-- system.openssh.server.team.members.michaeltillman
-
+- system.openssh.server.team.members.brucemathews
+- system.openssh.server.team.members.ryanday
+- system.openssh.server.team.members.sachintripathi
 parameters:
   _param:
     linux_system_user_sudo: true
-  linux:
-    system:
-      user:
-        ivano:
-          enabled: false
-          name: ivano
-          sudo: true
-          full_name: Ivan Ostojic
-          home: /home/ivano
-          email: ivan@mirantis.com
-        asteer:
-          enabled: false
-          name: asteer
-          sudo: true
-          full_name: Adrian Steer
-          home: /home/asteer
-          email: asteer@mirantis.com
-        sbraun:
-          enabled: false
-          name: sbraun
-          sudo: true
-          full_name: Sebastien Braun
-          home: /home/sbraun
-          email: sbraun@mirantis.com
-  openssh:
-    server:
-      enabled: true
-      user:
-        ivano:
-          enabled: false
-          public_keys:
-          - ${public_keys:ivano}
-          user: ${linux:system:user:ivano}
-        asteer:
-          enabled: false
-          public_keys:
-          - ${public_keys:asteer}
-          user: ${linux:system:user:asteer}
-        sbraun:
-          enabled: false
-          public_keys:
-          - ${public_keys:sbraun}
-          user: ${linux:system:user:sbraun}
-  public_keys:
-    ivano:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQD94JXgHYTjfPoyYfWe5HgCPUgyal89VlI7ZYLr7RezAl+YQaaeO5adCXnnMDN2BiNf2l1SfbFf/A4Vi6W5eSRLqtSplpdhass7iqmmq+rDoXcELv6BZYnbOFhbFq2vegwcgk35A2uz9x9i3x3wHMLBZI/+dNCjCnW2Uikb/f0nmFqTLT5T9SJ/nmhs5oPd5vGKgFtYdRPLZW/fPxl180psPzBXmOCh50xyydxKPzncyFme+mgb0o1GjyBiJe7cXL/rXShcrFb9btMS+sXZZVQaDveaBHYUE+q+29yqR0c5uUusEzD9BWZVSoKPrFUMy/9YohGwRqbRE7Jh8XVF7Fff ivano@unicorn
-    asteer:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDBIXQqD5NH9glU5CBoodFtTuZMd5KgcjPDw0krOBaM0YkzbCGzEecLeqgd1oP2AbUO1nV80O9STatFhJ1NY1x1Xxv/k0n7kMIXpuxyAcVKbg6J/B5GzACsK9tKfnEypz8VvQcBB70h+4Y6G6AiOQxRpLJg4fHv/Q0fF3rl3diQyJZeTa6jjcYettikclZlYYyFh1eLQ7yzjbGL+KNX/ks/N55gl+N6BKYIGvhSUFI7Xex0p6qqpPM+XTsGJFVRBIrHnNiTtHc5SO+oN/J4u2PnO14tP8ZAeX33jF4XejbRvo8kA61KZ+i10wkSbGKFLQeYBrVnxJwo5FG+kOm8WnRF
-    sbraun:
-      key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDCdvb2aPES+H5+McRueB3EYbpdG/685pIJCH6mbFmTsIHlQobcJSSYtqww7ji/m6/KuMGE/Wc5f06d5v+beslfHKLaaAKXwWBpDgO77zwO42PbFPreFXKg8sNLPmqB+WEyIX7yAaJNxz0bbQgo2Vl3Bhtv/79zZXpzo0DIXNtdi75vwzWpuiyRuhC7pNqz+VXFZAVtkA+EchogDnT7rLa8ullSwuSgk5iPC6/XsuwL5Z5/UGBx4OT9Y8+cjb3g2oE9N3hdJH8wp9ts6stvKgAZ/5EE+LuCVhtKCvQ0sbZY8DmH99HFIP7SQoNQoyD8ALKbyCxGdF4/kxsqSlnLM5bR sebbraun@gmail.com
diff --git a/openssh/server/team/security.yml b/openssh/server/team/security.yml
index d914fdc..f5433bc 100644
--- a/openssh/server/team/security.yml
+++ b/openssh/server/team/security.yml
@@ -1,6 +1,6 @@
 classes:
 - system.linux.system.sudo
-- system.openssh.server.team.members.ahecko
+- system.openssh.server.team.members.deprecated.ahecko
 - system.openssh.server.team.members.deprecated.pmichalec
 parameters:
   _param:
diff --git a/openssh/server/team/services.yml b/openssh/server/team/services.yml
index 2b42acb..1190bd9 100644
--- a/openssh/server/team/services.yml
+++ b/openssh/server/team/services.yml
@@ -1,35 +1,28 @@
 classes:
 - system.linux.system.sudo
-- system.openssh.server.team.members.mniedbala
+- system.openssh.server.team.members.deprecated.miwinski
+- system.openssh.server.team.members.deprecated.mniedbala
+- system.openssh.server.team.members.deprecated.pcizinsky
 - system.openssh.server.team.members.deprecated.pmichalec
-- system.openssh.server.team.members.pcizinsky
-- system.openssh.server.team.members.lmercl
-- system.openssh.server.team.members.pruzicka
-- system.openssh.server.team.members.korlowska
-- system.openssh.server.team.members.miwinski
-- system.openssh.server.team.members.mlos
+- system.openssh.server.team.members.deprecated.sflorczak
+- system.openssh.server.team.members.deprecated.vblokhin
+- system.openssh.server.team.members.alis
+- system.openssh.server.team.members.alugovoi
 - system.openssh.server.team.members.dbogaczyk
 - system.openssh.server.team.members.dkruglov
-- system.openssh.server.team.members.sflorczak
-- system.openssh.server.team.members.alugovoi
-- system.openssh.server.team.members.tjaroszyk
-- system.openssh.server.team.members.sburns
-- system.openssh.server.team.members.yisakov
-- system.openssh.server.team.members.vblokhin
 - system.openssh.server.team.members.dstremkouski
-- system.openssh.server.team.members.osavatieiev
-- system.openssh.server.team.members.mchernik
 - system.openssh.server.team.members.hkraemer
-- system.openssh.server.team.members.pbasov
-- system.openssh.server.team.members.alis
 - system.openssh.server.team.members.isviridov
-- system.openssh.server.team.members.cdodda
-- system.openssh.server.team.members.lmendes
-- system.openssh.server.team.members.kalmog
-- system.openssh.server.team.members.vstruk
-- system.openssh.server.team.members.bworonicz
-- system.openssh.server.team.members.wnawrot
-- system.openssh.server.team.members.ckrupa
+- system.openssh.server.team.members.korlowska
+- system.openssh.server.team.members.lmercl
+- system.openssh.server.team.members.mchernik
+- system.openssh.server.team.members.mlos
+- system.openssh.server.team.members.osavatieiev
+- system.openssh.server.team.members.pbasov
+- system.openssh.server.team.members.pruzicka
+- system.openssh.server.team.members.sburns
+- system.openssh.server.team.members.tjaroszyk
+- system.openssh.server.team.members.yisakov
 - system.openssh.server.team.members.qwu
 parameters:
   _param:
diff --git a/openssh/server/team/services_qa.yml b/openssh/server/team/services_qa.yml
index 553e6a7..cdfdc80 100644
--- a/openssh/server/team/services_qa.yml
+++ b/openssh/server/team/services_qa.yml
@@ -1,9 +1,8 @@
 classes:
-- system.openssh.server.team.members.npliashechnikov
-- system.openssh.server.team.members.mchernik
-- system.openssh.server.team.members.osavatieiev
 - system.openssh.server.team.members.dkruglov
-
+- system.openssh.server.team.members.mchernik
+- system.openssh.server.team.members.npliashechnikov
+- system.openssh.server.team.members.osavatieiev
 parameters:
   _param:
     linux_system_user_sudo: true
diff --git a/openssh/server/team/support.yml b/openssh/server/team/support.yml
index bb8382b..2afa3fe 100644
--- a/openssh/server/team/support.yml
+++ b/openssh/server/team/support.yml
@@ -1,166 +1 @@
-## DEPRECATED, this class will be removed 01/2018
-## please integrate submodule opscare instead
-## https://gerrit.mirantis.com/#/admin/projects/mmo-support/reclass-opscare
-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.deprecated.collinmay
-- system.openssh.server.team.members.danilakhmetov
-- system.openssh.server.team.members.deniskostriukov
-- system.openssh.server.team.members.deprecated.dmitrygoloshubov
-- system.openssh.server.team.members.javierdiaz
-- system.openssh.server.team.members.jorgesorondo
-- system.openssh.server.team.members.josuepalmerin
-- system.openssh.server.team.members.deprecated.krzysztoffranckowski
-- system.openssh.server.team.members.deprecated.matthewroark
-- system.openssh.server.team.members.maximefimov
-- system.openssh.server.team.members.mikhailkraynov
-- system.openssh.server.team.members.deprecated.renesoto
-- system.openssh.server.team.members.deprecated.rsafonov
-- system.openssh.server.team.members.mmazepa
-- system.openssh.server.team.members.deprecated.scottmachtmes
-- system.openssh.server.team.members.deprecated.zahedkhurasani
-# L2OPS
-- system.openssh.server.team.members.aepifanov
-- system.openssh.server.team.members.deprecated.apetrenko
-- system.openssh.server.team.members.deprecated.atarasov
-- system.openssh.server.team.members.dklepikov
-- system.openssh.server.team.members.dsutyagin
-- system.openssh.server.team.members.deprecated.ekozhemyakin
-- system.openssh.server.team.members.enikanorov
-- system.openssh.server.team.members.deprecated.fsoppelsa
-- system.openssh.server.team.members.manashkin
-- system.openssh.server.team.members.deprecated.nkondra
-- system.openssh.server.team.members.deprecated.nkabanova
-- system.openssh.server.team.members.obryndzii
-- system.openssh.server.team.members.oliemieshko
-- system.openssh.server.team.members.deprecated.sovsianikov
-- system.openssh.server.team.members.deprecated.cade
-- system.openssh.server.team.members.jmosher
-- system.openssh.server.team.members.deprecated.ecantwell
-- system.openssh.server.team.members.lmercl
-- system.openssh.server.team.members.deprecated.osmola
-- system.openssh.server.team.members.pcizinsky
-- system.openssh.server.team.members.deprecated.pmathews
-- system.openssh.server.team.members.pmichalec
-parameters:
-  _param:
-    linux_system_user_sudo: true
-  linux:
-    system:
-      group:
-        supportl1:
-          enabled: false
-          name: supportl1
-        supportl2:
-          enabled: false
-          name: supportl2
-        support0:
-          enabled: false
-          name: support0
-        support1:
-          enabled: false
-          name: support1
-        support2:
-          enabled: false
-          name: support2
-        support3:
-          enabled: true
-          name: support3
-          addusers:
-            # L1
-            - ${linux:system:user:adobdin:name}
-            - ${linux:system:user:arubtsov:name}
-            - ${linux:system:user:aneliubin:name}
-            - ${linux:system:user:arodionov:name}
-            - ${linux:system:user:cmay:name}
-            - ${linux:system:user:dakhmetov:name}
-            - ${linux:system:user:dkostriukov:name}
-            - ${linux:system:user:dgoloshubov:name}
-            - ${linux:system:user:jdiaz:name}
-            - ${linux:system:user:jpalmerin:name}
-            - ${linux:system:user:kfranckowski:name}
-            - ${linux:system:user:mroark:name}
-            - ${linux:system:user:mefimov:name}
-            - ${linux:system:user:mkraynov:name}
-            - ${linux:system:user:nkabanova:name}
-            - ${linux:system:user:rsoto:name}
-            - ${linux:system:user:rsafonov:name}
-            # L2OPS
-            - ${linux:system:user:aepifanov:name}
-            - ${linux:system:user:apetrenko:name}
-            - ${linux:system:user:atarasov:name}
-            - ${linux:system:user:dklepikov:name}
-            - ${linux:system:user:dsutyagin:name}
-            - ${linux:system:user:ekozhemyakin:name}
-            - ${linux:system:user:enikanorov:name}
-            - ${linux:system:user:fsoppelsa:name}
-            - ${linux:system:user:manashkin:name}
-            - ${linux:system:user:nkondra:name}
-            - ${linux:system:user:nkabanova:name}
-            - ${linux:system:user:obryndzii:name}
-            - ${linux:system:user:oliemieshko:name}
-            - ${linux:system:user:sovsianikov:name}
-            - ${linux:system:user:pmichalec:name}
-            - ${linux:system:user:pcizinsky:name}
-            - ${linux:system:user:osmola:name}
-            - ${linux:system:user:jmosher:name}
-            - ${linux:system:user:lmercl: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.
-            setenv: true
-            commands:
-                - ALL
+# Deprecated since 01.2018
diff --git a/openssh/server/team/tcpcloud.yml b/openssh/server/team/tcpcloud.yml
index 64844db..5134b1a 100644
--- a/openssh/server/team/tcpcloud.yml
+++ b/openssh/server/team/tcpcloud.yml
@@ -1,5 +1,7 @@
 classes:
 - system.openssh.server.team.members.deprecated.akomarek
+- system.openssh.server.team.members.deprecated.askotnicky
+- system.openssh.server.team.members.deprecated.atengler
 - system.openssh.server.team.members.deprecated.chnyda
 - system.openssh.server.team.members.deprecated.fpytloun
 - system.openssh.server.team.members.deprecated.jbroulik
@@ -7,19 +9,17 @@
 - system.openssh.server.team.members.deprecated.jpavlik
 - system.openssh.server.team.members.deprecated.mceloud
 - system.openssh.server.team.members.deprecated.osmola
+- system.openssh.server.team.members.deprecated.pcizinsky
+- system.openssh.server.team.members.deprecated.pjediny
+- system.openssh.server.team.members.deprecated.pmichalec
 - system.openssh.server.team.members.deprecated.rfelkl
 - system.openssh.server.team.members.deprecated.tkukral
 - system.openssh.server.team.members.deprecated.vmikes
-- system.openssh.server.team.members.deprecated.askotnicky
 - system.openssh.server.team.members.deprecated.vzach
-- system.openssh.server.team.members.deprecated.pjediny
-- system.openssh.server.team.members.deprecated.atengler
-- system.openssh.server.team.members.deprecated.pmichalec
 - system.openssh.server.team.members.dcech
 - system.openssh.server.team.members.jcach
 - system.openssh.server.team.members.lmercl
 - system.openssh.server.team.members.mpolreich
-- system.openssh.server.team.members.pcizinsky
 - system.openssh.server.team.members.psvimbersky
 - system.openssh.server.team.members.skreys
 - system.openssh.server.team.members.smatov