diff --git a/samples/matter/thermostat/src/temp_sensor_manager.cpp b/samples/matter/thermostat/src/temp_sensor_manager.cpp
index a2604020d506..2dd8ce7111ba 100644
--- a/samples/matter/thermostat/src/temp_sensor_manager.cpp
+++ b/samples/matter/thermostat/src/temp_sensor_manager.cpp
@@ -6,7 +6,6 @@
 
 #include "temp_sensor_manager.h"
 #include "app/task_executor.h"
-#include "app_task.h"
 #include "temperature_measurement/sensor.h"
 
 LOG_MODULE_DECLARE(app, CONFIG_CHIP_APP_LOG_LEVEL);
diff --git a/samples/matter/thermostat/src/temp_sensor_manager.h b/samples/matter/thermostat/src/temp_sensor_manager.h
index ddac6dd774e0..45592d5b4ab4 100644
--- a/samples/matter/thermostat/src/temp_sensor_manager.h
+++ b/samples/matter/thermostat/src/temp_sensor_manager.h
@@ -10,6 +10,7 @@
 
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <lib/core/CHIPError.h>
+#include <zephyr/kernel.h>
 
 using namespace chip;
 
diff --git a/samples/matter/thermostat/src/temperature_manager.cpp b/samples/matter/thermostat/src/temperature_manager.cpp
index e8fadf624aee..932344ed5804 100644
--- a/samples/matter/thermostat/src/temperature_manager.cpp
+++ b/samples/matter/thermostat/src/temperature_manager.cpp
@@ -5,7 +5,8 @@
  */
 
 #include "temperature_manager.h"
-#include "app_task.h"
+#include <app-common/zap-generated/cluster-objects.h>
+#include <platform/PlatformManager.h>
 #include <zephyr/logging/log.h>
 
 LOG_MODULE_DECLARE(app, CONFIG_CHIP_APP_LOG_LEVEL);
@@ -44,11 +45,16 @@ CHIP_ERROR TemperatureManager::Init()
 
 	PlatformMgr().LockChipStack();
 
-	VerifyOrExit(Status::Success == LocalTemperature::Get(kThermostatEndpoint, mLocalTempCelsius), err = CHIP_IM_GLOBAL_STATUS(Failure));
-	VerifyOrExit(Status::Success == OutdoorTemperature::Get(kThermostatEndpoint, mOutdoorTempCelsius), err = CHIP_IM_GLOBAL_STATUS(Failure));
-	VerifyOrExit(Status::Success == OccupiedCoolingSetpoint::Get(kThermostatEndpoint, &mCoolingCelsiusSetPoint), err = CHIP_IM_GLOBAL_STATUS(Failure));
-	VerifyOrExit(Status::Success == OccupiedHeatingSetpoint::Get(kThermostatEndpoint, &mHeatingCelsiusSetPoint), err = CHIP_IM_GLOBAL_STATUS(Failure));
-	VerifyOrExit(Status::Success == SystemMode::Get(kThermostatEndpoint, &mThermMode), err = CHIP_IM_GLOBAL_STATUS(Failure));
+	VerifyOrExit(Status::Success == LocalTemperature::Get(kThermostatEndpoint, mLocalTempCelsius),
+		     err = CHIP_IM_GLOBAL_STATUS(Failure));
+	VerifyOrExit(Status::Success == OutdoorTemperature::Get(kThermostatEndpoint, mOutdoorTempCelsius),
+		     err = CHIP_IM_GLOBAL_STATUS(Failure));
+	VerifyOrExit(Status::Success == OccupiedCoolingSetpoint::Get(kThermostatEndpoint, &mCoolingCelsiusSetPoint),
+		     err = CHIP_IM_GLOBAL_STATUS(Failure));
+	VerifyOrExit(Status::Success == OccupiedHeatingSetpoint::Get(kThermostatEndpoint, &mHeatingCelsiusSetPoint),
+		     err = CHIP_IM_GLOBAL_STATUS(Failure));
+	VerifyOrExit(Status::Success == SystemMode::Get(kThermostatEndpoint, &mThermMode),
+		     err = CHIP_IM_GLOBAL_STATUS(Failure));
 
 exit:
 	PlatformMgr().UnlockChipStack();
@@ -88,12 +94,14 @@ void TemperatureManager::AttributeChangeHandler(EndpointId endpointId, Attribute
 	switch (attributeId) {
 	case LocalTemperature::Id: {
 		status = LocalTemperature::Get(kThermostatEndpoint, mLocalTempCelsius);
-		VerifyOrReturn(Status::Success == status, LOG_ERR("Failed to get Thermostat LocalTemperature attribute"));
+		VerifyOrReturn(Status::Success == status,
+			       LOG_ERR("Failed to get Thermostat LocalTemperature attribute"));
 	} break;
 
 	case OutdoorTemperature::Id: {
 		status = OutdoorTemperature::Get(kThermostatEndpoint, mOutdoorTempCelsius);
-		VerifyOrReturn(Status::Success == status, LOG_ERR("Failed to get Thermostat OutdoorTemperature attribute"));
+		VerifyOrReturn(Status::Success == status,
+			       LOG_ERR("Failed to get Thermostat OutdoorTemperature attribute"));
 	} break;
 
 	case OccupiedCoolingSetpoint::Id: {
diff --git a/west.yml b/west.yml
index 15c08bac1efc..420f8a63de31 100644
--- a/west.yml
+++ b/west.yml
@@ -157,7 +157,7 @@ manifest:
     - name: matter
       repo-path: sdk-connectedhomeip
       path: modules/lib/matter
-      revision: cb40b0d0dcc8135c7cf9dc78f2b47d89404047ad
+      revision: 7e18666ee36cd752e69924c6cf0eb1056716a3cb
       west-commands: scripts/west/west-commands.yml
       submodules:
         - name: nlio