diff --git a/meta-selftest/conf/layer.conf b/meta-selftest/conf/layer.conf
index cc65b461ba..48ca8464f9 100644
--- a/meta-selftest/conf/layer.conf
+++ b/meta-selftest/conf/layer.conf
@@ -11,4 +11,4 @@ BBFILE_PRIORITY_selftest = "5"
 
 addpylib ${LAYERDIR}/lib oeqa
 
-LAYERSERIES_COMPAT_selftest = "nanbield"
+LAYERSERIES_COMPAT_selftest = "scarthgap"
diff --git a/meta-skeleton/conf/layer.conf b/meta-skeleton/conf/layer.conf
index b180e61d03..0414fb51b6 100644
--- a/meta-skeleton/conf/layer.conf
+++ b/meta-skeleton/conf/layer.conf
@@ -14,4 +14,4 @@ LAYERVERSION_skeleton = "1"
 
 LAYERDEPENDS_skeleton = "core"
 
-LAYERSERIES_COMPAT_skeleton = "nanbield"
+LAYERSERIES_COMPAT_skeleton = "scarthgap"
diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf
index bb8b1c81b1..2418ee7d53 100644
--- a/meta/conf/layer.conf
+++ b/meta/conf/layer.conf
@@ -7,12 +7,12 @@ BBFILE_COLLECTIONS += "core"
 BBFILE_PATTERN_core = "^${LAYERDIR}/"
 BBFILE_PRIORITY_core = "5"
 
-LAYERSERIES_CORENAMES = "nanbield"
+LAYERSERIES_CORENAMES = "nanbield scarthgap"
 
 # This should only be incremented on significant changes that will
 # cause compatibility issues with other layers
 LAYERVERSION_core = "15"
-LAYERSERIES_COMPAT_core = "nanbield"
+LAYERSERIES_COMPAT_core = "scarthgap"
 
 BBLAYERS_LAYERINDEX_NAME_core = "openembedded-core"