diff --git a/backend/api/Controllers/Models/RobotResponse.cs b/backend/api/Controllers/Models/RobotResponse.cs
index fbb7119d7..7a7f0ca52 100644
--- a/backend/api/Controllers/Models/RobotResponse.cs
+++ b/backend/api/Controllers/Models/RobotResponse.cs
@@ -20,6 +20,8 @@ public class RobotResponse
 
         public float BatteryLevel { get; set; }
 
+        public BatteryState? BatteryState { get; set; }
+
         public float? PressureLevel { get; set; }
 
         public IList<DocumentInfo> Documentation { get; set; }
@@ -59,6 +61,7 @@ public RobotResponse(Robot robot)
             CurrentInstallation = robot.CurrentInstallation;
             CurrentArea = robot.CurrentArea != null ? new AreaResponse(robot.CurrentArea) : null;
             BatteryLevel = robot.BatteryLevel;
+            BatteryState = robot.BatteryState;
             PressureLevel = robot.PressureLevel;
             Documentation = robot.Documentation;
             Host = robot.Host;
diff --git a/backend/api/Database/Models/Robot.cs b/backend/api/Database/Models/Robot.cs
index 2d43c8ac6..289dfe767 100644
--- a/backend/api/Database/Models/Robot.cs
+++ b/backend/api/Database/Models/Robot.cs
@@ -74,6 +74,8 @@ public Robot(CreateRobotQuery createQuery, Installation installation, RobotModel
 
         public float BatteryLevel { get; set; }
 
+        public BatteryState? BatteryState { get; set; }
+
         public float? PressureLevel { get; set; }
 
         public bool IsRobotPressureTooLow()
@@ -176,4 +178,10 @@ public enum RobotCapabilitiesEnum
         docking_procedure,
         return_to_home,
     }
+
+    public enum BatteryState
+    {
+        Normal,
+        Charging,
+    }
 }
