diff --git a/csharp/App/SaliMax/src/Ess/StatusRecord.cs b/csharp/App/SaliMax/src/Ess/StatusRecord.cs
index 780155e5c..89c0b94a2 100644
--- a/csharp/App/SaliMax/src/Ess/StatusRecord.cs
+++ b/csharp/App/SaliMax/src/Ess/StatusRecord.cs
@@ -26,7 +26,7 @@ public record StatusRecord
     public required RelaysRecord?       Relays              { get; init; } 
     public required AmptStatus?         PvOnDc              { get; init; } 
     public required Config              Config              { get; set; } 
-    public required SystemLog           Log                 { get; set; }    // TODO: init only
+    public required SystemLog           Log                 { get; init; }    // TODO: init only
     
     public required EssControl          EssControl          { get; set; }    // TODO: init only
     public required StateMachine        StateMachine        { get; init; } 
diff --git a/csharp/App/SaliMax/src/Ess/SystemLog.cs b/csharp/App/SaliMax/src/Ess/SystemLog.cs
index da111a77a..67e2cedb6 100644
--- a/csharp/App/SaliMax/src/Ess/SystemLog.cs
+++ b/csharp/App/SaliMax/src/Ess/SystemLog.cs
@@ -1,8 +1,11 @@
+using InnovEnergy.App.SaliMax.DataTypes;
+
 namespace InnovEnergy.App.SaliMax.Ess;
 
 public record SystemLog
 {
-    public required String?           Message                { get; init; }
-    public required SalimaxAlarmState SalimaxAlarmState      { get; init; }
-
+    public required String?               Message                { get; init; }
+    public required SalimaxAlarmState     SalimaxAlarmState      { get; init; }
+    public required List<AlarmOrWarning>? SalimaxAlarms          { get; set; }
+    public required List<AlarmOrWarning>? SalimaxWarnings        { get; set; }
 }
\ No newline at end of file
diff --git a/csharp/App/SaliMax/src/Program.cs b/csharp/App/SaliMax/src/Program.cs
index c514988b0..324678550 100644
--- a/csharp/App/SaliMax/src/Program.cs
+++ b/csharp/App/SaliMax/src/Program.cs
@@ -175,7 +175,7 @@ internal static class Program
 
                 StateMachine     = StateMachine.Default,
                 EssControl       = EssControl.Default,
-                Log              = new SystemLog { SalimaxAlarmState = SalimaxAlarmState.Green, Message = null }, //TODO: Put real stuff
+                Log              = new SystemLog { SalimaxAlarmState = SalimaxAlarmState.Green, Message = null, SalimaxAlarms = null, SalimaxWarnings = null}, //TODO: Put real stuff
                 Config           = config // load from disk every iteration, so config can be changed while running
             };
         }
@@ -463,6 +463,9 @@ internal static class Program
             : salimaxAlarmsState; // this will be replaced by LedState
 
         int.TryParse(s3Bucket?.Split("-")[0], out var installationId);
+        
+        record.Log.SalimaxAlarms   = alarmList;
+        record.Log.SalimaxWarnings = warningList;
 
         var returnedStatus = new StatusMessage
         {