diff --git a/conf/layer.conf b/conf/layer.conf
index d32aa47..0a43907 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -10,4 +10,4 @@ BBFILE_PATTERN_raspberrypi4 = "^${LAYERDIR}/"
 BBFILE_PRIORITY_raspberrypi4 = "6"
 
 LAYERDEPENDS_raspberrypi4 = "core"
-LAYERSERIES_COMPAT_raspberrypi4 = "dunfell"
+LAYERSERIES_COMPAT_raspberrypi4 = "kirkstone"
diff --git a/conf/machine/include/product.inc b/conf/machine/include/product.inc
index 0b09545..dad80bf 100644
--- a/conf/machine/include/product.inc
+++ b/conf/machine/include/product.inc
@@ -14,8 +14,8 @@ TCLIBCAPPEND = ""
 #MACHINEOVERRIDES .= ":arm"
 
 # This override is needed for systemd 2.30 patches to get applied. Refer RDKCentral jira RDKE-12
-MACHINEOVERRIDES .= ":dunfell"
-DISTRO_FEATURES_append = " dunfell"
+MACHINEOVERRIDES .= ":kirkstone"
+DISTRO_FEATURES_append = " kirkstone"
 
 require conf/multilib.conf
 MULTILIBS = "multilib:lib32"