diff --git a/inventory/group_vars/batcave b/inventory/group_vars/batcave
index 2fe5f4745c..3eddd7c905 100644
--- a/inventory/group_vars/batcave
+++ b/inventory/group_vars/batcave
@@ -8,7 +8,7 @@ tcp_ports: [ 80, 443, 8442, 8443 ]
 # Neeed for rsync from log01 for logs.
 custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.13 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT' ]
 
-fas_client_groups: sysadmin-ask,sysadmin-atomic,sysadmin-cvs,sysadmin-main,sysadmin-web,sysadmin-noc,sysadmin-hosted,sysadmin-releng,sysadmin-qa,sysadmin-tools,sysadmin-cloud,sysadmin-bot,sysadmin-centos,sysadmin-koschei,sysadmin-datanommer,sysadmin-fedimg,fi-apprentice,sysadmin-regcfp,sysadmin-badges,sysadmin-mbs,sysadmin-veteran,sysadmin-coreos,sysadmin-upstreamfirst,sysadmin-releasemonitoring,sysadmin-fpdc,sysadmin-messaging,sysadmin-libravatar,sysadmin-gnome,sysadmin-copr,sysadmin-osbs
+fas_client_groups: sysadmin-ask,sysadmin-atomic,sysadmin-cvs,sysadmin-main,sysadmin-web,sysadmin-noc,sysadmin-hosted,sysadmin-releng,sysadmin-qa,sysadmin-tools,sysadmin-cloud,sysadmin-bot,sysadmin-centos,sysadmin-koschei,sysadmin-datanommer,sysadmin-fedimg,fi-apprentice,sysadmin-regcfp,sysadmin-badges,sysadmin-mbs,sysadmin-veteran,sysadmin-coreos,sysadmin-upstreamfirst,sysadmin-releasemonitoring,sysadmin-fpdc,sysadmin-messaging,sysadmin-libravatar,sysadmin-gnome,sysadmin-copr,sysadmin-osbs,sysadmin-odcs
 
 ansible_base: /srv/web/infra
 freezes: false
diff --git a/inventory/group_vars/odcs_backend b/inventory/group_vars/odcs_backend
index 192d382f1c..2fc111a4bd 100644
--- a/inventory/group_vars/odcs_backend
+++ b/inventory/group_vars/odcs_backend
@@ -31,7 +31,7 @@ nfs_mount_opts: "ro,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3"
 # Neeed for rsync from log01 for logs.
 custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.13 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT' ]
 
-fas_client_groups: sysadmin-noc,sysadmin-releng,sysadmin-mbs,sysadmin-veteran
+fas_client_groups: sysadmin-noc,sysadmin-releng,sysadmin-odcs,sysadmin-veteran
 
 fedmsg_hub_auto_restart: True
 fedmsg_hub_memory_limit_mb: "{{ (mem_size / 2) | int }}"
diff --git a/inventory/group_vars/odcs_backend_stg b/inventory/group_vars/odcs_backend_stg
index 0941121dc3..4d0c804dcf 100644
--- a/inventory/group_vars/odcs_backend_stg
+++ b/inventory/group_vars/odcs_backend_stg
@@ -33,7 +33,7 @@ nfs_mount_opts: "ro,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3"
 # Neeed for rsync from log01 for logs.
 custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.13 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT' ]
 
-fas_client_groups: sysadmin-noc,sysadmin-releng,sysadmin-mbs,sysadmin-veteran
+fas_client_groups: sysadmin-noc,sysadmin-releng,sysadmin-odcs,sysadmin-veteran
 
 fedmsg_hub_auto_restart: True
 fedmsg_hub_memory_limit_mb: "{{ (mem_size / 2) | int }}"
diff --git a/inventory/group_vars/odcs_frontend b/inventory/group_vars/odcs_frontend
index 449f01f4b6..20af25c81b 100644
--- a/inventory/group_vars/odcs_frontend
+++ b/inventory/group_vars/odcs_frontend
@@ -26,7 +26,7 @@ udp_ports: [ 111 ]
 # Neeed for rsync from log01 for logs.
 custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.13 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT' ]
 
-fas_client_groups: sysadmin-noc,sysadmin-releng,sysadmin-mbs,sysadmin-veteran
+fas_client_groups: sysadmin-noc,sysadmin-releng,sysadmin-odcs,sysadmin-veteran
 
 # These are consumed by a task in roles/fedmsg/base/main.yml
 fedmsg_certs:
diff --git a/inventory/group_vars/odcs_frontend_stg b/inventory/group_vars/odcs_frontend_stg
index 285b949f84..789ebcf277 100644
--- a/inventory/group_vars/odcs_frontend_stg
+++ b/inventory/group_vars/odcs_frontend_stg
@@ -26,7 +26,7 @@ udp_ports: [ 111 ]
 # Neeed for rsync from log01 for logs.
 custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.13 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT' ]
 
-fas_client_groups: sysadmin-noc,sysadmin-releng,sysadmin-mbs,sysadmin-veteran
+fas_client_groups: sysadmin-noc,sysadmin-releng,sysadmin-odcs,sysadmin-veteran
 
 # These are consumed by a task in roles/fedmsg/base/main.yml
 fedmsg_certs:
diff --git a/roles/odcs/base/defaults/main.yml b/roles/odcs/base/defaults/main.yml
index 31761cf5f7..0ebfa59546 100644
--- a/roles/odcs/base/defaults/main.yml
+++ b/roles/odcs/base/defaults/main.yml
@@ -5,9 +5,9 @@ odcs_pdc_insecure: False
 odcs_pdc_develop: True
 odcs_target_dir: /srv/odcs
 odcs_target_dir_url: http://{{ inventory_hostname }}/composes
-odcs_allowed_clients_groups: {"sysadmin-mbs": {}, "sysadmin-osbs": {}, "packager": {"source_types": ["module"]}}
+odcs_allowed_clients_groups: {"sysadmin-odcs": {}, "packager": {"source_types": ["module"]}}
 odcs_allowed_clients_users: {"osbs@service": {}}
-odcs_admin_groups: ["sysadmin-mbs"]
+odcs_admin_groups: ["sysadmin-odcs"]
 odcs_admin_users: []
 odcs_raw_config_urls: {}
 odcs_pungi_runroot_enabled: False