diff --git a/src/IoTHub.Portal.Infrastructure/PortalDbContext.cs b/src/IoTHub.Portal.Infrastructure/PortalDbContext.cs
index 088797ff2..13b3593c6 100644
--- a/src/IoTHub.Portal.Infrastructure/PortalDbContext.cs
+++ b/src/IoTHub.Portal.Infrastructure/PortalDbContext.cs
@@ -25,10 +25,8 @@ public class PortalDbContext : DbContext, IDataProtectionKeyContext
         public DbSet<Label> Labels { get; set; }
         public DbSet<DataProtectionKey> DataProtectionKeys { get; set; }
 
-#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
         public PortalDbContext(DbContextOptions<PortalDbContext> options)
-#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
-                : base(options)
+            : base(options)
         {
         }
 
@@ -58,6 +56,16 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                 .HasOne(x => x.DeviceModel)
                 .WithMany()
                 .HasForeignKey(x => x.DeviceModelId);
+
+            _ = modelBuilder.Entity<EdgeDevice>()
+                .HasMany(c => c.Tags)
+                .WithOne()
+                .OnDelete(DeleteBehavior.Cascade);
+
+            _ = modelBuilder.Entity<Device>()
+                .HasMany(c => c.Tags)
+                .WithOne()
+                .OnDelete(DeleteBehavior.Cascade);
         }
     }
 }
