diff --git a/TeslaSolarCharger.Model/Entities/TeslaSolarCharger/Car.cs b/TeslaSolarCharger.Model/Entities/TeslaSolarCharger/Car.cs
index 51ba08f94..ece3589f0 100644
--- a/TeslaSolarCharger.Model/Entities/TeslaSolarCharger/Car.cs
+++ b/TeslaSolarCharger.Model/Entities/TeslaSolarCharger/Car.cs
@@ -46,7 +46,6 @@ public class Car
     public DateTime? WakeUpRateLimitedUntil { get; set; }
     public DateTime? ChargingCommandsRateLimitedUntil { get; set; }
     public bool UseBle { get; set; }
-    public bool UseBleForWakeUp { get; set; }
     public string? BleApiBaseUrl { get; set; }
     public bool UseFleetTelemetry { get; set; }
     public bool UseFleetTelemetryForLocationData { get; set; }
diff --git a/TeslaSolarCharger.Model/Migrations/20241207125046_RemoveUseBleWakeup.Designer.cs b/TeslaSolarCharger.Model/Migrations/20241207125046_RemoveUseBleWakeup.Designer.cs
new file mode 100644
index 000000000..20d88ade0
--- /dev/null
+++ b/TeslaSolarCharger.Model/Migrations/20241207125046_RemoveUseBleWakeup.Designer.cs
@@ -0,0 +1,923 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using TeslaSolarCharger.Model.EntityFramework;
+
+#nullable disable
+
+namespace TeslaSolarCharger.Model.Migrations
+{
+    [DbContext(typeof(TeslaSolarChargerContext))]
+    [Migration("20241207125046_RemoveUseBleWakeup")]
+    partial class RemoveUseBleWakeup
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder.HasAnnotation("ProductVersion", "8.0.10");
+
+            modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.BackendNotification", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("BackendIssueId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("DetailText")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Headline")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsConfirmed")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("ValidFromDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ValidFromVersion")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("ValidToDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ValidToVersion")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("BackendNotifications");
+                });
+
+            modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.CachedCarState", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("CarId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("CarStateJson")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Key")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("LastUpdated")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("CachedCarStates");
+                });
+
+            modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.Car", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("BleApiBaseUrl")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("ChargeMode")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ChargeStartCalls")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ChargeStopCalls")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("ChargerActualCurrent")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("ChargerPhases")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("ChargerPilotCurrent")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("ChargerRequestedCurrent")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("ChargerVoltage")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("ChargingCommandsRateLimitedUntil")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("ChargingPriority")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool?>("ClimateOn")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("CommandsRateLimitedUntil")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IgnoreLatestTimeToReachSocDate")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IgnoreLatestTimeToReachSocDateOnWeekend")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("LatestTimeToReachSoC")
+                        .HasColumnType("TEXT");
+
+                    b.Property<double?>("Latitude")
+                        .HasColumnType("REAL");
+
+                    b.Property<double?>("Longitude")
+                        .HasColumnType("REAL");
+
+                    b.Property<int>("MaximumAmpere")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("MinimumAmpere")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("MinimumSoc")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("OtherCommandCalls")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool?>("PluggedIn")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("SetChargingAmpsCall")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool?>("ShouldBeManaged")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("SoC")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("SocLimit")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("State")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("TeslaFleetApiState")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("TeslaMateCarId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("UsableEnergy")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("UseBle")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("UseFleetTelemetry")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("UseFleetTelemetryForLocationData")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("VehicleCalls")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("VehicleCommandProtocolRequired")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("VehicleDataCalls")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("VehicleDataRateLimitedUntil")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("VehicleRateLimitedUntil")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Vin")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("WakeUpCalls")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("WakeUpRateLimitedUntil")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TeslaMateCarId")
+                        .IsUnique();
+
+                    b.HasIndex("Vin")
+                        .IsUnique();
+
+                    b.ToTable("Cars");
+                });
+
+            modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.CarValueLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool?>("BooleanValue")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("CarId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<double?>("DoubleValue")
+                        .HasColumnType("REAL");
+
+                    b.Property<int?>("IntValue")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool?>("InvalidValue")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Source")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("StringValue")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("Timestamp")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("UnknownValue")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CarId");
+
+                    b.ToTable("CarValueLogs");
+                });
+
+            modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ChargePrice", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("AddSpotPriceToGridPrice")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("EnergyProvider")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasDefaultValue(6);
+
+                    b.Property<string>("EnergyProviderConfiguration")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("GridPrice")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("SolarPrice")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("SpotPriceCorrectionFactor")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("ValidSince")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("ChargePrices");
+                });
+
+            modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ChargingDetail", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("ChargerVoltage")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ChargingProcessId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("GridPower")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("HomeBatteryPower")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SolarPower")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("TimeStamp")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ChargingProcessId");
+
+                    b.ToTable("ChargingDetails");
+                });
+
+            modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ChargingProcess", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("CarId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<decimal?>("Cost")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("EndDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("OldHandledChargeId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("StartDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal?>("UsedGridEnergyKwh")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal?>("UsedHomeBatteryEnergyKwh")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal?>("UsedSolarEnergyKwh")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CarId");
+
+                    b.ToTable("ChargingProcesses");
+                });
+
+            modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.HandledCharge", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<decimal?>("AverageSpotPrice")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal?>("CalculatedPrice")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("CarId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ChargingProcessId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<decimal?>("UsedGridEnergy")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal?>("UsedSolarEnergy")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("HandledCharges");
+                });
+
+            modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.LoggedError", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("DismissedAt")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("EndTimeStamp")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("FurtherOccurrences")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Headline")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("IssueKey")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("MethodName")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Source")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("StackTrace")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("StartTimeStamp")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("TelegramNotificationSent")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("TelegramResolvedMessageSent")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Vin")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("LoggedErrors");
+                });
+
+            modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ModbusConfiguration", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ConnectDelayMilliseconds")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Endianess")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Host")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Port")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ReadTimeoutMilliseconds")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("UnitIdentifier")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("ModbusConfigurations");
+                });
+
+            modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ModbusResultConfiguration", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Address")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("BitStartIndex")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<decimal>("CorrectionFactor")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("InvertedByModbusResultConfigurationId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Length")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ModbusConfigurationId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Operator")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("RegisterType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("UsedFor")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ValueType")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("InvertedByModbusResultConfigurationId");
+
+                    b.HasIndex("ModbusConfigurationId");
+
+                    b.ToTable("ModbusResultConfigurations");
+                });
+
+            modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.MqttConfiguration", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Host")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Password")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Port")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Username")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("MqttConfigurations");
+                });
+
+            modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.MqttResultConfiguration", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<decimal>("CorrectionFactor")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("MqttConfigurationId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("NodePattern")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("NodePatternType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Operator")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Topic")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("UsedFor")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("XmlAttributeHeaderName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("XmlAttributeHeaderValue")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("XmlAttributeValueName")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("MqttConfigurationId");
+
+                    b.ToTable("MqttResultConfigurations");
+                });
+
+            modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.PowerDistribution", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ChargingPower")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<float>("GridProportion")
+                        .HasColumnType("REAL");
+
+                    b.Property<int>("HandledChargeId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("PowerFromGrid")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("TimeStamp")
+                        .HasColumnType("TEXT");
+
+                    b.Property<float?>("UsedWattHours")
+                        .HasColumnType("REAL");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("HandledChargeId");
+
+                    b.ToTable("PowerDistributions");
+                });
+
+            modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.RestValueConfiguration", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("HttpMethod")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("NodePatternType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Url")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("RestValueConfigurations");
+                });
+
+            modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.RestValueConfigurationHeader", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Key")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("RestValueConfigurationId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RestValueConfigurationId", "Key")
+                        .IsUnique();
+
+                    b.ToTable("RestValueConfigurationHeaders");
+                });
+
+            modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.RestValueResultConfiguration", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<decimal>("CorrectionFactor")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("NodePattern")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Operator")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("RestValueConfigurationId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("UsedFor")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("XmlAttributeHeaderName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("XmlAttributeHeaderValue")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("XmlAttributeValueName")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RestValueConfigurationId");
+
+                    b.ToTable("RestValueResultConfigurations");
+                });
+
+            modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.SpotPrice", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("EndDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("Price")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("StartDate")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SpotPrices");
+                });
+
+            modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.TeslaToken", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AccessToken")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("ExpiresAtUtc")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("IdToken")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RefreshToken")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Region")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("UnauthorizedCounter")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TeslaTokens");
+                });
+
+            modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.TscConfiguration", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Key")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Key")
+                        .IsUnique();
+
+                    b.ToTable("TscConfigurations");
+                });
+
+            modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.CarValueLog", b =>
+                {
+                    b.HasOne("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.Car", "Car")
+                        .WithMany("CarValueLogs")
+                        .HasForeignKey("CarId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Car");
+                });
+
+            modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ChargingDetail", b =>
+                {
+                    b.HasOne("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ChargingProcess", "ChargingProcess")
+                        .WithMany("ChargingDetails")
+                        .HasForeignKey("ChargingProcessId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("ChargingProcess");
+                });
+
+            modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ChargingProcess", b =>
+                {
+                    b.HasOne("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.Car", "Car")
+                        .WithMany("ChargingProcesses")
+                        .HasForeignKey("CarId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Car");
+                });
+
+            modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ModbusResultConfiguration", b =>
+                {
+                    b.HasOne("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ModbusResultConfiguration", "InvertedByModbusResultConfiguration")
+                        .WithMany()
+                        .HasForeignKey("InvertedByModbusResultConfigurationId");
+
+                    b.HasOne("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ModbusConfiguration", "ModbusConfiguration")
+                        .WithMany("ModbusResultConfigurations")
+                        .HasForeignKey("ModbusConfigurationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("InvertedByModbusResultConfiguration");
+
+                    b.Navigation("ModbusConfiguration");
+                });
+
+            modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.MqttResultConfiguration", b =>
+                {
+                    b.HasOne("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.MqttConfiguration", "MqttConfiguration")
+                        .WithMany("MqttResultConfigurations")
+                        .HasForeignKey("MqttConfigurationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("MqttConfiguration");
+                });
+
+            modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.PowerDistribution", b =>
+                {
+                    b.HasOne("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.HandledCharge", "HandledCharge")
+                        .WithMany("PowerDistributions")
+                        .HasForeignKey("HandledChargeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("HandledCharge");
+                });
+
+            modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.RestValueConfigurationHeader", b =>
+                {
+                    b.HasOne("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.RestValueConfiguration", "RestValueConfiguration")
+                        .WithMany("Headers")
+                        .HasForeignKey("RestValueConfigurationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("RestValueConfiguration");
+                });
+
+            modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.RestValueResultConfiguration", b =>
+                {
+                    b.HasOne("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.RestValueConfiguration", "RestValueConfiguration")
+                        .WithMany("RestValueResultConfigurations")
+                        .HasForeignKey("RestValueConfigurationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("RestValueConfiguration");
+                });
+
+            modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.Car", b =>
+                {
+                    b.Navigation("CarValueLogs");
+
+                    b.Navigation("ChargingProcesses");
+                });
+
+            modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ChargingProcess", b =>
+                {
+                    b.Navigation("ChargingDetails");
+                });
+
+            modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.HandledCharge", b =>
+                {
+                    b.Navigation("PowerDistributions");
+                });
+
+            modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ModbusConfiguration", b =>
+                {
+                    b.Navigation("ModbusResultConfigurations");
+                });
+
+            modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.MqttConfiguration", b =>
+                {
+                    b.Navigation("MqttResultConfigurations");
+                });
+
+            modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.RestValueConfiguration", b =>
+                {
+                    b.Navigation("Headers");
+
+                    b.Navigation("RestValueResultConfigurations");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/TeslaSolarCharger.Model/Migrations/20241207125046_RemoveUseBleWakeup.cs b/TeslaSolarCharger.Model/Migrations/20241207125046_RemoveUseBleWakeup.cs
new file mode 100644
index 000000000..fbd7a1bc8
--- /dev/null
+++ b/TeslaSolarCharger.Model/Migrations/20241207125046_RemoveUseBleWakeup.cs
@@ -0,0 +1,29 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace TeslaSolarCharger.Model.Migrations
+{
+    /// <inheritdoc />
+    public partial class RemoveUseBleWakeup : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "UseBleForWakeUp",
+                table: "Cars");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<bool>(
+                name: "UseBleForWakeUp",
+                table: "Cars",
+                type: "INTEGER",
+                nullable: false,
+                defaultValue: false);
+        }
+    }
+}
diff --git a/TeslaSolarCharger.Model/Migrations/TeslaSolarChargerContextModelSnapshot.cs b/TeslaSolarCharger.Model/Migrations/TeslaSolarChargerContextModelSnapshot.cs
index 8d5f6aded..906678952 100644
--- a/TeslaSolarCharger.Model/Migrations/TeslaSolarChargerContextModelSnapshot.cs
+++ b/TeslaSolarCharger.Model/Migrations/TeslaSolarChargerContextModelSnapshot.cs
@@ -186,9 +186,6 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<bool>("UseBle")
                         .HasColumnType("INTEGER");
 
