diff --git a/Dockerfile b/Dockerfile
index 100b962..fad3ec9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,22 +1,25 @@
-# Build-Stage
+# 1. Build-Phase: SDK-Image
 FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 WORKDIR /app
 
 # Projektdateien kopieren und Abhängigkeiten wiederherstellen
-COPY *.csproj ./
+COPY *.sln .
+COPY Watcher/*.csproj ./Watcher/
 RUN dotnet restore
 
-# Restlichen Code kopieren und veröffentlichen
-COPY . ./
-RUN dotnet publish -c Release -o out
+# Restliche Dateien kopieren und Build ausführen
+COPY Watcher/. ./Watcher/
+WORKDIR /app/Watcher
+RUN dotnet publish -c Release -o /app/publish /p:UseAppHost=false
 
-# Runtime-Stage
-FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS runtime
+# 2. Laufzeit-Phase: ASP.NET Core Runtime
+FROM mcr.microsoft.com/dotnet/aspnet:9.0
 WORKDIR /app
+COPY --from=build /app/publish .
 
-COPY --from=build /app/out ./
-
-EXPOSE 5000
-EXPOSE 5001
+# Exponiere Port 80 und 443 (HTTP + HTTPS)
+EXPOSE 80
+EXPOSE 443
 
+# Anwendung starten
 ENTRYPOINT ["dotnet", "Watcher.dll"]
diff --git a/Watcher/Controllers/ContainerController.cs b/Watcher/Controllers/ContainerController.cs
new file mode 100644
index 0000000..624a1a8
--- /dev/null
+++ b/Watcher/Controllers/ContainerController.cs
@@ -0,0 +1,60 @@
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using Watcher.Data;
+using Watcher.Models;
+using Watcher.ViewModels;
+
+namespace Watcher.Controllers;
+
+
+public class ContainerController : Controller
+{
+    private readonly AppDbContext _context;
+
+    public ContainerController(AppDbContext context)
+    {
+        _context = context;
+    }
+
+    public async Task<IActionResult> Overview()
+{
+    var containers = await _context.Containers.ToListAsync();
+
+    var viewModel = new ContainerOverviewViewModel
+    {
+        Containers = containers
+    };
+
+    return View(viewModel);
+}
+
+
+    [HttpGet]
+    public IActionResult AddContainer()
+    {
+        return View();
+    }
+
+    [HttpPost]
+    public async Task<IActionResult> AddContainer(AddContainerViewModel vm)
+    {
+        if (!ModelState.IsValid)
+            return View(vm);
+
+        var container = new Container
+        {
+            Name = vm.Name,
+            Image = vm.Image,
+            Status = vm.Status,
+            Hostname = vm.Hostname,
+            IsRunning = vm.IsRunning,
+            CreatedAt = DateTime.UtcNow
+        };
+
+        _context.Containers.Add(container);
+        await _context.SaveChangesAsync();
+
+        return RedirectToAction("Index");
+    }
+}
diff --git a/Watcher/Controllers/HeartbeatController.cs b/Watcher/Controllers/HeartbeatController.cs
new file mode 100644
index 0000000..0a362e3
--- /dev/null
+++ b/Watcher/Controllers/HeartbeatController.cs
@@ -0,0 +1,43 @@
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.CodeAnalysis;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.IdentityModel.Tokens;
+using Watcher.Data;
+using Watcher.Models;
+using Watcher.ViewModels;
+
+[ApiController]
+[Route("[controller]")]
+public class HeartbeatController : Controller
+{
+
+    private readonly AppDbContext _context;
+
+    public HeartbeatController(AppDbContext context)
+    {
+        _context = context;
+    }
+
+    [HttpPost("receive")]
+    public async Task<IActionResult> Receive([FromForm] int serverId)
+    {
+        var server = await _context.Servers.FirstOrDefaultAsync(s => s.Id == serverId);
+
+        // Je nachdem, ob dier Datenbankeintrag für einen neuen Server vorher oder nacher passiert, ist das hier überflüssig
+        if (server != null)
+        {
+            server.LastSeen = DateTime.UtcNow;
+
+            await _context.SaveChangesAsync();
+            return Ok();
+            
+        }
+        else
+        {
+            return BadRequest();
+        }
+        
+    }
+}
diff --git a/Watcher/Controllers/HomeController.cs b/Watcher/Controllers/HomeController.cs
index f3d9cf7..83df394 100644
--- a/Watcher/Controllers/HomeController.cs
+++ b/Watcher/Controllers/HomeController.cs
@@ -1,33 +1,41 @@
-using System.Diagnostics;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using System.Security.Claims;
+using Watcher.Data;
 using Watcher.Models;
+using Watcher.ViewModels;
 
-namespace Watcher.Controllers;
-
-[Authorize]
-public class HomeController : Controller
+namespace Watcher.Controllers
 {
-    private readonly ILogger<HomeController> _logger;
-
-    public HomeController(ILogger<HomeController> logger)
+    [Authorize]
+    public class HomeController : Controller
     {
-        _logger = logger;
-    }
+        private readonly AppDbContext _context;
 
-    public IActionResult Index()
-    {
-        return View();
-    }
+        public HomeController(AppDbContext context)
+        {
+            _context = context;
+        }
 
-    public IActionResult Privacy()
-    {
-        return View();
-    }
+        public async Task<IActionResult> Index()
+        {
+            var userId = User.FindFirst(ClaimTypes.NameIdentifier)?.Value;
 
-    [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
-    public IActionResult Error()
-    {
-        return View(new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier });
+            var user = await _context.Users
+                .Where(u => u.PocketId == userId)
+                .FirstOrDefaultAsync();
+
+            var viewModel = new DashboardViewModel
+            {
+                ActiveServers = await _context.Servers.CountAsync(s => s.IsOnline),
+                OfflineServers = await _context.Servers.CountAsync(s => !s.IsOnline),
+                RunningContainers = await _context.Containers.CountAsync(c => c.IsRunning),
+                FailedContainers = await _context.Containers.CountAsync(c => !c.IsRunning),
+                LastLogin = user?.LastLogin ?? DateTime.MinValue
+            };
+
+            return View(viewModel);
+        }
     }
 }
diff --git a/Watcher/Controllers/ServerController.cs b/Watcher/Controllers/ServerController.cs
new file mode 100644
index 0000000..e4d89a3
--- /dev/null
+++ b/Watcher/Controllers/ServerController.cs
@@ -0,0 +1,106 @@
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using Watcher.Data;
+using Watcher.Models;
+using Watcher.ViewModels;
+
+[Authorize]
+public class ServerController : Controller
+{
+    private readonly AppDbContext _context;
+
+    public ServerController(AppDbContext context)
+    {
+        _context = context;
+    }
+
+    public async Task<IActionResult> Overview()
+    {
+        var vm = new ServerOverviewViewModel
+        {
+            Servers = await _context.Servers.OrderBy(s => s.Id).ToListAsync()
+        };
+
+        return View(vm);
+    }
+
+    [HttpGet]
+    public IActionResult AddServer()
+    {
+        return View();
+    }
+
+    [HttpPost]
+    public async Task<IActionResult> AddServer(AddServerViewModel vm)
+    {
+        if (!ModelState.IsValid)
+            return View(vm);
+
+        var server = new Server
+        {
+            Name = vm.Name,
+            IPAddress = vm.IPAddress,
+            Type = vm.Type,
+            IsOnline = vm.IsOnline,
+        };
+
+        _context.Servers.Add(server);
+        await _context.SaveChangesAsync();
+
+        return RedirectToAction("Overview");
+    }
+
+    [HttpPost]
+    [ValidateAntiForgeryToken]
+    public async Task<IActionResult> Delete(int id)
+    {
+        var server = await _context.Servers.FindAsync(id);
+        if (server == null)
+        {
+            return NotFound();
+        }
+
+        _context.Servers.Remove(server);
+        await _context.SaveChangesAsync();
+        return RedirectToAction(nameof(Overview));
+    }
+
+    // GET: Server/Edit/5
+    public async Task<IActionResult> EditServer(int id)
+    {
+        var server = await _context.Servers.FindAsync(id);
+        if (server == null) return NotFound();
+
+        var vm = new EditServerViewModel
+        {
+            Name = server.Name,
+            IPAddress = server.IPAddress,
+            Type = server.Type
+        };
+
+        return View(vm);
+    }
+
+    // POST: Server/Edit/5
+    [HttpPost]
+    [ValidateAntiForgeryToken]
+    public async Task<IActionResult> EditServer(int id, EditServerViewModel vm)
+    {
+        if (ModelState.IsValid)
+        {
+            var server = await _context.Servers.FindAsync(id);
+            if (server == null) return NotFound();
+
+            server.Name = vm.Name;
+            server.IPAddress = vm.IPAddress;
+            server.Type = vm.Type;
+
+            await _context.SaveChangesAsync();
+            return RedirectToAction(nameof(Overview));
+        }
+
+        return View(vm);
+    }
+
+}
diff --git a/Watcher/Migrations/20250614183243_Server-Container-IsRunning-Value.Designer.cs b/Watcher/Migrations/20250614183243_Server-Container-IsRunning-Value.Designer.cs
new file mode 100644
index 0000000..60f4cfb
--- /dev/null
+++ b/Watcher/Migrations/20250614183243_Server-Container-IsRunning-Value.Designer.cs
@@ -0,0 +1,284 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Watcher.Data;
+
+#nullable disable
+
+namespace Watcher.Migrations
+{
+    [DbContext(typeof(AppDbContext))]
+    [Migration("20250614183243_Server-Container-IsRunning-Value")]
+    partial class ServerContainerIsRunningValue
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.6")
+                .HasAnnotation("Relational:MaxIdentifierLength", 64);
+
+            modelBuilder.Entity("Watcher.Models.Container", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Hostname")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<int?>("ImageId")
+                        .HasColumnType("int");
+
+                    b.Property<bool>("IsRunning")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<int?>("TagId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ImageId");
+
+                    b.HasIndex("TagId");
+
+                    b.ToTable("Containers");
+                });
+
+            modelBuilder.Entity("Watcher.Models.Image", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Tag")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Images");
+                });
+
+            modelBuilder.Entity("Watcher.Models.LogEvent", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<int?>("ContainerId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Level")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Message")
+                        .HasColumnType("longtext");
+
+                    b.Property<int?>("ServerId")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("Timestamp")
+                        .HasColumnType("datetime(6)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ContainerId");
+
+                    b.HasIndex("ServerId");
+
+                    b.ToTable("LogEvents");
+                });
+
+            modelBuilder.Entity("Watcher.Models.Metric", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<int?>("ContainerId")
+                        .HasColumnType("int");
+
+                    b.Property<int?>("ServerId")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("Timestamp")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Type")
+                        .HasColumnType("longtext");
+
+                    b.Property<double>("Value")
+                        .HasColumnType("double");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ContainerId");
+
+                    b.HasIndex("ServerId");
+
+                    b.ToTable("Metrics");
+                });
+
+            modelBuilder.Entity("Watcher.Models.Server", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Hostname")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsOnline")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<int?>("TagId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TagId");
+
+                    b.ToTable("Servers");
+                });
+
+            modelBuilder.Entity("Watcher.Models.Tag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Tags");
+                });
+
+            modelBuilder.Entity("Watcher.Models.User", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<string>("Email")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("LastLogin")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("PocketId")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PreferredUsername")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Users");
+                });
+
+            modelBuilder.Entity("Watcher.Models.Container", b =>
+                {
+                    b.HasOne("Watcher.Models.Image", null)
+                        .WithMany("Containers")
+                        .HasForeignKey("ImageId");
+
+                    b.HasOne("Watcher.Models.Tag", null)
+                        .WithMany("Containers")
+                        .HasForeignKey("TagId");
+                });
+
+            modelBuilder.Entity("Watcher.Models.LogEvent", b =>
+                {
+                    b.HasOne("Watcher.Models.Container", "Container")
+                        .WithMany()
+                        .HasForeignKey("ContainerId");
+
+                    b.HasOne("Watcher.Models.Server", "Server")
+                        .WithMany()
+                        .HasForeignKey("ServerId");
+
+                    b.Navigation("Container");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Watcher.Models.Metric", b =>
+                {
+                    b.HasOne("Watcher.Models.Container", "Container")
+                        .WithMany()
+                        .HasForeignKey("ContainerId");
+
+                    b.HasOne("Watcher.Models.Server", "Server")
+                        .WithMany()
+                        .HasForeignKey("ServerId");
+
+                    b.Navigation("Container");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Watcher.Models.Server", b =>
+                {
+                    b.HasOne("Watcher.Models.Tag", null)
+                        .WithMany("Servers")
+                        .HasForeignKey("TagId");
+                });
+
+            modelBuilder.Entity("Watcher.Models.Image", b =>
+                {
+                    b.Navigation("Containers");
+                });
+
+            modelBuilder.Entity("Watcher.Models.Tag", b =>
+                {
+                    b.Navigation("Containers");
+
+                    b.Navigation("Servers");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Watcher/Migrations/20250614183243_Server-Container-IsRunning-Value.cs b/Watcher/Migrations/20250614183243_Server-Container-IsRunning-Value.cs
new file mode 100644
index 0000000..e6c9cab
--- /dev/null
+++ b/Watcher/Migrations/20250614183243_Server-Container-IsRunning-Value.cs
@@ -0,0 +1,40 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Watcher.Migrations
+{
+    /// <inheritdoc />
+    public partial class ServerContainerIsRunningValue : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<bool>(
+                name: "IsOnline",
+                table: "Servers",
+                type: "tinyint(1)",
+                nullable: false,
+                defaultValue: false);
+
+            migrationBuilder.AddColumn<bool>(
+                name: "IsRunning",
+                table: "Containers",
+                type: "tinyint(1)",
+                nullable: false,
+                defaultValue: false);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "IsOnline",
+                table: "Servers");
+
+            migrationBuilder.DropColumn(
+                name: "IsRunning",
+                table: "Containers");
+        }
+    }
+}
diff --git a/Watcher/Migrations/20250614224113_Container-Server-Update.Designer.cs b/Watcher/Migrations/20250614224113_Container-Server-Update.Designer.cs
new file mode 100644
index 0000000..0ac9bbe
--- /dev/null
+++ b/Watcher/Migrations/20250614224113_Container-Server-Update.Designer.cs
@@ -0,0 +1,290 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Watcher.Data;
+
+#nullable disable
+
+namespace Watcher.Migrations
+{
+    [DbContext(typeof(AppDbContext))]
+    [Migration("20250614224113_Container-Server-Update")]
+    partial class ContainerServerUpdate
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.6")
+                .HasAnnotation("Relational:MaxIdentifierLength", 64);
+
+            modelBuilder.Entity("Watcher.Models.Container", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Hostname")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<int?>("ImageId")
+                        .HasColumnType("int");
+
+                    b.Property<bool>("IsRunning")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<int?>("TagId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ImageId");
+
+                    b.HasIndex("TagId");
+
+                    b.ToTable("Containers");
+                });
+
+            modelBuilder.Entity("Watcher.Models.Image", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Tag")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Images");
+                });
+
+            modelBuilder.Entity("Watcher.Models.LogEvent", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<int?>("ContainerId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Level")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Message")
+                        .HasColumnType("longtext");
+
+                    b.Property<int?>("ServerId")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("Timestamp")
+                        .HasColumnType("datetime(6)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ContainerId");
+
+                    b.HasIndex("ServerId");
+
+                    b.ToTable("LogEvents");
+                });
+
+            modelBuilder.Entity("Watcher.Models.Metric", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<int?>("ContainerId")
+                        .HasColumnType("int");
+
+                    b.Property<int?>("ServerId")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("Timestamp")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Type")
+                        .HasColumnType("longtext");
+
+                    b.Property<double>("Value")
+                        .HasColumnType("double");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ContainerId");
+
+                    b.HasIndex("ServerId");
+
+                    b.ToTable("Metrics");
+                });
+
+            modelBuilder.Entity("Watcher.Models.Server", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Hostname")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("IPAddress")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsOnline")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<int?>("TagId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TagId");
+
+                    b.ToTable("Servers");
+                });
+
+            modelBuilder.Entity("Watcher.Models.Tag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Tags");
+                });
+
+            modelBuilder.Entity("Watcher.Models.User", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<string>("Email")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("LastLogin")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("PocketId")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PreferredUsername")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Users");
+                });
+
+            modelBuilder.Entity("Watcher.Models.Container", b =>
+                {
+                    b.HasOne("Watcher.Models.Image", "Image")
+                        .WithMany("Containers")
+                        .HasForeignKey("ImageId");
+
+                    b.HasOne("Watcher.Models.Tag", null)
+                        .WithMany("Containers")
+                        .HasForeignKey("TagId");
+
+                    b.Navigation("Image");
+                });
+
+            modelBuilder.Entity("Watcher.Models.LogEvent", b =>
+                {
+                    b.HasOne("Watcher.Models.Container", "Container")
+                        .WithMany()
+                        .HasForeignKey("ContainerId");
+
+                    b.HasOne("Watcher.Models.Server", "Server")
+                        .WithMany()
+                        .HasForeignKey("ServerId");
+
+                    b.Navigation("Container");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Watcher.Models.Metric", b =>
+                {
+                    b.HasOne("Watcher.Models.Container", "Container")
+                        .WithMany()
+                        .HasForeignKey("ContainerId");
+
+                    b.HasOne("Watcher.Models.Server", "Server")
+                        .WithMany()
+                        .HasForeignKey("ServerId");
+
+                    b.Navigation("Container");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Watcher.Models.Server", b =>
+                {
+                    b.HasOne("Watcher.Models.Tag", null)
+                        .WithMany("Servers")
+                        .HasForeignKey("TagId");
+                });
+
+            modelBuilder.Entity("Watcher.Models.Image", b =>
+                {
+                    b.Navigation("Containers");
+                });
+
+            modelBuilder.Entity("Watcher.Models.Tag", b =>
+                {
+                    b.Navigation("Containers");
+
+                    b.Navigation("Servers");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Watcher/Migrations/20250614224113_Container-Server-Update.cs b/Watcher/Migrations/20250614224113_Container-Server-Update.cs
new file mode 100644
index 0000000..b485dfd
--- /dev/null
+++ b/Watcher/Migrations/20250614224113_Container-Server-Update.cs
@@ -0,0 +1,29 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Watcher.Migrations
+{
+    /// <inheritdoc />
+    public partial class ContainerServerUpdate : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "IPAddress",
+                table: "Servers",
+                type: "longtext",
+                nullable: false)
+                .Annotation("MySql:CharSet", "utf8mb4");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "IPAddress",
+                table: "Servers");
+        }
+    }
+}
diff --git a/Watcher/Migrations/20250615102649_ServerAnpassung.Designer.cs b/Watcher/Migrations/20250615102649_ServerAnpassung.Designer.cs
new file mode 100644
index 0000000..acd59d2
--- /dev/null
+++ b/Watcher/Migrations/20250615102649_ServerAnpassung.Designer.cs
@@ -0,0 +1,293 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Watcher.Data;
+
+#nullable disable
+
+namespace Watcher.Migrations
+{
+    [DbContext(typeof(AppDbContext))]
+    [Migration("20250615102649_ServerAnpassung")]
+    partial class ServerAnpassung
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.6")
+                .HasAnnotation("Relational:MaxIdentifierLength", 64);
+
+            modelBuilder.Entity("Watcher.Models.Container", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Hostname")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<int?>("ImageId")
+                        .HasColumnType("int");
+
+                    b.Property<bool>("IsRunning")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<int?>("TagId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ImageId");
+
+                    b.HasIndex("TagId");
+
+                    b.ToTable("Containers");
+                });
+
+            modelBuilder.Entity("Watcher.Models.Image", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Tag")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Images");
+                });
+
+            modelBuilder.Entity("Watcher.Models.LogEvent", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<int?>("ContainerId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Level")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Message")
+                        .HasColumnType("longtext");
+
+                    b.Property<int?>("ServerId")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("Timestamp")
+                        .HasColumnType("datetime(6)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ContainerId");
+
+                    b.HasIndex("ServerId");
+
+                    b.ToTable("LogEvents");
+                });
+
+            modelBuilder.Entity("Watcher.Models.Metric", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<int?>("ContainerId")
+                        .HasColumnType("int");
+
+                    b.Property<int?>("ServerId")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("Timestamp")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Type")
+                        .HasColumnType("longtext");
+
+                    b.Property<double>("Value")
+                        .HasColumnType("double");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ContainerId");
+
+                    b.HasIndex("ServerId");
+
+                    b.ToTable("Metrics");
+                });
+
+            modelBuilder.Entity("Watcher.Models.Server", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Hostname")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("IPAddress")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsOnline")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<DateTime>("LastSeen")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<int?>("TagId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TagId");
+
+                    b.ToTable("Servers");
+                });
+
+            modelBuilder.Entity("Watcher.Models.Tag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Tags");
+                });
+
+            modelBuilder.Entity("Watcher.Models.User", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<string>("Email")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("LastLogin")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("PocketId")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PreferredUsername")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Users");
+                });
+
+            modelBuilder.Entity("Watcher.Models.Container", b =>
+                {
+                    b.HasOne("Watcher.Models.Image", "Image")
+                        .WithMany("Containers")
+                        .HasForeignKey("ImageId");
+
+                    b.HasOne("Watcher.Models.Tag", null)
+                        .WithMany("Containers")
+                        .HasForeignKey("TagId");
+
+                    b.Navigation("Image");
+                });
+
+            modelBuilder.Entity("Watcher.Models.LogEvent", b =>
+                {
+                    b.HasOne("Watcher.Models.Container", "Container")
+                        .WithMany()
+                        .HasForeignKey("ContainerId");
+
+                    b.HasOne("Watcher.Models.Server", "Server")
+                        .WithMany()
+                        .HasForeignKey("ServerId");
+
+                    b.Navigation("Container");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Watcher.Models.Metric", b =>
+                {
+                    b.HasOne("Watcher.Models.Container", "Container")
+                        .WithMany()
+                        .HasForeignKey("ContainerId");
+
+                    b.HasOne("Watcher.Models.Server", "Server")
+                        .WithMany()
+                        .HasForeignKey("ServerId");
+
+                    b.Navigation("Container");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Watcher.Models.Server", b =>
+                {
+                    b.HasOne("Watcher.Models.Tag", null)
+                        .WithMany("Servers")
+                        .HasForeignKey("TagId");
+                });
+
+            modelBuilder.Entity("Watcher.Models.Image", b =>
+                {
+                    b.Navigation("Containers");
+                });
+
+            modelBuilder.Entity("Watcher.Models.Tag", b =>
+                {
+                    b.Navigation("Containers");
+
+                    b.Navigation("Servers");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Watcher/Migrations/20250615102649_ServerAnpassung.cs b/Watcher/Migrations/20250615102649_ServerAnpassung.cs
new file mode 100644
index 0000000..c8e9931
--- /dev/null
+++ b/Watcher/Migrations/20250615102649_ServerAnpassung.cs
@@ -0,0 +1,30 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Watcher.Migrations
+{
+    /// <inheritdoc />
+    public partial class ServerAnpassung : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<DateTime>(
+                name: "LastSeen",
+                table: "Servers",
+                type: "datetime(6)",
+                nullable: false,
+                defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified));
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "LastSeen",
+                table: "Servers");
+        }
+    }
+}
diff --git a/Watcher/Migrations/20250615114821_ServerCleanUp.Designer.cs b/Watcher/Migrations/20250615114821_ServerCleanUp.Designer.cs
new file mode 100644
index 0000000..98add17
--- /dev/null
+++ b/Watcher/Migrations/20250615114821_ServerCleanUp.Designer.cs
@@ -0,0 +1,288 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Watcher.Data;
+
+#nullable disable
+
+namespace Watcher.Migrations
+{
+    [DbContext(typeof(AppDbContext))]
+    [Migration("20250615114821_ServerCleanUp")]
+    partial class ServerCleanUp
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.6")
+                .HasAnnotation("Relational:MaxIdentifierLength", 64);
+
+            modelBuilder.Entity("Watcher.Models.Container", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Hostname")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<int?>("ImageId")
+                        .HasColumnType("int");
+
+                    b.Property<bool>("IsRunning")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<int?>("TagId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ImageId");
+
+                    b.HasIndex("TagId");
+
+                    b.ToTable("Containers");
+                });
+
+            modelBuilder.Entity("Watcher.Models.Image", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Tag")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Images");
+                });
+
+            modelBuilder.Entity("Watcher.Models.LogEvent", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<int?>("ContainerId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Level")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Message")
+                        .HasColumnType("longtext");
+
+                    b.Property<int?>("ServerId")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("Timestamp")
+                        .HasColumnType("datetime(6)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ContainerId");
+
+                    b.HasIndex("ServerId");
+
+                    b.ToTable("LogEvents");
+                });
+
+            modelBuilder.Entity("Watcher.Models.Metric", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<int?>("ContainerId")
+                        .HasColumnType("int");
+
+                    b.Property<int?>("ServerId")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("Timestamp")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Type")
+                        .HasColumnType("longtext");
+
+                    b.Property<double>("Value")
+                        .HasColumnType("double");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ContainerId");
+
+                    b.HasIndex("ServerId");
+
+                    b.ToTable("Metrics");
+                });
+
+            modelBuilder.Entity("Watcher.Models.Server", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("IPAddress")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsOnline")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<DateTime>("LastSeen")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<int?>("TagId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TagId");
+
+                    b.ToTable("Servers");
+                });
+
+            modelBuilder.Entity("Watcher.Models.Tag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Tags");
+                });
+
+            modelBuilder.Entity("Watcher.Models.User", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<string>("Email")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("LastLogin")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("PocketId")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PreferredUsername")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Users");
+                });
+
+            modelBuilder.Entity("Watcher.Models.Container", b =>
+                {
+                    b.HasOne("Watcher.Models.Image", "Image")
+                        .WithMany("Containers")
+                        .HasForeignKey("ImageId");
+
+                    b.HasOne("Watcher.Models.Tag", null)
+                        .WithMany("Containers")
+                        .HasForeignKey("TagId");
+
+                    b.Navigation("Image");
+                });
+
+            modelBuilder.Entity("Watcher.Models.LogEvent", b =>
+                {
+                    b.HasOne("Watcher.Models.Container", "Container")
+                        .WithMany()
+                        .HasForeignKey("ContainerId");
+
+                    b.HasOne("Watcher.Models.Server", "Server")
+                        .WithMany()
+                        .HasForeignKey("ServerId");
+
+                    b.Navigation("Container");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Watcher.Models.Metric", b =>
+                {
+                    b.HasOne("Watcher.Models.Container", "Container")
+                        .WithMany()
+                        .HasForeignKey("ContainerId");
+
+                    b.HasOne("Watcher.Models.Server", "Server")
+                        .WithMany()
+                        .HasForeignKey("ServerId");
+
+                    b.Navigation("Container");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Watcher.Models.Server", b =>
+                {
+                    b.HasOne("Watcher.Models.Tag", null)
+                        .WithMany("Servers")
+                        .HasForeignKey("TagId");
+                });
+
+            modelBuilder.Entity("Watcher.Models.Image", b =>
+                {
+                    b.Navigation("Containers");
+                });
+
+            modelBuilder.Entity("Watcher.Models.Tag", b =>
+                {
+                    b.Navigation("Containers");
+
+                    b.Navigation("Servers");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Watcher/Migrations/20250615114821_ServerCleanUp.cs b/Watcher/Migrations/20250615114821_ServerCleanUp.cs
new file mode 100644
index 0000000..3d03083
--- /dev/null
+++ b/Watcher/Migrations/20250615114821_ServerCleanUp.cs
@@ -0,0 +1,51 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Watcher.Migrations
+{
+    /// <inheritdoc />
+    public partial class ServerCleanUp : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "Hostname",
+                table: "Servers");
+
+            migrationBuilder.DropColumn(
+                name: "Status",
+                table: "Servers");
+
+            migrationBuilder.AddColumn<string>(
+                name: "Description",
+                table: "Servers",
+                type: "longtext",
+                nullable: true)
+                .Annotation("MySql:CharSet", "utf8mb4");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "Description",
+                table: "Servers");
+
+            migrationBuilder.AddColumn<string>(
+                name: "Hostname",
+                table: "Servers",
+                type: "longtext",
+                nullable: false)
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.AddColumn<string>(
+                name: "Status",
+                table: "Servers",
+                type: "longtext",
+                nullable: false)
+                .Annotation("MySql:CharSet", "utf8mb4");
+        }
+    }
+}
diff --git a/Watcher/Migrations/AppDbContextModelSnapshot.cs b/Watcher/Migrations/AppDbContextModelSnapshot.cs
index 888f967..1117443 100644
--- a/Watcher/Migrations/AppDbContextModelSnapshot.cs
+++ b/Watcher/Migrations/AppDbContextModelSnapshot.cs
@@ -35,6 +35,9 @@ namespace Watcher.Migrations
                     b.Property<int?>("ImageId")
                         .HasColumnType("int");
 
+                    b.Property<bool>("IsRunning")
+                        .HasColumnType("tinyint(1)");
+
                     b.Property<string>("Name")
                         .IsRequired()
                         .HasColumnType("longtext");
@@ -145,18 +148,23 @@ namespace Watcher.Migrations
                     b.Property<DateTime>("CreatedAt")
                         .HasColumnType("datetime(6)");
 
-                    b.Property<string>("Hostname")
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("IPAddress")
                         .IsRequired()
                         .HasColumnType("longtext");
 
+                    b.Property<bool>("IsOnline")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<DateTime>("LastSeen")
+                        .HasColumnType("datetime(6)");
+
                     b.Property<string>("Name")
                         .IsRequired()
                         .HasColumnType("longtext");
 
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasColumnType("longtext");
-
                     b.Property<int?>("TagId")
                         .HasColumnType("int");
 
@@ -212,13 +220,15 @@ namespace Watcher.Migrations
 
             modelBuilder.Entity("Watcher.Models.Container", b =>
                 {
-                    b.HasOne("Watcher.Models.Image", null)
+                    b.HasOne("Watcher.Models.Image", "Image")
                         .WithMany("Containers")
                         .HasForeignKey("ImageId");
 
                     b.HasOne("Watcher.Models.Tag", null)
                         .WithMany("Containers")
                         .HasForeignKey("TagId");
+
+                    b.Navigation("Image");
                 });
 
             modelBuilder.Entity("Watcher.Models.LogEvent", b =>
diff --git a/Watcher/Models/Container.cs b/Watcher/Models/Container.cs
index ac3e8e7..2d5ab6a 100644
--- a/Watcher/Models/Container.cs
+++ b/Watcher/Models/Container.cs
@@ -8,9 +8,13 @@ public class Container
 
     public string Status { get; set; } = string.Empty;
 
+    public Image? Image { get; set; }
+
     public DateTime CreatedAt { get; set; } = DateTime.UtcNow;
 
     public string Hostname { get; set; } = string.Empty;
 
     public string Type { get; set; } = "docker"; // z.B. "docker", "vm", "lxc", etc.
+
+    public Boolean IsRunning { get; set; } = false;
 }
diff --git a/Watcher/Models/Server.cs b/Watcher/Models/Server.cs
index c325177..84a2f9d 100644
--- a/Watcher/Models/Server.cs
+++ b/Watcher/Models/Server.cs
@@ -6,12 +6,18 @@ public class Server
 
     public string Name { get; set; } = string.Empty;
 
-    public string Status { get; set; } = string.Empty;
+    public string IPAddress { get; set; } = string.Empty;
 
     public DateTime CreatedAt { get; set; } = DateTime.UtcNow;
 
-    public string Hostname { get; set; } = string.Empty;
-
     // z.B. "VPS", "standalone", "VM", etc.
-    public string Type { get; set; } = "VPS"; 
+    public string Type { get; set; } = "VPS";
+
+    public Boolean IsOnline { get; set; } = false;
+
+    public DateTime LastSeen { get; set; }
+
+    public string? Description { get; set; }
+
+    
 }
diff --git a/Watcher/ViewModels/AddContainerViewModel.cs b/Watcher/ViewModels/AddContainerViewModel.cs
new file mode 100644
index 0000000..38c2017
--- /dev/null
+++ b/Watcher/ViewModels/AddContainerViewModel.cs
@@ -0,0 +1,13 @@
+using Watcher.Models;
+
+namespace Watcher.ViewModels;
+public class AddContainerViewModel
+{
+    public string Name { get; set; } = string.Empty;
+    public Image? Image { get; set; }
+    public string Status { get; set; } = string.Empty;
+    public string Hostname { get; set; } = string.Empty;
+    public string IPAddress { get; set; } = string.Empty;
+    public string ServerName { get; set; } = string.Empty; // oder ID, je nach Relation
+    public bool IsRunning { get; set; } = false;
+}
diff --git a/Watcher/ViewModels/AddServerViewModel.cs b/Watcher/ViewModels/AddServerViewModel.cs
new file mode 100644
index 0000000..d582028
--- /dev/null
+++ b/Watcher/ViewModels/AddServerViewModel.cs
@@ -0,0 +1,12 @@
+
+namespace Watcher.ViewModels;
+
+public class AddServerViewModel
+{
+    public string Name { get; set; } = string.Empty;
+    public string IPAddress { get; set; } = string.Empty;
+    public string Status { get; set; } = string.Empty;
+    public string Hostname { get; set; } = string.Empty;
+    public string Type { get; set; } = "VPS";
+    public bool IsOnline { get; set; } = false;
+}
diff --git a/Watcher/ViewModels/ContainerOverviewViewModel.cs b/Watcher/ViewModels/ContainerOverviewViewModel.cs
new file mode 100644
index 0000000..e075100
--- /dev/null
+++ b/Watcher/ViewModels/ContainerOverviewViewModel.cs
@@ -0,0 +1,10 @@
+using Watcher.Models;
+
+namespace Watcher.ViewModels
+{
+    public class ContainerOverviewViewModel
+{
+    public List<Container> Containers { get; set; } = new();
+}
+}
+
diff --git a/Watcher/ViewModels/DashboardViewModel.cs b/Watcher/ViewModels/DashboardViewModel.cs
new file mode 100644
index 0000000..02bf40f
--- /dev/null
+++ b/Watcher/ViewModels/DashboardViewModel.cs
@@ -0,0 +1,11 @@
+namespace Watcher.ViewModels
+{
+    public class DashboardViewModel
+    {
+        public int ActiveServers { get; set; }
+        public int OfflineServers { get; set; }
+        public int RunningContainers { get; set; }
+        public int FailedContainers { get; set; }
+        public DateTime LastLogin { get; set; }
+    }
+}
diff --git a/Watcher/ViewModels/EditServerViewModel.cs b/Watcher/ViewModels/EditServerViewModel.cs
new file mode 100644
index 0000000..f94df04
--- /dev/null
+++ b/Watcher/ViewModels/EditServerViewModel.cs
@@ -0,0 +1,10 @@
+namespace Watcher.ViewModels;
+
+public class EditServerViewModel
+{
+    public string Name { get; set; } = string.Empty;
+
+    public string IPAddress { get; set; } = string.Empty;
+
+    public string Type { get; set; } = "VPS";
+}
diff --git a/Watcher/ViewModels/ServerOverviewViewModel.cs b/Watcher/ViewModels/ServerOverviewViewModel.cs
new file mode 100644
index 0000000..72be054
--- /dev/null
+++ b/Watcher/ViewModels/ServerOverviewViewModel.cs
@@ -0,0 +1,10 @@
+using Watcher.Models;
+
+namespace Watcher.ViewModels
+
+{
+    public class ServerOverviewViewModel
+    {
+        public List<Server> Servers { get; set; } = new();
+    }
+}
diff --git a/Watcher/Views/Container/AddContainer.cshtml b/Watcher/Views/Container/AddContainer.cshtml
new file mode 100644
index 0000000..29ab3c2
--- /dev/null
+++ b/Watcher/Views/Container/AddContainer.cshtml
@@ -0,0 +1,22 @@
+@model Watcher.ViewModels.AddContainerViewModel
+@{
+    ViewData["Title"] = "Neuen Container hinzufügen";
+}
+
+<h1 class="text-2xl font-bold mb-4">Neuen Container hinzufügen</h1>
+
+<form asp-action="Add" method="post" class="space-y-4 max-w-xl">
+    <div>
+        <label asp-for="Name" class="block font-medium">Name</label>
+        <input asp-for="Name" class="w-full border rounded px-3 py-2" />
+    </div>
+    <div>
+        <label asp-for="Image" class="block font-medium">Image</label>
+        <input asp-for="Image" class="w-full border rounded px-3 py-2" />
+    </div>
+    <div>
+        <label asp-for="ServerName" class="block font-medium">Server</label>
+        <input asp-for="ServerName" class="w-full border rounded px-3 py-2" />
+    </div>
+    <button type="submit" class="bg-blue-600 text-white px-4 py-2 rounded hover:bg-blue-700">Speichern</button>
+</form>
diff --git a/Watcher/Views/Container/Overview.cshtml b/Watcher/Views/Container/Overview.cshtml
new file mode 100644
index 0000000..d9b9cec
--- /dev/null
+++ b/Watcher/Views/Container/Overview.cshtml
@@ -0,0 +1,36 @@
+@model Watcher.ViewModels.ContainerOverviewViewModel
+@{
+    ViewData["Title"] = "Containerübersicht";
+}
+
+<div class="flex items-center justify-between mb-6">
+    <h1 class="text-3xl font-bold">Containerübersicht</h1>
+    <a asp-action="AddContainer" class="bg-blue-600 text-white px-4 py-2 rounded hover:bg-blue-700">
+        + Container hinzufügen
+    </a>
+</div>
+
+<div class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-6">
+    @foreach (var container in Model.Containers)
+    {
+        <div class="bg-white shadow-md rounded-xl p-5 border border-gray-200 hover:shadow-lg transition duration-200">
+            <h2 class="text-xl font-semibold mb-1">@container.Name</h2>
+            <p class="text-sm text-gray-600 mb-2"><strong>Image:</strong> @container.Image</p>
+            <p class="text-sm text-gray-600"><strong>Hostname:</strong> @container.Hostname</p>
+            <p class="text-sm text-gray-600"><strong>Status:</strong> @container.Status</p>
+            <p class="text-sm text-gray-600 mb-3">
+                <strong>Läuft:</strong>
+                <span class="@(container.IsRunning ? "text-green-600" : "text-red-600")">
+                    @(container.IsRunning ? "Ja" : "Nein")
+                </span>
+            </p>
+            <div class="flex justify-end gap-2">
+                <a asp-action="Edit" asp-route-id="@container.Id"
+                   class="text-blue-600 hover:underline text-sm">Bearbeiten</a>
+                <a asp-action="Delete" asp-route-id="@container.Id"
+                   class="text-red-600 hover:underline text-sm">Löschen</a>
+            </div>
+        </div>
+    }
+</div>
+
diff --git a/Watcher/Views/Home/Index.cshtml b/Watcher/Views/Home/Index.cshtml
index a92733d..627e7d3 100644
--- a/Watcher/Views/Home/Index.cshtml
+++ b/Watcher/Views/Home/Index.cshtml
@@ -1,6 +1,36 @@
-@{
+@model Watcher.ViewModels.DashboardViewModel
+@{
     ViewData["Title"] = "Dashboard";
 }
 
-<h1>Dashboard</h1>
-<p>Willkommen im Watcher Monitoring Interface!</p>
+<h1 class="text-2xl font-bold mb-4">Dashboard</h1>
+
+<div class="grid grid-cols-2 gap-6">
+    <div class="bg-white shadow rounded-2xl p-4">
+        <h2 class="text-xl font-semibold mb-2">Server</h2>
+        <p>🟢 Online: <strong>@Model.ActiveServers</strong></p>
+        <p>🔴 Offline: <strong>@Model.OfflineServers</strong></p>
+        <a href="/Server/Overview" class="text-blue-500 hover:underline mt-2 inline-block">→ Zu den Servern</a>
+    </div>
+
+    <div class="bg-white shadow rounded-2xl p-4">
+        <h2 class="text-xl font-semibold mb-2">Container</h2>
+        <p>🟢 Laufend: <strong>@Model.RunningContainers</strong></p>
+        <p>🔴 Fehlerhaft: <strong>@Model.FailedContainers</strong></p>
+        <a href="/Container/Overview" class="text-blue-500 hover:underline mt-2 inline-block">→ Zu den Containern</a>
+    </div>
+
+    <div class="col-span-2 bg-white shadow rounded-2xl p-4">
+        <h2 class="text-xl font-semibold mb-2">Uptime letzte 24h</h2>
+        <div class="bg-gray-100 h-32 rounded-lg flex items-center justify-center text-gray-500">
+            (Diagramm folgt hier)
+        </div>
+    </div>
+
+    <div class="col-span-2 bg-white shadow rounded-2xl p-4">
+        <h2 class="text-xl font-semibold mb-2">Systeminfo</h2>
+        <p>Benutzer: <strong>@User.FindFirst("preferred_username")?.Value</strong></p>
+        <p>Letzter Login: <strong>@Model.LastLogin.ToString("g")</strong></p>
+        <a href="/Auth/Info" class="text-blue-500 hover:underline mt-2 inline-block">→ Account-Verwaltung</a>
+    </div>
+</div>
diff --git a/Watcher/Views/Home/Servers.cshtml b/Watcher/Views/Home/Servers.cshtml
deleted file mode 100644
index e69de29..0000000
diff --git a/Watcher/Views/Server/AddServer.cshtml b/Watcher/Views/Server/AddServer.cshtml
new file mode 100644
index 0000000..97471fb
--- /dev/null
+++ b/Watcher/Views/Server/AddServer.cshtml
@@ -0,0 +1,42 @@
+@model Watcher.ViewModels.AddServerViewModel
+@{
+    ViewData["Title"] = "Neuen Server hinzufügen";
+}
+
+<div class="max-w-2xl mx-auto mt-10 bg-white rounded-2xl shadow-md p-8">
+    <h1 class="text-2xl font-bold text-gray-800 mb-6">Neuen Server hinzufügen</h1>
+
+    <form asp-action="AddServer" method="post" class="space-y-5">
+        <div>
+            <label asp-for="Name" class="block text-sm font-medium text-gray-700">Name</label>
+            <input asp-for="Name" class="mt-1 block w-full border-gray-300 rounded-md shadow-sm focus:ring-blue-500 focus:border-blue-500" />
+            <span asp-validation-for="Name" class="text-red-500 text-sm" />
+        </div>
+
+        <div>
+            <label asp-for="IPAddress" class="block text-sm font-medium text-gray-700">IP-Adresse</label>
+            <input asp-for="IPAddress" class="mt-1 block w-full border-gray-300 rounded-md shadow-sm focus:ring-blue-500 focus:border-blue-500" />
+            <span asp-validation-for="IPAddress" class="text-red-500 text-sm" />
+        </div>
+
+        <div>
+            <label asp-for="Type" class="block text-sm font-medium text-gray-700">Typ</label>
+            <select asp-for="Type" class="mt-1 block w-full border-gray-300 rounded-md shadow-sm focus:ring-blue-500 focus:border-blue-500">
+                <option>VPS</option>
+                <option>VM</option>
+                <option>Standalone</option>
+            </select>
+        </div>
+
+        <div class="flex justify-end">
+            <a asp-action="Overview" class="mr-3 inline-block px-4 py-2 text-gray-600 hover:text-blue-600">Abbrechen</a>
+            <button type="submit" class="px-5 py-2 bg-blue-600 text-white font-semibold rounded hover:bg-blue-700">
+                Speichern
+            </button>
+        </div>
+    </form>
+</div>
+
+@section Scripts {
+    <partial name="_ValidationScriptsPartial" />
+}
diff --git a/Watcher/Views/Server/EditServer.cshtml b/Watcher/Views/Server/EditServer.cshtml
new file mode 100644
index 0000000..d3f3fe5
--- /dev/null
+++ b/Watcher/Views/Server/EditServer.cshtml
@@ -0,0 +1,31 @@
+@model Watcher.ViewModels.EditServerViewModel;
+
+@{
+    ViewData["Title"] = "Server bearbeiten";
+}
+
+<h2>Server bearbeiten</h2>
+
+<form asp-action="EditServer" method="post">
+    @Html.AntiForgeryToken()
+
+    <div class="mb-3">
+        <label asp-for="Name"></label>
+        <input asp-for="Name" class="form-control" />
+    </div>
+
+    <div class="mb-3">
+        <label asp-for="IPAddress"></label>
+        <input asp-for="IPAddress" class="form-control" />
+    </div>
+    
+    </div>
+
+    <div class="mb-3">
+        <label asp-for="Type"></label>
+        <input asp-for="Type" class="form-control" />
+    </div>
+
+    <button type="submit" class="btn btn-primary mt-3">Speichern</button>
+    <a asp-action="Overview" class="btn btn-secondary mt-3">Abbrechen</a>
+</form>
diff --git a/Watcher/Views/Server/overview.cshtml b/Watcher/Views/Server/overview.cshtml
new file mode 100644
index 0000000..1b537f2
--- /dev/null
+++ b/Watcher/Views/Server/overview.cshtml
@@ -0,0 +1,48 @@
+@model Watcher.ViewModels.ServerOverviewViewModel
+@{
+    ViewData["Title"] = "Serverübersicht";
+}
+
+<div class="flex items-center justify-between mb-6">
+    <h1 class="text-2xl font-bold">Serverübersicht</h1>
+    <a asp-controller="Server" asp-action="AddServer"
+        class="bg-blue-600 text-white px-4 py-2 rounded hover:bg-blue-700">
+        + Server hinzufügen
+    </a>
+</div>
+
+
+
+<div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6">
+    @foreach (var s in Model.Servers)
+    {
+        <div class="bg-white rounded-xl shadow p-4 border border-gray-200">
+            <div class="flex justify-between items-start">
+                <div>
+                    <h2 class="text-lg font-semibold">(#@s.Id) @s.Name</h2>
+                </div>
+                <span class="text-sm px-2 py-1 rounded 
+                    @(s.IsOnline ? "bg-green-100 text-green-700" : "bg-red-100 text-red-700")">
+                    @(s.IsOnline ? "Online" : "Offline")
+                </span>
+            </div>
+
+            <div class="mt-4 text-sm space-y-1 text-gray-700">
+                <div><strong>IP:</strong> @s.IPAddress</div>
+                <div><strong>Typ:</strong> @s.Type</div>
+                <div><strong>Status:</strong> @((s.IsOnline) ? "Online" : "Offline")</div>
+                <div><strong>Erstellt:</strong> @s.CreatedAt.ToLocalTime().ToString("dd.MM.yyyy HH:mm")</div>
+                <div><strong>Last-Seen:</strong> @(s.LastSeen.ToLocalTime().ToString("dd.MM.yyyy HH:mm") ?? "Never")</div>
+            </div>
+
+            <div class="mt-4 flex justify-end gap-2">
+                <a asp-action="EditServer" asp-route-id="@s.Id" class="btn btn-sm btn-primary">Bearbeiten</a>
+
+                <form asp-action="Delete" asp-route-id="@s.Id" method="post"
+                    onsubmit="return confirm('Diesen Server wirklich löschen?');">
+                    <button type="submit" class="text-red-600 hover:text-red-800 font-semibold">Löschen</button>
+                </form>
+            </div>
+        </div>
+    }
+</div>
\ No newline at end of file
diff --git a/Watcher/Views/Shared/_Layout.cshtml b/Watcher/Views/Shared/_Layout.cshtml
index 1911a3f..9104883 100644
--- a/Watcher/Views/Shared/_Layout.cshtml
+++ b/Watcher/Views/Shared/_Layout.cshtml
@@ -68,10 +68,10 @@
                 <a class="nav-link" href="/Uptime">Uptime</a>
                 </li>
                 <li class="nav-item">
-                    <a class="nav-link" href="/Monitoring/Servers">Servers</a>
+                    <a class="nav-link" href="/Server/Overview">Servers</a>
                 </li>
                 <li class="nav-item">
-                    <a class="nav-link" href="/Container">Container</a>
+                    <a class="nav-link" href="/Container/Overview">Container</a>
                 </li>
             </ul>
         </div>
@@ -103,6 +103,9 @@
     </main>
 
     <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js"></script>
+
+    @RenderSection("Scripts", required: false)
+
 </body>
 
 </html>
diff --git a/Watcher/appsettings.json b/Watcher/appsettings.json
index c59c356..81748ed 100644
--- a/Watcher/appsettings.json
+++ b/Watcher/appsettings.json
@@ -7,7 +7,7 @@
   },
   "AllowedHosts": "*",
   "ConnectionStrings": {
-    "DefaultConnection": "server=192.168.178.68;port=3306;database=watcher;user=monitoringuser;password=ssp123;"
+    "DefaultConnection": "server=100.64.0.5;port=3306;database=watcher;user=monitoringuser;password=ssp123;"
   },
   "Authentication": {
   "PocketID": {