diff --git a/src/components/infinisleep/InfiniSleepController.cpp b/src/components/infinisleep/InfiniSleepController.cpp
index b020fc1cea..1e1a78cb2c 100644
--- a/src/components/infinisleep/InfiniSleepController.cpp
+++ b/src/components/infinisleep/InfiniSleepController.cpp
@@ -9,8 +9,9 @@ using namespace std::chrono_literals;
 
 InfiniSleepController::InfiniSleepController(Controllers::DateTime& dateTimeController,
                                              Controllers::FS& fs,
-                                             Controllers::HeartRateController& heartRateController)
-  : dateTimeController {dateTimeController}, fs {fs}, heartRateController {heartRateController} {
+                                             Controllers::HeartRateController& heartRateController,
+                                             Controllers::BrightnessController& brightnessController)
+  : dateTimeController {dateTimeController}, fs {fs}, heartRateController {heartRateController}, brightnessController {brightnessController} {
 }
 
 namespace {
@@ -49,10 +50,14 @@ void InfiniSleepController::Init(System::SystemTask* systemTask) {
     NRF_LOG_INFO("[InfiniSleepController] Loaded wake alarm was enabled, scheduling");
     ScheduleWakeAlarm();
   }
+
+  prevBrightnessLevel = brightnessController.Level();
 }
 
 void InfiniSleepController::EnableTracker() {
-  DisableTracker();
+  prevBrightnessLevel = brightnessController.Level();
+  brightnessController.Set(BrightnessController::Levels::Low);
+  // DisableTracker();
   NRF_LOG_INFO("[InfiniSleepController] Enabling tracker");
   isEnabled = true;
   trackerUpdateTimer =
@@ -61,6 +66,7 @@ void InfiniSleepController::EnableTracker() {
 }
 
 void InfiniSleepController::DisableTracker() {
+  brightnessController.Set(prevBrightnessLevel);
   NRF_LOG_INFO("[InfiniSleepController] Disabling tracker");
   xTimerStop(trackerUpdateTimer, 0);
   isEnabled = false;
diff --git a/src/components/infinisleep/InfiniSleepController.h b/src/components/infinisleep/InfiniSleepController.h
index 183147d302..53cf0b0ac2 100644
--- a/src/components/infinisleep/InfiniSleepController.h
+++ b/src/components/infinisleep/InfiniSleepController.h
@@ -29,7 +29,8 @@ namespace Pinetime {
     public:
       InfiniSleepController(Controllers::DateTime& dateTimeCOntroller,
                             Controllers::FS&,
-                            Controllers::HeartRateController& heartRateController);
+                            Controllers::HeartRateController& heartRateController,
+                            Controllers::BrightnessController& brightnessController);
 
       void Init(System::SystemTask* systemTask);
       void SaveWakeAlarm();
@@ -169,6 +170,8 @@ namespace Pinetime {
         return infiniSleepSettings;
       }
 
+      BrightnessController::Levels prevBrightnessLevel;
+
       bool ToggleTracker() {
         if (isEnabled) {
           prevSessionData.endTimeHours = GetCurrentHour();
@@ -216,6 +219,7 @@ namespace Pinetime {
       Controllers::DateTime& dateTimeController;
       Controllers::FS& fs;
       Controllers::HeartRateController& heartRateController;
+      Controllers::BrightnessController& brightnessController;
       System::SystemTask* systemTask = nullptr;
       TimerHandle_t wakeAlarmTimer;
       TimerHandle_t gradualWakeTimer;
diff --git a/src/components/motor/MotorController.cpp b/src/components/motor/MotorController.cpp
index 8a12971725..d6c64bfd80 100644
--- a/src/components/motor/MotorController.cpp
+++ b/src/components/motor/MotorController.cpp
@@ -118,10 +118,14 @@ void MotorController::StartNaturalWakeAlarm() {
 void MotorController::NaturalWakeAlarmRing(TimerHandle_t xTimer) {
   auto* motorController = static_cast<MotorController*>(pvTimerGetTimerID(xTimer));
   if (motorController->wakeAlarmStrength > (40 * motorController->infiniSleepMotorStrength) / 100) {
-    motorController->wakeAlarmStrength -= (30 * motorController->infiniSleepMotorStrength) / 100;
+    motorController->wakeAlarmStrength -= (15 * motorController->infiniSleepMotorStrength) / 100;
+  } else {
+    motorController->wakeAlarmStrength += (30 * motorController->infiniSleepMotorStrength) / 100;
   }
   if (motorController->wakeAlarmDuration < 500) {
-    motorController->wakeAlarmDuration += 180;
+    motorController->wakeAlarmDuration += 90;
+  } else {
+    motorController->wakeAlarmDuration -= 90;
   }
   motorController->SetMotorStrength(motorController->wakeAlarmStrength);
   motorController->RunForDuration(motorController->wakeAlarmDuration);
diff --git a/src/main.cpp b/src/main.cpp
index 3efc6bb59d..f60f592c63 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -105,12 +105,14 @@ Pinetime::Drivers::Watchdog watchdog;
 Pinetime::Controllers::NotificationManager notificationManager;
 Pinetime::Controllers::MotionController motionController;
 Pinetime::Controllers::AlarmController alarmController {dateTimeController, fs};
-Pinetime::Controllers::InfiniSleepController infiniSleepController {dateTimeController, fs, heartRateController};
 
 Pinetime::Controllers::TouchHandler touchHandler;
 Pinetime::Controllers::ButtonHandler buttonHandler;
 Pinetime::Controllers::BrightnessController brightnessController {};
 
+Pinetime::Controllers::InfiniSleepController infiniSleepController {dateTimeController, fs, heartRateController, brightnessController};
+
+
 Pinetime::Applications::DisplayApp displayApp(lcd,
                                               touchPanel,
                                               batteryController,