-                    b.Property<bool>("UseBleForWakeUp")
-                        .HasColumnType("INTEGER");
-
                     b.Property<bool>("UseFleetTelemetry")
                         .HasColumnType("INTEGER");
 
diff --git a/TeslaSolarCharger/Client/Pages/CarSettings.razor b/TeslaSolarCharger/Client/Pages/CarSettings.razor
index 56dea37aa..9228bcfb6 100644
--- a/TeslaSolarCharger/Client/Pages/CarSettings.razor
+++ b/TeslaSolarCharger/Client/Pages/CarSettings.razor
@@ -59,9 +59,6 @@ else
                 <GenericInput For="() => carBasicConfiguration.ChargingPriority" />
                 <GenericInput For="() => carBasicConfiguration.ShouldBeManaged" />
                 <GenericInput For="() => carBasicConfiguration.UseBle" />
-                <GenericInput T="bool"
-                              For="() => carBasicConfiguration.UseBleForWakeUp"
-                              OnValueChanged="StateHasChanged"/>
                 <GenericInput For="() => carBasicConfiguration.BleApiBaseUrl" />
                 <GenericInput T="bool"
                               For="() => carBasicConfiguration.UseFleetTelemetry"
@@ -107,7 +104,7 @@ else
                 </div>
             }
             <RightAlignedButtonComponent IsLoading="_loadingVins.Contains(carBasicConfiguration.Vin)" OnButtonClicked="_ => TestBle(carBasicConfiguration.Vin)" ButtonText="Set to 7A"></RightAlignedButtonComponent>