diff --git a/src/IoTHub.Portal.MySql/Migrations/20240503170430_Fix #2980 - delete tag values in cascade when deleting devices.Designer.cs b/src/IoTHub.Portal.MySql/Migrations/20240503170430_Fix #2980 - delete tag values in cascade when deleting devices.Designer.cs
new file mode 100644
index 000000000..8a20e6f80
--- /dev/null
+++ b/src/IoTHub.Portal.MySql/Migrations/20240503170430_Fix #2980 - delete tag values in cascade when deleting devices.Designer.cs	
@@ -0,0 +1,606 @@
+// <auto-generated />
+using System;
+using IoTHub.Portal.Infrastructure;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace IoTHub.Portal.MySql.Migrations
+{
+    [DbContext(typeof(PortalDbContext))]
+    [Migration("20240503170430_Fix #2980 - delete tag values in cascade when deleting devices")]
+    partial class Fix2980deletetagvaluesincascadewhendeletingdevices
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.2")
+                .HasAnnotation("Relational:MaxIdentifierLength", 64);
+
+            modelBuilder.Entity("IoTHub.Portal.Domain.Entities.Concentrator", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("ClientThumbprint")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("DeviceType")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsConnected")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool>("IsEnabled")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("LoraRegion")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("Version")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Concentrators");
+                });
+
+            modelBuilder.Entity("IoTHub.Portal.Domain.Entities.Device", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("DeviceModelId")
+                        .IsRequired()
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<bool>("IsConnected")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool>("IsEnabled")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("StatusUpdatedTime")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<int>("Version")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DeviceModelId");
+
+                    b.ToTable("Devices", (string)null);
+
+                    b.UseTptMappingStrategy();
+                });
+
+            modelBuilder.Entity("IoTHub.Portal.Domain.Entities.DeviceModel", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<bool?>("ABPRelaxMode")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("AppEUI")
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("ClassType")
+                        .HasColumnType("int");
+
+                    b.Property<int?>("Deduplication")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool?>("Downlink")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool>("IsBuiltin")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<int?>("KeepAliveTimeout")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<int?>("PreferredWindow")
+                        .HasColumnType("int");
+
+                    b.Property<int?>("RXDelay")
+                        .HasColumnType("int");
+
+                    b.Property<string>("SensorDecoder")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("SupportLoRaFeatures")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool?>("UseOTAA")
+                        .HasColumnType("tinyint(1)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("DeviceModels");
+                });
+
+            modelBuilder.Entity("IoTHub.Portal.Domain.Entities.DeviceModelCommand", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<bool>("Confirmed")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("DeviceModelId")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Frame")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsBuiltin")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("Port")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("DeviceModelCommands");
+                });
+
+            modelBuilder.Entity("IoTHub.Portal.Domain.Entities.DeviceModelProperty", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("DisplayName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsWritable")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("ModelId")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("Order")
+                        .HasColumnType("int");
+
+                    b.Property<int>("PropertyType")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("DeviceModelProperties");
+                });
+
+            modelBuilder.Entity("IoTHub.Portal.Domain.Entities.DeviceTag", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("Required")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool>("Searchable")
+                        .HasColumnType("tinyint(1)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("DeviceTags");
+                });
+
+            modelBuilder.Entity("IoTHub.Portal.Domain.Entities.DeviceTagValue", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("EdgeDeviceId")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DeviceId");
+
+                    b.HasIndex("EdgeDeviceId");
+
+                    b.ToTable("DeviceTagValues");
+                });
+
+            modelBuilder.Entity("IoTHub.Portal.Domain.Entities.EdgeDevice", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("ConnectionState")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("DeviceModelId")
+                        .IsRequired()
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<bool>("IsEnabled")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("NbDevices")
+                        .HasColumnType("int");
+
+                    b.Property<int>("NbModules")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Scope")
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("Version")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DeviceModelId");
+
+                    b.ToTable("EdgeDevices");
+                });
+
+            modelBuilder.Entity("IoTHub.Portal.Domain.Entities.EdgeDeviceModel", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ExternalIdentifier")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EdgeDeviceModels");
+                });
+
+            modelBuilder.Entity("IoTHub.Portal.Domain.Entities.EdgeDeviceModelCommand", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("EdgeDeviceModelId")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ModuleName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EdgeDeviceModelCommands");
+                });
+
+            modelBuilder.Entity("IoTHub.Portal.Domain.Entities.Label", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("Color")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("DeviceModelId")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("EdgeDeviceId")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("EdgeDeviceModelId")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DeviceId");
+
+                    b.HasIndex("DeviceModelId");
+
+                    b.HasIndex("EdgeDeviceId");
+
+                    b.HasIndex("EdgeDeviceModelId");
+
+                    b.ToTable("Labels");
+                });
+
+            modelBuilder.Entity("IoTHub.Portal.Domain.Entities.LoRaDeviceTelemetry", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<DateTime>("EnqueuedTime")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("LorawanDeviceId")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("Telemetry")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("LorawanDeviceId");
+
+                    b.ToTable("LoRaDeviceTelemetry");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.DataProtection.EntityFrameworkCore.DataProtectionKey", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<string>("FriendlyName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Xml")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("DataProtectionKeys");
+                });
+
+            modelBuilder.Entity("IoTHub.Portal.Domain.Entities.LorawanDevice", b =>
+                {
+                    b.HasBaseType("IoTHub.Portal.Domain.Entities.Device");
+
+                    b.Property<bool?>("ABPRelaxMode")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool>("AlreadyLoggedInOnce")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("AppEUI")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("AppKey")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("AppSKey")
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("ClassType")
+                        .HasColumnType("int");
+
+                    b.Property<string>("DataRate")
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("Deduplication")
+                        .HasColumnType("int");
+
+                    b.Property<string>("DevAddr")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool?>("Downlink")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<int?>("FCntDownStart")
+                        .HasColumnType("int");
+
+                    b.Property<int?>("FCntResetCounter")
+                        .HasColumnType("int");
+
+                    b.Property<int?>("FCntUpStart")
+                        .HasColumnType("int");
+
+                    b.Property<string>("GatewayID")
+                        .HasColumnType("longtext");
+
+                    b.Property<int?>("KeepAliveTimeout")
+                        .HasColumnType("int");
+
+                    b.Property<string>("NbRep")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("NwkSKey")
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("PreferredWindow")
+                        .HasColumnType("int");
+
+                    b.Property<int?>("RX1DROffset")
+                        .HasColumnType("int");
+
+                    b.Property<int?>("RX2DataRate")
+                        .HasColumnType("int");
+
+                    b.Property<int?>("RXDelay")
+                        .HasColumnType("int");
+
+                    b.Property<string>("ReportedRX1DROffset")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ReportedRX2DataRate")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ReportedRXDelay")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("SensorDecoder")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool?>("Supports32BitFCnt")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("TxPower")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("UseOTAA")
+                        .HasColumnType("tinyint(1)");
+
+                    b.ToTable("LorawanDevices", (string)null);
+                });
+
+            modelBuilder.Entity("IoTHub.Portal.Domain.Entities.Device", b =>
+                {
+                    b.HasOne("IoTHub.Portal.Domain.Entities.DeviceModel", "DeviceModel")
+                        .WithMany()
+                        .HasForeignKey("DeviceModelId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("DeviceModel");
+                });
+
+            modelBuilder.Entity("IoTHub.Portal.Domain.Entities.DeviceTagValue", b =>
+                {
+                    b.HasOne("IoTHub.Portal.Domain.Entities.Device", null)
+                        .WithMany("Tags")
+                        .HasForeignKey("DeviceId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("IoTHub.Portal.Domain.Entities.EdgeDevice", null)
+                        .WithMany("Tags")
+                        .HasForeignKey("EdgeDeviceId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("IoTHub.Portal.Domain.Entities.EdgeDevice", b =>
+                {
+                    b.HasOne("IoTHub.Portal.Domain.Entities.EdgeDeviceModel", "DeviceModel")
+                        .WithMany()
+                        .HasForeignKey("DeviceModelId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("DeviceModel");
+                });
+
+            modelBuilder.Entity("IoTHub.Portal.Domain.Entities.Label", b =>
+                {
+                    b.HasOne("IoTHub.Portal.Domain.Entities.Device", null)
+                        .WithMany("Labels")
+                        .HasForeignKey("DeviceId");
+
+                    b.HasOne("IoTHub.Portal.Domain.Entities.DeviceModel", null)
+                        .WithMany("Labels")
+                        .HasForeignKey("DeviceModelId");
+
+                    b.HasOne("IoTHub.Portal.Domain.Entities.EdgeDevice", null)
+                        .WithMany("Labels")
+                        .HasForeignKey("EdgeDeviceId");
+
+                    b.HasOne("IoTHub.Portal.Domain.Entities.EdgeDeviceModel", null)
+                        .WithMany("Labels")
+                        .HasForeignKey("EdgeDeviceModelId");
+                });
+
+            modelBuilder.Entity("IoTHub.Portal.Domain.Entities.LoRaDeviceTelemetry", b =>
+                {
+                    b.HasOne("IoTHub.Portal.Domain.Entities.LorawanDevice", null)
+                        .WithMany("Telemetry")
+                        .HasForeignKey("LorawanDeviceId");
+                });
+
+            modelBuilder.Entity("IoTHub.Portal.Domain.Entities.LorawanDevice", b =>
+                {
+                    b.HasOne("IoTHub.Portal.Domain.Entities.Device", null)
+                        .WithOne()
+                        .HasForeignKey("IoTHub.Portal.Domain.Entities.LorawanDevice", "Id")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("IoTHub.Portal.Domain.Entities.Device", b =>
+                {
+                    b.Navigation("Labels");
+
+                    b.Navigation("Tags");
+                });
+
+            modelBuilder.Entity("IoTHub.Portal.Domain.Entities.DeviceModel", b =>
+                {
+                    b.Navigation("Labels");
+                });
+
+            modelBuilder.Entity("IoTHub.Portal.Domain.Entities.EdgeDevice", b =>
+                {
+                    b.Navigation("Labels");
+
+                    b.Navigation("Tags");
+                });
+
+            modelBuilder.Entity("IoTHub.Portal.Domain.Entities.EdgeDeviceModel", b =>
+                {
+                    b.Navigation("Labels");
+                });
+
+            modelBuilder.Entity("IoTHub.Portal.Domain.Entities.LorawanDevice", b =>
+                {
+                    b.Navigation("Telemetry");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/IoTHub.Portal.MySql/Migrations/20240503170430_Fix #2980 - delete tag values in cascade when deleting devices.cs b/src/IoTHub.Portal.MySql/Migrations/20240503170430_Fix #2980 - delete tag values in cascade when deleting devices.cs
new file mode 100644
index 000000000..3d9fc7f2f
--- /dev/null
+++ b/src/IoTHub.Portal.MySql/Migrations/20240503170430_Fix #2980 - delete tag values in cascade when deleting devices.cs	
@@ -0,0 +1,67 @@
+// Copyright (c) CGI France. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+#nullable disable
+
+namespace IoTHub.Portal.MySql.Migrations
+{
+    using Microsoft.EntityFrameworkCore.Migrations;
+
+    /// <inheritdoc />
+    public partial class Fix2980deletetagvaluesincascadewhendeletingdevices : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            _ = migrationBuilder.DropForeignKey(
+                name: "FK_DeviceTagValues_Devices_DeviceId",
+                table: "DeviceTagValues");
+
+            _ = migrationBuilder.DropForeignKey(
+                name: "FK_DeviceTagValues_EdgeDevices_EdgeDeviceId",
+                table: "DeviceTagValues");
+
+            _ = migrationBuilder.AddForeignKey(
+                name: "FK_DeviceTagValues_Devices_DeviceId",
+                table: "DeviceTagValues",
+                column: "DeviceId",
+                principalTable: "Devices",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+
+            _ = migrationBuilder.AddForeignKey(
+                name: "FK_DeviceTagValues_EdgeDevices_EdgeDeviceId",
+                table: "DeviceTagValues",
+                column: "EdgeDeviceId",
+                principalTable: "EdgeDevices",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            _ = migrationBuilder.DropForeignKey(
+                name: "FK_DeviceTagValues_Devices_DeviceId",
+                table: "DeviceTagValues");
+
+            _ = migrationBuilder.DropForeignKey(
+                name: "FK_DeviceTagValues_EdgeDevices_EdgeDeviceId",
+                table: "DeviceTagValues");
+
+            _ = migrationBuilder.AddForeignKey(
+                name: "FK_DeviceTagValues_Devices_DeviceId",
+                table: "DeviceTagValues",
+                column: "DeviceId",
+                principalTable: "Devices",
+                principalColumn: "Id");
+
+            _ = migrationBuilder.AddForeignKey(
+                name: "FK_DeviceTagValues_EdgeDevices_EdgeDeviceId",
+                table: "DeviceTagValues",
+                column: "EdgeDeviceId",
+                principalTable: "EdgeDevices",
+                principalColumn: "Id");
+        }
+    }
+}
diff --git a/src/IoTHub.Portal.MySql/Migrations/PortalDbContextModelSnapshot.cs b/src/IoTHub.Portal.MySql/Migrations/PortalDbContextModelSnapshot.cs
index c6ca98d4e..4058fc56f 100644
--- a/src/IoTHub.Portal.MySql/Migrations/PortalDbContextModelSnapshot.cs
+++ b/src/IoTHub.Portal.MySql/Migrations/PortalDbContextModelSnapshot.cs
@@ -16,7 +16,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "7.0.8")
+                .HasAnnotation("ProductVersion", "8.0.2")
                 .HasAnnotation("Relational:MaxIdentifierLength", 64);
 
             modelBuilder.Entity("IoTHub.Portal.Domain.Entities.Concentrator", b =>
@@ -514,11 +514,13 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                 {
                     b.HasOne("IoTHub.Portal.Domain.Entities.Device", null)
                         .WithMany("Tags")
-                        .HasForeignKey("DeviceId");
+                        .HasForeignKey("DeviceId")
+                        .OnDelete(DeleteBehavior.Cascade);
 
                     b.HasOne("IoTHub.Portal.Domain.Entities.EdgeDevice", null)
                         .WithMany("Tags")
-                        .HasForeignKey("EdgeDeviceId");
+                        .HasForeignKey("EdgeDeviceId")
+                        .OnDelete(DeleteBehavior.Cascade);
                 });
 
             modelBuilder.Entity("IoTHub.Portal.Domain.Entities.EdgeDevice", b =>
diff --git a/src/IoTHub.Portal.Postgres/Migrations/20240503170119_Fix #2980 - delete tag values in cascade when deleting devices.Designer.cs b/src/IoTHub.Portal.Postgres/Migrations/20240503170119_Fix #2980 - delete tag values in cascade when deleting devices.Designer.cs
new file mode 100644
index 000000000..d428b1bf1
--- /dev/null
+++ b/src/IoTHub.Portal.Postgres/Migrations/20240503170119_Fix #2980 - delete tag values in cascade when deleting devices.Designer.cs	
@@ -0,0 +1,611 @@
+// <auto-generated />
+using System;
+using IoTHub.Portal.Infrastructure;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace IoTHub.Portal.Postgres.Migrations
+{
+    [DbContext(typeof(PortalDbContext))]
+    [Migration("20240503170119_Fix #2980 - delete tag values in cascade when deleting devices")]
+    partial class Fix2980deletetagvaluesincascadewhendeletingdevices
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.2")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("IoTHub.Portal.Domain.Entities.Concentrator", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ClientThumbprint")
+                        .HasColumnType("text");
+
+                    b.Property<string>("DeviceType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsConnected")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsEnabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("LoraRegion")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("Version")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Concentrators");
+                });
+
+            modelBuilder.Entity("IoTHub.Portal.Domain.Entities.Device", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("text");
+
+                    b.Property<string>("DeviceModelId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsConnected")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsEnabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("StatusUpdatedTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<int>("Version")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DeviceModelId");
+
+                    b.ToTable("Devices", (string)null);
+
+                    b.UseTptMappingStrategy();
+                });
+
+            modelBuilder.Entity("IoTHub.Portal.Domain.Entities.DeviceModel", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("ABPRelaxMode")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("AppEUI")
+                        .HasColumnType("text");
+
+                    b.Property<int>("ClassType")
+                        .HasColumnType("integer");
+
+                    b.Property<int?>("Deduplication")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("Downlink")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsBuiltin")
+                        .HasColumnType("boolean");
+
+                    b.Property<int?>("KeepAliveTimeout")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int?>("PreferredWindow")
+                        .HasColumnType("integer");
+
+                    b.Property<int?>("RXDelay")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("SensorDecoder")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("SupportLoRaFeatures")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool?>("UseOTAA")
+                        .HasColumnType("boolean");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("DeviceModels");
+                });
+
+            modelBuilder.Entity("IoTHub.Portal.Domain.Entities.DeviceModelCommand", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("Confirmed")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("DeviceModelId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Frame")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsBuiltin")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("Port")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("DeviceModelCommands");
+                });
+
+            modelBuilder.Entity("IoTHub.Portal.Domain.Entities.DeviceModelProperty", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("text");
+
+                    b.Property<string>("DisplayName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsWritable")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ModelId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("Order")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("PropertyType")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("DeviceModelProperties");
+                });
+
+            modelBuilder.Entity("IoTHub.Portal.Domain.Entities.DeviceTag", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<bool>("Required")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("Searchable")
+                        .HasColumnType("boolean");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("DeviceTags");
+                });
+
+            modelBuilder.Entity("IoTHub.Portal.Domain.Entities.DeviceTagValue", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("text");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("EdgeDeviceId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DeviceId");
+
+                    b.HasIndex("EdgeDeviceId");
+
+                    b.ToTable("DeviceTagValues");
+                });
+
+            modelBuilder.Entity("IoTHub.Portal.Domain.Entities.EdgeDevice", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConnectionState")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("DeviceModelId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsEnabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("NbDevices")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("NbModules")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("Scope")
+                        .HasColumnType("text");
+
+                    b.Property<int>("Version")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DeviceModelId");
+
+                    b.ToTable("EdgeDevices");
+                });
+
+            modelBuilder.Entity("IoTHub.Portal.Domain.Entities.EdgeDeviceModel", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExternalIdentifier")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EdgeDeviceModels");
+                });
+
+            modelBuilder.Entity("IoTHub.Portal.Domain.Entities.EdgeDeviceModelCommand", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("text");
+
+                    b.Property<string>("EdgeDeviceModelId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ModuleName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EdgeDeviceModelCommands");
+                });
+
+            modelBuilder.Entity("IoTHub.Portal.Domain.Entities.Label", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Color")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("DeviceId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("DeviceModelId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("EdgeDeviceId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("EdgeDeviceModelId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DeviceId");
+
+                    b.HasIndex("DeviceModelId");
+
+                    b.HasIndex("EdgeDeviceId");
+
+                    b.HasIndex("EdgeDeviceModelId");
+
+                    b.ToTable("Labels");
+                });
+
+            modelBuilder.Entity("IoTHub.Portal.Domain.Entities.LoRaDeviceTelemetry", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("EnqueuedTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("LorawanDeviceId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Telemetry")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("LorawanDeviceId");
+
+                    b.ToTable("LoRaDeviceTelemetry");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.DataProtection.EntityFrameworkCore.DataProtectionKey", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("FriendlyName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Xml")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("DataProtectionKeys");
+                });
+
+            modelBuilder.Entity("IoTHub.Portal.Domain.Entities.LorawanDevice", b =>
+                {
+                    b.HasBaseType("IoTHub.Portal.Domain.Entities.Device");
+
+                    b.Property<bool?>("ABPRelaxMode")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("AlreadyLoggedInOnce")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("AppEUI")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AppKey")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AppSKey")
+                        .HasColumnType("text");
+
+                    b.Property<int>("ClassType")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("DataRate")
+                        .HasColumnType("text");
+
+                    b.Property<int>("Deduplication")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("DevAddr")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("Downlink")
+                        .HasColumnType("boolean");
+
+                    b.Property<int?>("FCntDownStart")
+                        .HasColumnType("integer");
+
+                    b.Property<int?>("FCntResetCounter")
+                        .HasColumnType("integer");
+
+                    b.Property<int?>("FCntUpStart")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("GatewayID")
+                        .HasColumnType("text");
+
+                    b.Property<int?>("KeepAliveTimeout")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("NbRep")
+                        .HasColumnType("text");
+
+                    b.Property<string>("NwkSKey")
+                        .HasColumnType("text");
+
+                    b.Property<int>("PreferredWindow")
+                        .HasColumnType("integer");
+
+                    b.Property<int?>("RX1DROffset")
+                        .HasColumnType("integer");
+
+                    b.Property<int?>("RX2DataRate")
+                        .HasColumnType("integer");
+
+                    b.Property<int?>("RXDelay")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ReportedRX1DROffset")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportedRX2DataRate")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportedRXDelay")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SensorDecoder")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("Supports32BitFCnt")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("TxPower")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("UseOTAA")
+                        .HasColumnType("boolean");
+
+                    b.ToTable("LorawanDevices", (string)null);
+                });
+
+            modelBuilder.Entity("IoTHub.Portal.Domain.Entities.Device", b =>
+                {
+                    b.HasOne("IoTHub.Portal.Domain.Entities.DeviceModel", "DeviceModel")
+                        .WithMany()
+                        .HasForeignKey("DeviceModelId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("DeviceModel");
+                });
+
+            modelBuilder.Entity("IoTHub.Portal.Domain.Entities.DeviceTagValue", b =>
+                {
+                    b.HasOne("IoTHub.Portal.Domain.Entities.Device", null)
+                        .WithMany("Tags")
+                        .HasForeignKey("DeviceId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("IoTHub.Portal.Domain.Entities.EdgeDevice", null)
+                        .WithMany("Tags")
+                        .HasForeignKey("EdgeDeviceId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("IoTHub.Portal.Domain.Entities.EdgeDevice", b =>
+                {
+                    b.HasOne("IoTHub.Portal.Domain.Entities.EdgeDeviceModel", "DeviceModel")
+                        .WithMany()
+                        .HasForeignKey("DeviceModelId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("DeviceModel");
+                });
+
+            modelBuilder.Entity("IoTHub.Portal.Domain.Entities.Label", b =>
+                {
+                    b.HasOne("IoTHub.Portal.Domain.Entities.Device", null)
+                        .WithMany("Labels")
+                        .HasForeignKey("DeviceId");
+
+                    b.HasOne("IoTHub.Portal.Domain.Entities.DeviceModel", null)
+                        .WithMany("Labels")
+                        .HasForeignKey("DeviceModelId");
+
+                    b.HasOne("IoTHub.Portal.Domain.Entities.EdgeDevice", null)
+                        .WithMany("Labels")
+                        .HasForeignKey("EdgeDeviceId");
+
+                    b.HasOne("IoTHub.Portal.Domain.Entities.EdgeDeviceModel", null)
+                        .WithMany("Labels")
+                        .HasForeignKey("EdgeDeviceModelId");
+                });
+
+            modelBuilder.Entity("IoTHub.Portal.Domain.Entities.LoRaDeviceTelemetry", b =>
+                {
+                    b.HasOne("IoTHub.Portal.Domain.Entities.LorawanDevice", null)
+                        .WithMany("Telemetry")
+                        .HasForeignKey("LorawanDeviceId");
+                });
+
+            modelBuilder.Entity("IoTHub.Portal.Domain.Entities.LorawanDevice", b =>
+                {
+                    b.HasOne("IoTHub.Portal.Domain.Entities.Device", null)
+                        .WithOne()
+                        .HasForeignKey("IoTHub.Portal.Domain.Entities.LorawanDevice", "Id")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("IoTHub.Portal.Domain.Entities.Device", b =>
+                {
+                    b.Navigation("Labels");
+
+                    b.Navigation("Tags");
+                });
+
+            modelBuilder.Entity("IoTHub.Portal.Domain.Entities.DeviceModel", b =>
+                {
+                    b.Navigation("Labels");
+                });
+
+            modelBuilder.Entity("IoTHub.Portal.Domain.Entities.EdgeDevice", b =>
+                {
+                    b.Navigation("Labels");
+
+                    b.Navigation("Tags");
+                });
+
+            modelBuilder.Entity("IoTHub.Portal.Domain.Entities.EdgeDeviceModel", b =>
+                {
+                    b.Navigation("Labels");
+                });
+
+            modelBuilder.Entity("IoTHub.Portal.Domain.Entities.LorawanDevice", b =>
+                {
+                    b.Navigation("Telemetry");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/IoTHub.Portal.Postgres/Migrations/20240503170119_Fix #2980 - delete tag values in cascade when deleting devices.cs b/src/IoTHub.Portal.Postgres/Migrations/20240503170119_Fix #2980 - delete tag values in cascade when deleting devices.cs
new file mode 100644
index 000000000..4169312b1
--- /dev/null
+++ b/src/IoTHub.Portal.Postgres/Migrations/20240503170119_Fix #2980 - delete tag values in cascade when deleting devices.cs	
@@ -0,0 +1,67 @@
+// Copyright (c) CGI France. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+#nullable disable
+
+namespace IoTHub.Portal.Postgres.Migrations
+{
+    using Microsoft.EntityFrameworkCore.Migrations;
+
+    /// <inheritdoc />
+    public partial class Fix2980deletetagvaluesincascadewhendeletingdevices : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            _ = migrationBuilder.DropForeignKey(
+                name: "FK_DeviceTagValues_Devices_DeviceId",
+                table: "DeviceTagValues");
+
+            _ = migrationBuilder.DropForeignKey(
+                name: "FK_DeviceTagValues_EdgeDevices_EdgeDeviceId",
+                table: "DeviceTagValues");
+
+            _ = migrationBuilder.AddForeignKey(
+                name: "FK_DeviceTagValues_Devices_DeviceId",
+                table: "DeviceTagValues",
+                column: "DeviceId",
+                principalTable: "Devices",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+
+            _ = migrationBuilder.AddForeignKey(
+                name: "FK_DeviceTagValues_EdgeDevices_EdgeDeviceId",
+                table: "DeviceTagValues",
+                column: "EdgeDeviceId",
+                principalTable: "EdgeDevices",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            _ = migrationBuilder.DropForeignKey(
+                name: "FK_DeviceTagValues_Devices_DeviceId",
+                table: "DeviceTagValues");
+
+            _ = migrationBuilder.DropForeignKey(
+                name: "FK_DeviceTagValues_EdgeDevices_EdgeDeviceId",
+                table: "DeviceTagValues");
+
+            _ = migrationBuilder.AddForeignKey(
+                name: "FK_DeviceTagValues_Devices_DeviceId",
+                table: "DeviceTagValues",
+                column: "DeviceId",
+                principalTable: "Devices",
+                principalColumn: "Id");
+
+            _ = migrationBuilder.AddForeignKey(
+                name: "FK_DeviceTagValues_EdgeDevices_EdgeDeviceId",
+                table: "DeviceTagValues",
+                column: "EdgeDeviceId",
+                principalTable: "EdgeDevices",
+                principalColumn: "Id");
+        }
+    }
+}
diff --git a/src/IoTHub.Portal.Postgres/Migrations/PortalDbContextModelSnapshot.cs b/src/IoTHub.Portal.Postgres/Migrations/PortalDbContextModelSnapshot.cs
index 6769019f6..e59710af4 100644
--- a/src/IoTHub.Portal.Postgres/Migrations/PortalDbContextModelSnapshot.cs
+++ b/src/IoTHub.Portal.Postgres/Migrations/PortalDbContextModelSnapshot.cs
@@ -17,7 +17,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "7.0.8")
+                .HasAnnotation("ProductVersion", "8.0.2")
                 .HasAnnotation("Relational:MaxIdentifierLength", 63);
 
             NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
@@ -519,11 +519,13 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                 {
                     b.HasOne("IoTHub.Portal.Domain.Entities.Device", null)
                         .WithMany("Tags")
-                        .HasForeignKey("DeviceId");
+                        .HasForeignKey("DeviceId")
+                        .OnDelete(DeleteBehavior.Cascade);
 
                     b.HasOne("IoTHub.Portal.Domain.Entities.EdgeDevice", null)
                         .WithMany("Tags")
-                        .HasForeignKey("EdgeDeviceId");
+                        .HasForeignKey("EdgeDeviceId")
+                        .OnDelete(DeleteBehavior.Cascade);
                 });
 
             modelBuilder.Entity("IoTHub.Portal.Domain.Entities.EdgeDevice", b =>