diff --git a/src/com/mirantis/mk/DockerImageScanner.groovy b/src/com/mirantis/mk/DockerImageScanner.groovy
index 2816037..4d6a72e 100644
--- a/src/com/mirantis/mk/DockerImageScanner.groovy
+++ b/src/com/mirantis/mk/DockerImageScanner.groovy
@@ -34,7 +34,10 @@
         case ~/^(tungsten|tungsten-operator)\/.*$/:
             team_assignee = 'OpenContrail'
             break
-        case ~/^(openstack|general\/mariadb|general\/general\/rabbitmq|general\/general\/rabbitmq-management)\/.*$/:
+        case ~/^(general\/mariadb|general\/dnsmasq|general\/ubuntu\/bionic|general\/ubuntu\/focal)\/.*$/:
+            team_assignee = 'BM/OS (KaaS BM)'
+            break
+        case ~/^(openstack|general\/rabbitmq|general\/rabbitmq-management)\/.*$/:
             team_assignee = 'OpenStack hardening'
             break
         case ~/^stacklight\/.*$/:
@@ -46,9 +49,6 @@
         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