-            @if (carBasicConfiguration.UseBleForWakeUp)
+            @if (carBasicConfiguration.UseBle)
             {
                 <h5>Test Wakeup via BLE</h5>
                 <div>
diff --git a/TeslaSolarCharger/Server/Scheduling/JobFactory.cs b/TeslaSolarCharger/Server/Scheduling/JobFactory.cs
index a24829a72..e226c0305 100644
--- a/TeslaSolarCharger/Server/Scheduling/JobFactory.cs
+++ b/TeslaSolarCharger/Server/Scheduling/JobFactory.cs
@@ -4,23 +4,15 @@
 
 namespace TeslaSolarCharger.Server.Scheduling;
 
-public class JobFactory : IJobFactory
+public class JobFactory(ILogger<JobFactory> logger, IServiceProvider serviceProvider) : IJobFactory
 {
-    private readonly ILogger<JobFactory> _logger;
-    private readonly IServiceProvider _serviceProvider;
     private readonly ConcurrentDictionary<IJob, IServiceScope> _scopes = new();
 
-    public JobFactory(ILogger<JobFactory> logger, IServiceProvider serviceProvider)
-    {
-        _logger = logger;
-        _serviceProvider = serviceProvider;
-    }
-
     public IJob NewJob(TriggerFiredBundle bundle, IScheduler scheduler)
     {
-        _logger.LogTrace("{Method} ({@bundle}, {scheduler})", nameof(NewJob), bundle, scheduler);
+        logger.LogTrace("{Method} ({@bundle}, {scheduler})", nameof(NewJob), bundle, scheduler);
         var jobType = bundle.JobDetail.JobType;
-        var scope = _serviceProvider.CreateScope();
+        var scope = serviceProvider.CreateScope();
         var job = (IJob)scope.ServiceProvider.GetRequiredService(jobType);
         _scopes.TryAdd(job, scope);
         return job;
@@ -28,7 +20,7 @@ public IJob NewJob(TriggerFiredBundle bundle, IScheduler scheduler)
 
     public void ReturnJob(IJob job)
     {
-        _logger.LogTrace("{class}.{method}({job})", nameof(JobFactory), nameof(ReturnJob), job.GetType().FullName);
+        logger.LogTrace("{class}.{method}({job})", nameof(JobFactory), nameof(ReturnJob), job.GetType().FullName);
         if (_scopes.TryGetValue(job, out var scope))
         {
             scope.Dispose();
diff --git a/TeslaSolarCharger/Server/Services/ConfigJsonService.cs b/TeslaSolarCharger/Server/Services/ConfigJsonService.cs
index 8934fa8a9..1fc4264bf 100644
--- a/TeslaSolarCharger/Server/Services/ConfigJsonService.cs
+++ b/TeslaSolarCharger/Server/Services/ConfigJsonService.cs
@@ -245,7 +245,6 @@ public async Task UpdateCarBasicConfiguration(int carId, CarBasicConfiguration c
         databaseCar.ChargingPriority = carBasicConfiguration.ChargingPriority;
         databaseCar.ShouldBeManaged = carBasicConfiguration.ShouldBeManaged;
         databaseCar.UseBle = carBasicConfiguration.UseBle;
-        databaseCar.UseBleForWakeUp = carBasicConfiguration.UseBleForWakeUp;
         databaseCar.BleApiBaseUrl = carBasicConfiguration.BleApiBaseUrl;
         databaseCar.UseFleetTelemetry = carBasicConfiguration.UseFleetTelemetry;
         databaseCar.UseFleetTelemetryForLocationData = carBasicConfiguration.UseFleetTelemetryForLocationData;
@@ -259,7 +258,6 @@ public async Task UpdateCarBasicConfiguration(int carId, CarBasicConfiguration c
         settingsCar.ChargingPriority = carBasicConfiguration.ChargingPriority;
         settingsCar.ShouldBeManaged = carBasicConfiguration.ShouldBeManaged;
         settingsCar.UseBle = carBasicConfiguration.UseBle;
-        settingsCar.UseBleForWakeUp = carBasicConfiguration.UseBleForWakeUp;
         settingsCar.BleApiBaseUrl = carBasicConfiguration.BleApiBaseUrl;
         await fleetTelemetryWebSocketService.DisconnectWebSocketsByVin(carBasicConfiguration.Vin);
     }
diff --git a/TeslaSolarCharger/Server/Services/FleetTelemetryWebSocketService.cs b/TeslaSolarCharger/Server/Services/FleetTelemetryWebSocketService.cs
index d5c607530..fc33ba1d9 100644
--- a/TeslaSolarCharger/Server/Services/FleetTelemetryWebSocketService.cs
+++ b/TeslaSolarCharger/Server/Services/FleetTelemetryWebSocketService.cs
@@ -194,7 +194,7 @@ private async Task ReceiveMessages(DtoFleetTelemetryWebSocketClients client, str
                         client.LastReceivedHeartbeat = dateTimeProvider.UtcNow();
                         continue;
                     }
-
+                    logger.LogTrace("Received non heartbeate message.");
                     var message = DeserializeFleetTelemetryMessage(jsonMessage);
                     if (message == default)
                     {
diff --git a/TeslaSolarCharger/Server/Services/TeslaFleetApiService.cs b/TeslaSolarCharger/Server/Services/TeslaFleetApiService.cs
index 2bd67a421..500f37bf1 100644
--- a/TeslaSolarCharger/Server/Services/TeslaFleetApiService.cs
+++ b/TeslaSolarCharger/Server/Services/TeslaFleetApiService.cs
@@ -96,6 +96,7 @@ public class TeslaFleetApiService(
         RequestUrl = constants.WakeUpRequestUrl,
         NeedsProxy = false,
         TeslaApiRequestType = TeslaApiRequestType.WakeUp,
+        BleCompatible = true,
     };
 
     private DtoFleetApiRequest VehicleRequest => new()
@@ -821,7 +822,7 @@ private async Task WakeUpCarIfNeeded(int carId, CarStateEnum? carState)
     {
         logger.LogTrace("{method}({vin}, {@fleetApiRequest}, {contentData})", nameof(SendCommandToTeslaApi), vin, fleetApiRequest, contentData);
         var car = settings.Cars.First(c => c.Vin == vin);
-        if (fleetApiRequest.BleCompatible || (fleetApiRequest.RequestUrl == WakeUpRequest.RequestUrl && car.UseBleForWakeUp))
+        if (fleetApiRequest.BleCompatible)
         {
             
             var isCarBleEnabled = car.UseBle;
diff --git a/TeslaSolarCharger/Shared/Dtos/CarBasicConfiguration.cs b/TeslaSolarCharger/Shared/Dtos/CarBasicConfiguration.cs
index 6bba68542..e1ae90296 100644
--- a/TeslaSolarCharger/Shared/Dtos/CarBasicConfiguration.cs
+++ b/TeslaSolarCharger/Shared/Dtos/CarBasicConfiguration.cs
@@ -41,9 +41,6 @@ public CarBasicConfiguration(int id, string? name)
     [DisplayName("Use BLE")]
     [HelperText("Use BLE communication to go around Tesla rate limits. Note: A BLE device (e.g., Raspberry Pi) with installed TeslaSolarChargerBle Container needs to be near (max 4 meters without any walls in between) your car.")]
     public bool UseBle { get; set; }
-    [DisplayName("Use BLE for wake up")]
-    [HelperText("The car needs to be at least on version 2024.32.3 to support wake up via BLE.")]
-    public bool UseBleForWakeUp { get; set; }
     [HelperText("Needed to send commands via BLE to the car. An example value would be `http://raspible:7210/`")]
     public string? BleApiBaseUrl { get; set; }
     [HelperText("Only supported on cars with Software 2024.38.2+. Not supported on Pre 2021 Model S/X. If enabled, some data will be transferred via Fleet Telemetry. This improves the delay in the TSC detection of plugin and out of the car, as well as changes in the charging speed. Note: All data transferred via Fleet Telemetry passes my server.")]
diff --git a/TeslaSolarCharger/Shared/Dtos/Settings/DtoCar.cs b/TeslaSolarCharger/Shared/Dtos/Settings/DtoCar.cs
index 55866997d..ecbd81d8a 100644
--- a/TeslaSolarCharger/Shared/Dtos/Settings/DtoCar.cs
+++ b/TeslaSolarCharger/Shared/Dtos/Settings/DtoCar.cs
@@ -87,7 +87,6 @@ private int? ChargingPower
     public bool? Healthy { get; set; }
     public bool ReducedChargeSpeedWarning { get; set; }
     public bool UseBle { get; set; }
-    public bool UseBleForWakeUp { get; set; }
     public string? BleApiBaseUrl { get; set; }
     public DateTime? EarliestHomeArrival { get; set; }
     public List<DtoChargingSlot> PlannedChargingSlots { get; set; } = new List<DtoChargingSlot>();