diff --git a/src/com/mirantis/mk/DockerImageScanner.groovy b/src/com/mirantis/mk/DockerImageScanner.groovy
index 59e02d6..65d57ac 100644
--- a/src/com/mirantis/mk/DockerImageScanner.groovy
+++ b/src/com/mirantis/mk/DockerImageScanner.groovy
@@ -31,10 +31,7 @@
         case ~/^(tungsten|tungsten-operator)\/.*$/:
             team_assignee = 'OpenContrail'
             break
-        case ~/^(bm|general)\/.*$/:
-            team_assignee = 'BM/OS (KaaS BM)'
-            break
-        case ~/^openstack\/.*$/:
+        case ~/^(openstack|general\/mariadb|general\/general\/rabbitmq|general\/general\/rabbitmq-management)\/.*$/:
             team_assignee = 'OpenStack hardening'
             break
         case ~/^stacklight\/.*$/:
@@ -43,9 +40,12 @@
         case ~/^ceph\/.*$/:
             team_assignee = 'Storage'
             break
-        case ~/^(core|iam|lcm)\/.*$/:
+        case ~/^(core|iam|lcm|general\/external\/docker.io\/library\/nginx)\/.*$/:
             team_assignee = 'KaaS'
             break
+        case ~/^(bm|general)\/.*$/:
+            team_assignee = 'BM/OS (KaaS BM)'
+            break
         default:
             team_assignee = 'Release Engineering'
             break