diff --git a/kolla/image/build.py b/kolla/image/build.py
index 0e2b87244e..7ec8423713 100644
--- a/kolla/image/build.py
+++ b/kolla/image/build.py
@@ -812,6 +812,9 @@ class KollaWorker(object):
                     installation['reference'] = self.conf[section]['reference']
             return installation
 
+        all_sections = (set(six.iterkeys(self.conf._groups)) |
+                        set(self.conf.list_all_sections()))
+
         for path in self.docker_build_paths:
             # Reading parent image name
             with open(os.path.join(path, 'Dockerfile')) as f:
@@ -834,7 +837,7 @@ class KollaWorker(object):
                 for plugin in [match.group(0) for match in
                                (re.search('^{}-plugin-.+'.format(image.name),
                                           section) for section in
-                                self.conf.list_all_sections()) if match]:
+                                all_sections) if match]:
                     try:
                         self.conf.register_opts(
                             common_config.get_source_opts(),