diff --git a/backend/api/EventHandlers/MqttEventHandler.cs b/backend/api/EventHandlers/MqttEventHandler.cs
index e39d85ec7..4ab41b011 100644
--- a/backend/api/EventHandlers/MqttEventHandler.cs
+++ b/backend/api/EventHandlers/MqttEventHandler.cs
@@ -431,6 +431,10 @@ private async void OnIsarBatteryUpdate(object? sender, MqttReceivedArgs mqttArgs
             _logger.LogDebug("Semaphore acquired for updating battery");
 
             var robot = await BatteryTimeseriesService.AddBatteryEntry(batteryStatus.BatteryLevel, batteryStatus.IsarId);
+            if (robot != null && robot.BatteryState != batteryStatus.BatteryState)
+            {
+                robot = await RobotService.UpdateRobotBatteryState(robot.Id, batteryStatus.BatteryState);
+            }
 
             _updateRobotSemaphore.Release();
             _logger.LogDebug("Semaphore released after updating battery");
diff --git a/backend/api/MQTT/MessageModels/IsarBattery.cs b/backend/api/MQTT/MessageModels/IsarBattery.cs
index 62408e3c3..63cf0be08 100644
--- a/backend/api/MQTT/MessageModels/IsarBattery.cs
+++ b/backend/api/MQTT/MessageModels/IsarBattery.cs
@@ -1,4 +1,5 @@
 using System.Text.Json.Serialization;
+using Api.Database.Models;
 
 namespace Api.Mqtt.MessageModels
 {
@@ -8,6 +9,9 @@ public class IsarBatteryMessage : MqttMessage
         [JsonPropertyName("battery_level")]
         public float BatteryLevel { get; set; }
 
+        [JsonPropertyName("battery_state")]
+        public BatteryState? BatteryState { get; set; }
+
         [JsonPropertyName("robot_name")]
         public string RobotName { get; set; }
 
diff --git a/backend/api/Migrations/20241212090302_AddBatteryStateToRobot.Designer.cs b/backend/api/Migrations/20241212090302_AddBatteryStateToRobot.Designer.cs
new file mode 100644
index 000000000..cce10f6ba
--- /dev/null
+++ b/backend/api/Migrations/20241212090302_AddBatteryStateToRobot.Designer.cs
@@ -0,0 +1,1375 @@
+// <auto-generated />
+using System;
+using Api.Database.Context;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace Api.Migrations
+{
+    [DbContext(typeof(FlotillaDbContext))]
+    [Migration("20241212090302_AddBatteryStateToRobot")]
+    partial class AddBatteryStateToRobot
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.7")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Api.Database.Models.AccessRole", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text");
+
+                    b.Property<string>("AccessLevel")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("InstallationId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RoleName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("InstallationId");
+
+                    b.ToTable("AccessRoles");
+                });
+
+            modelBuilder.Entity("Api.Database.Models.Area", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text");
+
+                    b.Property<string>("DeckId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("DefaultLocalizationPoseId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("InstallationId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)");
+
+                    b.Property<string>("PlantId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DeckId");
+
+                    b.HasIndex("DefaultLocalizationPoseId");
+
+                    b.HasIndex("InstallationId");
+
+                    b.HasIndex("PlantId");
+
+                    b.ToTable("Areas");
+                });
+
+            modelBuilder.Entity("Api.Database.Models.Deck", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text");
+
+                    b.Property<string>("DefaultLocalizationPoseId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("InstallationId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)");
+
+                    b.Property<string>("PlantId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DefaultLocalizationPoseId");
+
+                    b.HasIndex("InstallationId");
+
+                    b.HasIndex("PlantId");
+
+                    b.ToTable("Decks");
+                });
+
+            modelBuilder.Entity("Api.Database.Models.DefaultLocalizationPose", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text");
+
+                    b.Property<bool>("DockingEnabled")
+                        .HasColumnType("boolean");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("DefaultLocalizationPoses");
+                });
+
+            modelBuilder.Entity("Api.Database.Models.Inspection", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text");
+
+                    b.Property<string>("AnalysisType")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("EndTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("InspectionTargetName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("InspectionType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("InspectionUrl")
+                        .HasMaxLength(250)
+                        .HasColumnType("character varying(250)");
+
+                    b.Property<string>("IsarTaskId")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)");
+
+                    b.Property<DateTime?>("StartTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<float?>("VideoDuration")
+                        .HasColumnType("real");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Inspections");
+                });
+
+            modelBuilder.Entity("Api.Database.Models.InspectionFinding", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Finding")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("InspectionDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("InspectionId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IsarTaskId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("InspectionId");
+
+                    b.ToTable("InspectionFindings");
+                });
+
+            modelBuilder.Entity("Api.Database.Models.Installation", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text");
+
+                    b.Property<string>("InstallationCode")
+                        .IsRequired()
+                        .HasMaxLength(10)
+                        .HasColumnType("character varying(10)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("InstallationCode")
+                        .IsUnique();
+
+                    b.ToTable("Installations");
+                });
+
+            modelBuilder.Entity("Api.Database.Models.MissionDefinition", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text");
+
+                    b.Property<string>("AreaId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Comment")
+                        .HasMaxLength(1000)
+                        .HasColumnType("character varying(1000)");
+
+                    b.Property<long?>("InspectionFrequency")
+                        .HasColumnType("bigint");
+
+                    b.Property<string>("InstallationCode")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeprecated")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("LastSuccessfulRunId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)");
+
+                    b.Property<string>("SourceId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AreaId");
+
+                    b.HasIndex("LastSuccessfulRunId");
+
+                    b.HasIndex("SourceId");
+
+                    b.ToTable("MissionDefinitions");
+                });
+
+            modelBuilder.Entity("Api.Database.Models.MissionRun", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text");
+
+                    b.Property<string>("AreaId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Comment")
+                        .HasMaxLength(1000)
+                        .HasColumnType("character varying(1000)");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(450)
+                        .HasColumnType("character varying(450)");
+
+                    b.Property<DateTime>("DesiredStartTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<DateTime?>("EndTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<long?>("EstimatedDuration")
+                        .HasColumnType("bigint");
+
+                    b.Property<string>("InstallationCode")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)");
+
+                    b.Property<bool>("IsDeprecated")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("IsarMissionId")
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)");
+
+                    b.Property<string>("MissionId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("MissionRunType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)");
+
+                    b.Property<string>("RobotId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("StartTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("StatusReason")
+                        .HasMaxLength(450)
+                        .HasColumnType("character varying(450)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AreaId");
+
+                    b.HasIndex("RobotId");
+
+                    b.ToTable("MissionRuns");
+                });
+
+            modelBuilder.Entity("Api.Database.Models.MissionTask", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(500)
+                        .HasColumnType("character varying(500)");
+
+                    b.Property<DateTime?>("EndTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("InspectionId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IsarTaskId")
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)");
+
+                    b.Property<string>("MissionRunId")
+                        .HasColumnType("text");
+
+                    b.Property<int?>("PoseId")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime?>("StartTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("TagId")
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)");
+
+                    b.Property<string>("TagLink")
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)");
+
+                    b.Property<int>("TaskOrder")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("InspectionId");
+
+                    b.HasIndex("MissionRunId");
+
+                    b.ToTable("MissionTasks");
+                });
+
+            modelBuilder.Entity("Api.Database.Models.Plant", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text");
+
+                    b.Property<string>("InstallationId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)");
+
+                    b.Property<string>("PlantCode")
+                        .IsRequired()
+                        .HasMaxLength(10)
+                        .HasColumnType("character varying(10)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("InstallationId");
+
+                    b.HasIndex("PlantCode")
+                        .IsUnique();
+
+                    b.ToTable("Plants");
+                });
+
+            modelBuilder.Entity("Api.Database.Models.Robot", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text");
+
+                    b.Property<float>("BatteryLevel")
+                        .HasColumnType("real");
+
+                    b.Property<string>("BatteryState")
+                        .HasColumnType("text");
+
+                    b.Property<string>("CurrentAreaId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("CurrentInstallationId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("CurrentMissionId")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("Deprecated")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("FlotillaStatus")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Host")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)");
+
+                    b.Property<bool>("IsarConnected")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("IsarId")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)");
+
+                    b.Property<bool>("MissionQueueFrozen")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ModelId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)");
+
+                    b.Property<int>("Port")
+                        .HasColumnType("integer");
+
+                    b.Property<float?>("PressureLevel")
+                        .HasColumnType("real");
+
+                    b.Property<string>("RobotCapabilities")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SerialNumber")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CurrentAreaId");
+
+                    b.HasIndex("CurrentInstallationId");
+
+                    b.HasIndex("ModelId");
+
+                    b.ToTable("Robots");
+                });
+
+            modelBuilder.Entity("Api.Database.Models.RobotBatteryTimeseries", b =>
+                {
+                    b.Property<float>("BatteryLevel")
+                        .HasColumnType("real");
+
+                    b.Property<string>("MissionId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RobotId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.ToTable("RobotBatteryTimeseries");
+                });
+
+            modelBuilder.Entity("Api.Database.Models.RobotModel", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text");
+
+                    b.Property<float?>("AverageDurationPerTag")
+                        .HasColumnType("real");
+
+                    b.Property<float?>("BatteryMissionStartThreshold")
+                        .HasColumnType("real");
+
+                    b.Property<float?>("BatteryWarningThreshold")
+                        .HasColumnType("real");
+
+                    b.Property<float?>("LowerPressureWarningThreshold")
+                        .HasColumnType("real");
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<float?>("UpperPressureWarningThreshold")
+                        .HasColumnType("real");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Type")
+                        .IsUnique();
+
+                    b.ToTable("RobotModels");
+                });
+
+            modelBuilder.Entity("Api.Database.Models.RobotPoseTimeseries", b =>
+                {
+                    b.Property<string>("MissionId")
+                        .HasColumnType("text");
+
+                    b.Property<float>("OrientationW")
+                        .HasColumnType("real");
+
+                    b.Property<float>("OrientationX")
+                        .HasColumnType("real");
+
+                    b.Property<float>("OrientationY")
+                        .HasColumnType("real");
+
+                    b.Property<float>("OrientationZ")
+                        .HasColumnType("real");
+
+                    b.Property<float>("PositionX")
+                        .HasColumnType("real");
+
+                    b.Property<float>("PositionY")
+                        .HasColumnType("real");
+
+                    b.Property<float>("PositionZ")
+                        .HasColumnType("real");
+
+                    b.Property<string>("RobotId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.ToTable("RobotPoseTimeseries");
+                });
+
+            modelBuilder.Entity("Api.Database.Models.RobotPressureTimeseries", b =>
+                {
+                    b.Property<string>("MissionId")
+                        .HasColumnType("text");
+
+                    b.Property<float>("Pressure")
+                        .HasColumnType("real");
+
+                    b.Property<string>("RobotId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.ToTable("RobotPressureTimeseries");
+                });
+
+            modelBuilder.Entity("Api.Database.Models.Source", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text");
+
+                    b.Property<string>("CustomMissionTasks")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SourceId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Sources");
+                });
+
+            modelBuilder.Entity("Api.Database.Models.UserInfo", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Oid")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("UserInfos");
+                });
+
+            modelBuilder.Entity("Api.Services.MissionLoaders.TagInspectionMetadata", b =>
+                {
+                    b.Property<string>("TagId")
+                        .HasColumnType("text");
+
+                    b.HasKey("TagId");
+
+                    b.ToTable("TagInspectionMetadata");
+                });
+
+            modelBuilder.Entity("Api.Database.Models.AccessRole", b =>
+                {
+                    b.HasOne("Api.Database.Models.Installation", "Installation")
+                        .WithMany()
+                        .HasForeignKey("InstallationId");
+
+                    b.Navigation("Installation");
+                });
+
+            modelBuilder.Entity("Api.Database.Models.Area", b =>
+                {
+                    b.HasOne("Api.Database.Models.Deck", "Deck")
+                        .WithMany()
+                        .HasForeignKey("DeckId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Api.Database.Models.DefaultLocalizationPose", "DefaultLocalizationPose")
+                        .WithMany()
+                        .HasForeignKey("DefaultLocalizationPoseId");
+
+                    b.HasOne("Api.Database.Models.Installation", "Installation")
+                        .WithMany()
+                        .HasForeignKey("InstallationId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Api.Database.Models.Plant", "Plant")
+                        .WithMany()
+                        .HasForeignKey("PlantId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.OwnsOne("Api.Database.Models.MapMetadata", "MapMetadata", b1 =>
+                        {
+                            b1.Property<string>("AreaId")
+                                .HasColumnType("text");
+
+                            b1.Property<string>("MapName")
+                                .IsRequired()
+                                .HasMaxLength(200)
+                                .HasColumnType("character varying(200)");
+
+                            b1.HasKey("AreaId");
+
+                            b1.ToTable("Areas");
+
+                            b1.WithOwner()
+                                .HasForeignKey("AreaId");
+
+                            b1.OwnsOne("Api.Database.Models.Boundary", "Boundary", b2 =>
+                                {
+                                    b2.Property<string>("MapMetadataAreaId")
+                                        .HasColumnType("text");
+
+                                    b2.Property<double>("X1")
+                                        .HasColumnType("double precision");
+
+                                    b2.Property<double>("X2")
+                                        .HasColumnType("double precision");
+
+                                    b2.Property<double>("Y1")
+                                        .HasColumnType("double precision");
+
+                                    b2.Property<double>("Y2")
+                                        .HasColumnType("double precision");
+
+                                    b2.Property<double>("Z1")
+                                        .HasColumnType("double precision");
+
+                                    b2.Property<double>("Z2")
+                                        .HasColumnType("double precision");
+
+                                    b2.HasKey("MapMetadataAreaId");
+
+                                    b2.ToTable("Areas");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("MapMetadataAreaId");
+                                });
+
+                            b1.OwnsOne("Api.Database.Models.TransformationMatrices", "TransformationMatrices", b2 =>
+                                {
+                                    b2.Property<string>("MapMetadataAreaId")
+                                        .HasColumnType("text");
+
+                                    b2.Property<double>("C1")
+                                        .HasColumnType("double precision");
+
+                                    b2.Property<double>("C2")
+                                        .HasColumnType("double precision");
+
+                                    b2.Property<double>("D1")
+                                        .HasColumnType("double precision");
+
+                                    b2.Property<double>("D2")
+                                        .HasColumnType("double precision");
+
+                                    b2.HasKey("MapMetadataAreaId");
+
+                                    b2.ToTable("Areas");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("MapMetadataAreaId");
+                                });
+
+                            b1.Navigation("Boundary")
+                                .IsRequired();
+
+                            b1.Navigation("TransformationMatrices")
+                                .IsRequired();
+                        });
+
+                    b.Navigation("Deck");
+
+                    b.Navigation("DefaultLocalizationPose");
+
+                    b.Navigation("Installation");
+
+                    b.Navigation("MapMetadata")
+                        .IsRequired();
+
+                    b.Navigation("Plant");
+                });
+
+            modelBuilder.Entity("Api.Database.Models.Deck", b =>
+                {
+                    b.HasOne("Api.Database.Models.DefaultLocalizationPose", "DefaultLocalizationPose")
+                        .WithMany()
+                        .HasForeignKey("DefaultLocalizationPoseId");
+
+                    b.HasOne("Api.Database.Models.Installation", "Installation")
+                        .WithMany()
+                        .HasForeignKey("InstallationId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Api.Database.Models.Plant", "Plant")
+                        .WithMany()
+                        .HasForeignKey("PlantId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("DefaultLocalizationPose");
+
+                    b.Navigation("Installation");
+
+                    b.Navigation("Plant");
+                });
+
+            modelBuilder.Entity("Api.Database.Models.DefaultLocalizationPose", b =>
+                {
+                    b.OwnsOne("Api.Database.Models.Pose", "Pose", b1 =>
+                        {
+                            b1.Property<string>("DefaultLocalizationPoseId")
+                                .HasColumnType("text");
+
+                            b1.HasKey("DefaultLocalizationPoseId");
+
+                            b1.ToTable("DefaultLocalizationPoses");
+
+                            b1.WithOwner()
+                                .HasForeignKey("DefaultLocalizationPoseId");
+
+                            b1.OwnsOne("Api.Database.Models.Orientation", "Orientation", b2 =>
+                                {
+                                    b2.Property<string>("PoseDefaultLocalizationPoseId")
+                                        .HasColumnType("text");
+
+                                    b2.Property<float>("W")
+                                        .HasColumnType("real");
+
+                                    b2.Property<float>("X")
+                                        .HasColumnType("real");
+
+                                    b2.Property<float>("Y")
+                                        .HasColumnType("real");
+
+                                    b2.Property<float>("Z")
+                                        .HasColumnType("real");
+
+                                    b2.HasKey("PoseDefaultLocalizationPoseId");
+
+                                    b2.ToTable("DefaultLocalizationPoses");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("PoseDefaultLocalizationPoseId");
+                                });
+
+                            b1.OwnsOne("Api.Database.Models.Position", "Position", b2 =>
+                                {
+                                    b2.Property<string>("PoseDefaultLocalizationPoseId")
+                                        .HasColumnType("text");
+
+                                    b2.Property<float>("X")
+                                        .HasColumnType("real");
+
+                                    b2.Property<float>("Y")
+                                        .HasColumnType("real");
+
+                                    b2.Property<float>("Z")
+                                        .HasColumnType("real");
+
+                                    b2.HasKey("PoseDefaultLocalizationPoseId");
+
+                                    b2.ToTable("DefaultLocalizationPoses");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("PoseDefaultLocalizationPoseId");
+                                });
+
+                            b1.Navigation("Orientation")
+                                .IsRequired();
+
+                            b1.Navigation("Position")
+                                .IsRequired();
+                        });
+
+                    b.Navigation("Pose")
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Api.Database.Models.Inspection", b =>
+                {
+                    b.OwnsOne("Api.Database.Models.Position", "InspectionTarget", b1 =>
+                        {
+                            b1.Property<string>("InspectionId")
+                                .HasColumnType("text");
+
+                            b1.Property<float>("X")
+                                .HasColumnType("real");
+
+                            b1.Property<float>("Y")
+                                .HasColumnType("real");
+
+                            b1.Property<float>("Z")
+                                .HasColumnType("real");
+
+                            b1.HasKey("InspectionId");
+
+                            b1.ToTable("Inspections");
+
+                            b1.WithOwner()
+                                .HasForeignKey("InspectionId");
+                        });
+
+                    b.Navigation("InspectionTarget")
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Api.Database.Models.InspectionFinding", b =>
+                {
+                    b.HasOne("Api.Database.Models.Inspection", null)
+                        .WithMany("InspectionFindings")
+                        .HasForeignKey("InspectionId");
+                });
+
+            modelBuilder.Entity("Api.Database.Models.MissionDefinition", b =>
+                {
+                    b.HasOne("Api.Database.Models.Area", "Area")
+                        .WithMany()
+                        .HasForeignKey("AreaId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Api.Database.Models.MissionRun", "LastSuccessfulRun")
+                        .WithMany()
+                        .HasForeignKey("LastSuccessfulRunId");
+
+                    b.HasOne("Api.Database.Models.Source", "Source")
+                        .WithMany()
+                        .HasForeignKey("SourceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Area");
+
+                    b.Navigation("LastSuccessfulRun");
+
+                    b.Navigation("Source");
+                });
+
+            modelBuilder.Entity("Api.Database.Models.MissionRun", b =>
+                {
+                    b.HasOne("Api.Database.Models.Area", "Area")
+                        .WithMany()
+                        .HasForeignKey("AreaId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Api.Database.Models.Robot", "Robot")
+                        .WithMany()
+                        .HasForeignKey("RobotId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.OwnsOne("Api.Database.Models.MapMetadata", "Map", b1 =>
+                        {
+                            b1.Property<string>("MissionRunId")
+                                .HasColumnType("text");
+
+                            b1.Property<string>("MapName")
+                                .IsRequired()
+                                .HasMaxLength(200)
+                                .HasColumnType("character varying(200)");
+
+                            b1.HasKey("MissionRunId");
+
+                            b1.ToTable("MissionRuns");
+
+                            b1.WithOwner()
+                                .HasForeignKey("MissionRunId");
+
+                            b1.OwnsOne("Api.Database.Models.Boundary", "Boundary", b2 =>
+                                {
+                                    b2.Property<string>("MapMetadataMissionRunId")
+                                        .HasColumnType("text");
+
+                                    b2.Property<double>("X1")
+                                        .HasColumnType("double precision");
+
+                                    b2.Property<double>("X2")
+                                        .HasColumnType("double precision");
+
+                                    b2.Property<double>("Y1")
+                                        .HasColumnType("double precision");
+
+                                    b2.Property<double>("Y2")
+                                        .HasColumnType("double precision");
+
+                                    b2.Property<double>("Z1")
+                                        .HasColumnType("double precision");
+
+                                    b2.Property<double>("Z2")
+                                        .HasColumnType("double precision");
+
+                                    b2.HasKey("MapMetadataMissionRunId");
+
+                                    b2.ToTable("MissionRuns");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("MapMetadataMissionRunId");
+                                });
+
+                            b1.OwnsOne("Api.Database.Models.TransformationMatrices", "TransformationMatrices", b2 =>
+                                {
+                                    b2.Property<string>("MapMetadataMissionRunId")
+                                        .HasColumnType("text");
+
+                                    b2.Property<double>("C1")
+                                        .HasColumnType("double precision");
+
+                                    b2.Property<double>("C2")
+                                        .HasColumnType("double precision");
+
+                                    b2.Property<double>("D1")
+                                        .HasColumnType("double precision");
+
+                                    b2.Property<double>("D2")
+                                        .HasColumnType("double precision");
+
+                                    b2.HasKey("MapMetadataMissionRunId");
+
+                                    b2.ToTable("MissionRuns");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("MapMetadataMissionRunId");
+                                });
+
+                            b1.Navigation("Boundary")
+                                .IsRequired();
+
+                            b1.Navigation("TransformationMatrices")
+                                .IsRequired();
+                        });
+
+                    b.Navigation("Area");
+
+                    b.Navigation("Map");
+
+                    b.Navigation("Robot");
+                });
+
+            modelBuilder.Entity("Api.Database.Models.MissionTask", b =>
+                {
+                    b.HasOne("Api.Database.Models.Inspection", "Inspection")
+                        .WithMany()
+                        .HasForeignKey("InspectionId");
+
+                    b.HasOne("Api.Database.Models.MissionRun", null)
+                        .WithMany("Tasks")
+                        .HasForeignKey("MissionRunId");
+
+                    b.OwnsOne("Api.Services.Models.IsarZoomDescription", "IsarZoomDescription", b1 =>
+                        {
+                            b1.Property<string>("MissionTaskId")
+                                .HasColumnType("text");
+
+                            b1.Property<double>("ObjectHeight")
+                                .HasColumnType("double precision")
+                                .HasAnnotation("Relational:JsonPropertyName", "objectHeight");
+
+                            b1.Property<double>("ObjectWidth")
+                                .HasColumnType("double precision")
+                                .HasAnnotation("Relational:JsonPropertyName", "objectWidth");
+
+                            b1.HasKey("MissionTaskId");
+
+                            b1.ToTable("MissionTasks");
+
+                            b1.WithOwner()
+                                .HasForeignKey("MissionTaskId");
+                        });
+
+                    b.OwnsOne("Api.Database.Models.Pose", "RobotPose", b1 =>
+                        {
+                            b1.Property<string>("MissionTaskId")
+                                .HasColumnType("text");
+
+                            b1.HasKey("MissionTaskId");
+
+                            b1.ToTable("MissionTasks");
+
+                            b1.WithOwner()
+                                .HasForeignKey("MissionTaskId");
+
+                            b1.OwnsOne("Api.Database.Models.Orientation", "Orientation", b2 =>
+                                {
+                                    b2.Property<string>("PoseMissionTaskId")
+                                        .HasColumnType("text");
+
+                                    b2.Property<float>("W")
+                                        .HasColumnType("real");
+
+                                    b2.Property<float>("X")
+                                        .HasColumnType("real");
+
+                                    b2.Property<float>("Y")
+                                        .HasColumnType("real");
+
+                                    b2.Property<float>("Z")
+                                        .HasColumnType("real");
+
+                                    b2.HasKey("PoseMissionTaskId");
+
+                                    b2.ToTable("MissionTasks");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("PoseMissionTaskId");
+                                });
+
+                            b1.OwnsOne("Api.Database.Models.Position", "Position", b2 =>
+                                {
+                                    b2.Property<string>("PoseMissionTaskId")
+                                        .HasColumnType("text");
+
+                                    b2.Property<float>("X")
+                                        .HasColumnType("real");
+
+                                    b2.Property<float>("Y")
+                                        .HasColumnType("real");
+
+                                    b2.Property<float>("Z")
+                                        .HasColumnType("real");
+
+                                    b2.HasKey("PoseMissionTaskId");
+
+                                    b2.ToTable("MissionTasks");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("PoseMissionTaskId");
+                                });
+
+                            b1.Navigation("Orientation")
+                                .IsRequired();
+
+                            b1.Navigation("Position")
+                                .IsRequired();
+                        });
+
+                    b.Navigation("Inspection");
+
+                    b.Navigation("IsarZoomDescription");
+
+                    b.Navigation("RobotPose")
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Api.Database.Models.Plant", b =>
+                {
+                    b.HasOne("Api.Database.Models.Installation", "Installation")
+                        .WithMany()
+                        .HasForeignKey("InstallationId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Installation");
+                });
+
+            modelBuilder.Entity("Api.Database.Models.Robot", b =>
+                {
+                    b.HasOne("Api.Database.Models.Area", "CurrentArea")
+                        .WithMany()
+                        .HasForeignKey("CurrentAreaId");
+
+                    b.HasOne("Api.Database.Models.Installation", "CurrentInstallation")
+                        .WithMany()
+                        .HasForeignKey("CurrentInstallationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Api.Database.Models.RobotModel", "Model")
+                        .WithMany()
+                        .HasForeignKey("ModelId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.OwnsMany("Api.Database.Models.DocumentInfo", "Documentation", b1 =>
+                        {
+                            b1.Property<string>("Id")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("text");
+
+                            b1.Property<string>("Name")
+                                .IsRequired()
+                                .HasMaxLength(200)
+                                .HasColumnType("character varying(200)");
+
+                            b1.Property<string>("RobotId")
+                                .IsRequired()
+                                .HasColumnType("text");
+
+                            b1.Property<string>("Url")
+                                .IsRequired()
+                                .HasMaxLength(200)
+                                .HasColumnType("character varying(200)");
+
+                            b1.HasKey("Id");
+
+                            b1.HasIndex("RobotId");
+
+                            b1.ToTable("DocumentInfo");
+
+                            b1.WithOwner()
+                                .HasForeignKey("RobotId");
+                        });
+
+                    b.OwnsOne("Api.Database.Models.Pose", "Pose", b1 =>
+                        {
+                            b1.Property<string>("RobotId")
+                                .HasColumnType("text");
+
+                            b1.HasKey("RobotId");
+
+                            b1.ToTable("Robots");
+
+                            b1.WithOwner()
+                                .HasForeignKey("RobotId");
+
+                            b1.OwnsOne("Api.Database.Models.Orientation", "Orientation", b2 =>
+                                {
+                                    b2.Property<string>("PoseRobotId")
+                                        .HasColumnType("text");
+
+                                    b2.Property<float>("W")
+                                        .HasColumnType("real");
+
+                                    b2.Property<float>("X")
+                                        .HasColumnType("real");
+
+                                    b2.Property<float>("Y")
+                                        .HasColumnType("real");
+
+                                    b2.Property<float>("Z")
+                                        .HasColumnType("real");
+
+                                    b2.HasKey("PoseRobotId");
+
+                                    b2.ToTable("Robots");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("PoseRobotId");
+                                });
+
+                            b1.OwnsOne("Api.Database.Models.Position", "Position", b2 =>
+                                {
+                                    b2.Property<string>("PoseRobotId")
+                                        .HasColumnType("text");
+
+                                    b2.Property<float>("X")
+                                        .HasColumnType("real");
+
+                                    b2.Property<float>("Y")
+                                        .HasColumnType("real");
+
+                                    b2.Property<float>("Z")
+                                        .HasColumnType("real");
+
+                                    b2.HasKey("PoseRobotId");
+
+                                    b2.ToTable("Robots");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("PoseRobotId");
+                                });
+
+                            b1.Navigation("Orientation")
+                                .IsRequired();
+
+                            b1.Navigation("Position")
+                                .IsRequired();
+                        });
+
+                    b.OwnsMany("Api.Database.Models.VideoStream", "VideoStreams", b1 =>
+                        {
+                            b1.Property<string>("Id")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("text");
+
+                            b1.Property<string>("Name")
+                                .IsRequired()
+                                .HasMaxLength(200)
+                                .HasColumnType("character varying(200)");
+
+                            b1.Property<string>("RobotId")
+                                .IsRequired()
+                                .HasColumnType("text");
+
+                            b1.Property<bool>("ShouldRotate270Clockwise")
+                                .HasColumnType("boolean");
+
+                            b1.Property<string>("Type")
+                                .IsRequired()
+                                .HasMaxLength(64)
+                                .HasColumnType("character varying(64)");
+
+                            b1.Property<string>("Url")
+                                .IsRequired()
+                                .HasMaxLength(200)
+                                .HasColumnType("character varying(200)");
+
+                            b1.HasKey("Id");
+
+                            b1.HasIndex("RobotId");
+
+                            b1.ToTable("VideoStream");
+
+                            b1.WithOwner()
+                                .HasForeignKey("RobotId");
+                        });
+
+                    b.Navigation("CurrentArea");
+
+                    b.Navigation("CurrentInstallation");
+
+                    b.Navigation("Documentation");
+
+                    b.Navigation("Model");
+
+                    b.Navigation("Pose")
+                        .IsRequired();
+
+                    b.Navigation("VideoStreams");
+                });
+
+            modelBuilder.Entity("Api.Services.MissionLoaders.TagInspectionMetadata", b =>
+                {
+                    b.OwnsOne("Api.Services.Models.IsarZoomDescription", "ZoomDescription", b1 =>
+                        {
+                            b1.Property<string>("TagInspectionMetadataTagId")
+                                .HasColumnType("text");
+
+                            b1.Property<double>("ObjectHeight")
+                                .HasColumnType("double precision")
+                                .HasAnnotation("Relational:JsonPropertyName", "objectHeight");
+
+                            b1.Property<double>("ObjectWidth")
+                                .HasColumnType("double precision")
+                                .HasAnnotation("Relational:JsonPropertyName", "objectWidth");
+
+                            b1.HasKey("TagInspectionMetadataTagId");
+
+                            b1.ToTable("TagInspectionMetadata");
+
+                            b1.WithOwner()
+                                .HasForeignKey("TagInspectionMetadataTagId");
+                        });
+
+                    b.Navigation("ZoomDescription");
+                });
+
+            modelBuilder.Entity("Api.Database.Models.Inspection", b =>
+                {
+                    b.Navigation("InspectionFindings");
+                });
+
+            modelBuilder.Entity("Api.Database.Models.MissionRun", b =>
+                {
+                    b.Navigation("Tasks");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/backend/api/Migrations/20241212090302_AddBatteryStateToRobot.cs b/backend/api/Migrations/20241212090302_AddBatteryStateToRobot.cs
new file mode 100644
index 000000000..4e5e8ff66
--- /dev/null
+++ b/backend/api/Migrations/20241212090302_AddBatteryStateToRobot.cs
@@ -0,0 +1,28 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Api.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddBatteryStateToRobot : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "BatteryState",
+                table: "Robots",
+                type: "text",
+                nullable: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "BatteryState",
+                table: "Robots");
+        }
+    }
+}
diff --git a/backend/api/Migrations/FlotillaDbContextModelSnapshot.cs b/backend/api/Migrations/FlotillaDbContextModelSnapshot.cs
index d983d30c7..8e2f10e25 100644
--- a/backend/api/Migrations/FlotillaDbContextModelSnapshot.cs
+++ b/backend/api/Migrations/FlotillaDbContextModelSnapshot.cs
@@ -449,6 +449,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<float>("BatteryLevel")
                         .HasColumnType("real");
 
+                    b.Property<string>("BatteryState")
+                        .HasColumnType("text");
+
                     b.Property<string>("CurrentAreaId")
                         .HasColumnType("text");
 
diff --git a/backend/api/Services/RobotService.cs b/backend/api/Services/RobotService.cs
index a1536df48..9cdc2bde4 100644
--- a/backend/api/Services/RobotService.cs
+++ b/backend/api/Services/RobotService.cs
@@ -21,6 +21,7 @@ public interface IRobotService
         public Task<Robot> Update(Robot robot);
         public Task<Robot> UpdateRobotStatus(string robotId, RobotStatus status);
         public Task<Robot> UpdateRobotBatteryLevel(string robotId, float batteryLevel);
+        public Task<Robot> UpdateRobotBatteryState(string robotId, BatteryState? batteryState);
         public Task<Robot> UpdateRobotPressureLevel(string robotId, float? pressureLevel);
         public Task<Robot> UpdateRobotPose(string robotId, Pose pose);
         public Task<Robot> UpdateRobotIsarConnected(string robotId, bool isarConnected);
@@ -161,6 +162,13 @@ public async Task<Robot> UpdateRobotBatteryLevel(string robotId, float batteryLe
             return robot;
         }
 
+        public async Task<Robot> UpdateRobotBatteryState(string robotId, BatteryState? batteryState)
+        {
+            var robot = await UpdateRobotProperty(robotId, "BatteryState", batteryState, isLogLevelDebug: true);
+            ThrowIfRobotIsNull(robot, robotId);
+            return robot;
+        }
+
         public async Task<Robot> UpdateRobotPressureLevel(string robotId, float? pressureLevel)
         {
             var robot = await UpdateRobotProperty(robotId, "PressureLevel", pressureLevel);