diff --git a/examples/all-clusters-app/all-clusters-common/include/static-supported-temperature-levels.h b/examples/all-clusters-app/all-clusters-common/include/static-supported-temperature-levels.h
index 1ef9f1db0c56ab..50739de0201628 100644
--- a/examples/all-clusters-app/all-clusters-common/include/static-supported-temperature-levels.h
+++ b/examples/all-clusters-app/all-clusters-common/include/static-supported-temperature-levels.h
@@ -20,7 +20,7 @@
 
 #include <app/clusters/temperature-control-server/supported-temperature-levels-manager.h>
 #include <app/util/af.h>
-#include <zap-generated/gen_config.h>
+#include <app/util/config.h>
 
 namespace chip {
 namespace app {
diff --git a/examples/all-clusters-app/all-clusters-common/src/static-supported-temperature-levels.cpp b/examples/all-clusters-app/all-clusters-common/src/static-supported-temperature-levels.cpp
index d5352eed7b6367..78f909b13143eb 100644
--- a/examples/all-clusters-app/all-clusters-common/src/static-supported-temperature-levels.cpp
+++ b/examples/all-clusters-app/all-clusters-common/src/static-supported-temperature-levels.cpp
@@ -17,7 +17,7 @@
  */
 
 #include <static-supported-temperature-levels.h>
-#include <zap-generated/gen_config.h>
+#include <app/util/config.h>
 
 using namespace std;
 using namespace chip;
diff --git a/examples/placeholder/linux/static-supported-temperature-levels.cpp b/examples/placeholder/linux/static-supported-temperature-levels.cpp
index 14a1087d230a4d..ed80f5490df821 100644
--- a/examples/placeholder/linux/static-supported-temperature-levels.cpp
+++ b/examples/placeholder/linux/static-supported-temperature-levels.cpp
@@ -18,7 +18,6 @@
 
 #include <app/util/config.h>
 #include <static-supported-temperature-levels.h>
-#include <zap-generated/gen_config.h>
 
 using namespace std;
 using namespace chip;
diff --git a/examples/refrigerator-app/refrigerator-common/include/static-supported-temperature-levels.h b/examples/refrigerator-app/refrigerator-common/include/static-supported-temperature-levels.h
index 1ef9f1db0c56ab..50739de0201628 100644
--- a/examples/refrigerator-app/refrigerator-common/include/static-supported-temperature-levels.h
+++ b/examples/refrigerator-app/refrigerator-common/include/static-supported-temperature-levels.h
@@ -20,7 +20,7 @@
 
 #include <app/clusters/temperature-control-server/supported-temperature-levels-manager.h>
 #include <app/util/af.h>
-#include <zap-generated/gen_config.h>
+#include <app/util/config.h>
 
 namespace chip {
 namespace app {
diff --git a/examples/refrigerator-app/refrigerator-common/src/static-supported-temperature-levels.cpp b/examples/refrigerator-app/refrigerator-common/src/static-supported-temperature-levels.cpp
index ae7a7dfa72c9ea..0ae695ec6ab315 100644
--- a/examples/refrigerator-app/refrigerator-common/src/static-supported-temperature-levels.cpp
+++ b/examples/refrigerator-app/refrigerator-common/src/static-supported-temperature-levels.cpp
@@ -17,7 +17,7 @@
  */
 
 #include <static-supported-temperature-levels.h>
-#include <zap-generated/gen_config.h>
+#include <app/util/config.h>
 
 using namespace std;
 using namespace chip;
diff --git a/src/app/clusters/general-diagnostics-server/general-diagnostics-server.cpp b/src/app/clusters/general-diagnostics-server/general-diagnostics-server.cpp
index 0c5cf641268ad9..6f4a5c3e74f5b4 100644
--- a/src/app/clusters/general-diagnostics-server/general-diagnostics-server.cpp
+++ b/src/app/clusters/general-diagnostics-server/general-diagnostics-server.cpp
@@ -17,7 +17,7 @@
 
 #include "general-diagnostics-server.h"
 
-#include <zap-generated/gen_config.h>
+#include <app/util/config.h>
 
 #ifdef ZCL_USING_TIME_SYNCHRONIZATION_CLUSTER_SERVER
 // Need the `nogncheck` because it's inter-cluster dependency and this
diff --git a/src/app/clusters/power-source-server/power-source-server.cpp b/src/app/clusters/power-source-server/power-source-server.cpp
index 3baf2df84949f4..037a182dd7a0d6 100644
--- a/src/app/clusters/power-source-server/power-source-server.cpp
+++ b/src/app/clusters/power-source-server/power-source-server.cpp
@@ -25,9 +25,9 @@
 #include <app-common/zap-generated/ids/Attributes.h>
 #include <app/util/af.h>
 #include <app/util/attribute-storage.h>
+#include <app/util/config.h>
 #include <lib/support/CodeUtils.h>
 #include <lib/support/logging/CHIPLogging.h>
-#include <zap-generated/gen_config.h>
 
 using namespace chip;
 using namespace app;
diff --git a/src/app/clusters/scenes-server/SceneTableImpl.h b/src/app/clusters/scenes-server/SceneTableImpl.h
index 753799ec70c68e..7bd124c9420865 100644
--- a/src/app/clusters/scenes-server/SceneTableImpl.h
+++ b/src/app/clusters/scenes-server/SceneTableImpl.h
@@ -20,11 +20,12 @@
 #include <app/clusters/scenes-server/SceneHandlerImpl.h>
 #include <app/clusters/scenes-server/SceneTable.h>
 #include <app/util/attribute-storage.h>
+#include <app/util/config.h>
 #include <lib/core/DataModelTypes.h>
 #include <lib/support/CommonIterator.h>
 #include <lib/support/PersistentData.h>
 #include <lib/support/Pool.h>
-#include <zap-generated/gen_config.h>
+
 
 namespace chip {
 namespace scenes {