diff --git a/layerindex/recipeparse.py b/layerindex/recipeparse.py
index 62c08e9..c918677 100644
--- a/layerindex/recipeparse.py
+++ b/layerindex/recipeparse.py
@@ -79,6 +79,7 @@ def init_parser(settings, branch, bitbakepath, enable_tracking=False, nocheckout
         if not classic:
             # We need this to avoid problems with AVAILABLE_LICENSES
             f.write('COREBASE = "%s"\n' % core_repodir)
+            f.write('BBLAYERS = "%s/meta"\n' % core_repodir)
         pass
 
     if logger:
diff --git a/layerindex/update_layer.py b/layerindex/update_layer.py
index 42f99be..f3f5e17 100644
--- a/layerindex/update_layer.py
+++ b/layerindex/update_layer.py
@@ -397,7 +397,11 @@ def main():
                 tinfoil.config_data.setVar('LICENSE', '')
 
                 layerconfparser = layerconfparse.LayerConfParse(logger=logger, tinfoil=tinfoil)
-                layer_config_data = layerconfparser.parse_layer(layerdir)
+                if layer.name == settings.CORE_LAYER_NAME:
+                    # Skip parsing the core layer, we already did via BBLAYERS
+                    layer_config_data = layerconfparser.config_data_copy
+                else:
+                    layer_config_data = layerconfparser.parse_layer(layerdir)
                 if not layer_config_data:
                     logger.info("Skipping update of layer %s for branch %s - conf/layer.conf may have parse issues" % (layer.name, branchdesc))
                     layerconfparser.shutdown()