diff --git a/Glense.Server/.dockerignore b/Glense.Server/.dockerignore
new file mode 100644
index 0000000..2062a23
--- /dev/null
+++ b/Glense.Server/.dockerignore
@@ -0,0 +1,7 @@
+DonationService/
+bin/
+obj/
+*.md
+.env
+.git
+.gitignore
diff --git a/Glense.Server/ApplicationDbContext.cs b/Glense.Server/ApplicationDbContext.cs
deleted file mode 100644
index edf7d62..0000000
--- a/Glense.Server/ApplicationDbContext.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-using Microsoft.AspNetCore.Connections;
-using Microsoft.EntityFrameworkCore;
-
-namespace Glense.Server
-{
-    public class ApplicationDbContext : DbContext
-    {
-        public DbSet<Category> Categories { get; set; }
-        public DbSet<Comment> Comments { get; set; }
-        public DbSet<CommentLikes> CommentLikes { get; set; }
-        public DbSet<Conversation> Conversations { get; set; }
-        public DbSet<Donation> Donations { get; set; }
-        public DbSet<Message> Messages { get; set; }
-        public DbSet<Subscription> Subscriptions { get; set; }
-        public DbSet<User> Users { get; set; }
-        public DbSet<Video> Videos { get; set; }
-        public DbSet<VideoLikes> VideoLikes { get; set; }
-
-        public ApplicationDbContext(DbContextOptions<ApplicationDbContext> options) : base(options) { }
-
-        protected override void OnModelCreating(ModelBuilder modelBuilder)
-        {
-            modelBuilder.Entity<Category>()
-                .HasKey(c => new { c.categoryID });
-            modelBuilder.Entity<Comment>()
-                .HasKey(c => new { c.commentId });
-            modelBuilder.Entity<CommentLikes>()
-                .HasKey(cl => new { cl.commentId, cl.userId });
-            modelBuilder.Entity<Conversation>()
-                .HasKey(c => new { c.conversationId });
-            modelBuilder.Entity<Donation>()
-                .HasKey(d => new { d.donatorId, d.recipientId, d.donatedAt });
-            modelBuilder.Entity<Message>()
-                .HasKey(m => new { m.messageId });
-            modelBuilder.Entity<Subscription>()
-                .HasKey(s => new { s.subscriberId, s.subscribedToId });
-            modelBuilder.Entity<User>()
-                .HasKey(u => new { u.userId });
-            modelBuilder.Entity<Video>()
-                .HasKey(v => new { v.videoID });
-            modelBuilder.Entity<VideoLikes>()
-                .HasKey(vl => new { vl.videoId, vl.userId });
-            modelBuilder.Entity<User>()
-                .HasMany(u => u.Subscribers)
-                .WithOne(s => s.subscriber)
-                .HasForeignKey(s => s.subscriberId);
-            modelBuilder.Entity<User>()
-                .HasMany(u => u.Subscriptions)
-                .WithOne(s => s.subscribedTo)
-                .HasForeignKey(s => s.subscribedToId);
-            modelBuilder.Entity<Conversation>()
-                .HasMany(c => c.Messages)
-                .WithOne(m => m.conversation)
-                .HasForeignKey(m => m.conversationId);
-            modelBuilder.Entity<User>()
-                .HasMany(u => u.Donations)
-                .WithOne(d => d.recipient)
-                .HasForeignKey(d => d.recipientId);
-            modelBuilder.Entity<User>()
-                .HasMany(u => u.ConversationsStarted)
-                .WithOne(c => c.user1)
-                .HasForeignKey(c => c.user1Id);
-            modelBuilder.Entity<User>()
-                .HasMany(u => u.ConversationsInvited)
-                .WithOne(c => c.user2)
-                .HasForeignKey(c => c.user2Id);
-            modelBuilder.Entity<User>()
-                .HasMany(u => u.Comments)
-                .WithOne(c => c.user)
-                .HasForeignKey(c => c.userId);
-            modelBuilder.Entity<Video>()
-                .HasMany(v => v.Comments)
-                .WithOne(c => c.video)
-                .HasForeignKey(c => c.videoId);
-            modelBuilder.Entity<Comment>()
-                .HasMany(c => c.ChildComments)
-                .WithOne(c => c.parentComment)
-                .HasForeignKey(c => c.parentCommentId);
-            modelBuilder.Entity<Comment>()
-                .HasMany(c => c.CLikes)
-                .WithOne(cl => cl.comment)
-                .HasForeignKey(cl => cl.commentId);
-            modelBuilder.Entity<User>()
-                .HasMany(u => u.CLikes)
-                .WithOne(cl => cl.user)
-                .HasForeignKey(cl => cl.userId);
-            modelBuilder.Entity<User>()
-                .HasMany(u => u.VLikes)
-                .WithOne(vl => vl.user)
-                .HasForeignKey(vl => vl.userId);
-            modelBuilder.Entity<Video>()
-                .HasMany(u => u.VLikes)
-                .WithOne(vl => vl.video)
-                .HasForeignKey(vl => vl.videoId);
-            modelBuilder.Entity<Category>()
-                .HasMany(c => c.Videos)
-                .WithOne(v => v.category)
-                .HasForeignKey(v => v.categoryId);
-        }
-    }
-}
diff --git a/Glense.Server/Controllers/AuthProxyController.cs b/Glense.Server/Controllers/AuthProxyController.cs
deleted file mode 100644
index f1dfe26..0000000
--- a/Glense.Server/Controllers/AuthProxyController.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-using System.Text;
-using System.Text.Json;
-
-namespace Glense.Server.Controllers;
-
-/// <summary>
-/// Proxy controller for Account Service authentication endpoints
-/// </summary>
-[ApiController]
-[Route("api/auth")]
-public class AuthProxyController : ControllerBase
-{
-    private readonly IHttpClientFactory _httpClientFactory;
-    private readonly ILogger<AuthProxyController> _logger;
-
-    public AuthProxyController(IHttpClientFactory httpClientFactory, ILogger<AuthProxyController> logger)
-    {
-        _httpClientFactory = httpClientFactory;
-        _logger = logger;
-    }
-
-    [HttpPost("login")]
-    public async Task<IActionResult> Login()
-    {
-        return await ProxyToAccountService("/api/auth/login");
-    }
-
-    [HttpPost("register")]
-    public async Task<IActionResult> Register()
-    {
-        return await ProxyToAccountService("/api/auth/register");
-    }
-
-    private async Task<IActionResult> ProxyToAccountService(string path)
-    {
-        var client = _httpClientFactory.CreateClient("AccountService");
-
-        try
-        {
-            // Read request body
-            using var reader = new StreamReader(Request.Body);
-            var body = await reader.ReadToEndAsync();
-
-            // Create request to Account Service
-            var request = new HttpRequestMessage(HttpMethod.Post, path)
-            {
-                Content = new StringContent(body, Encoding.UTF8, "application/json")
-            };
-
-            // Forward authorization header if present
-            if (Request.Headers.TryGetValue("Authorization", out var authHeader))
-            {
-                request.Headers.Add("Authorization", authHeader.ToString());
-            }
-
-            var response = await client.SendAsync(request);
-            var content = await response.Content.ReadAsStringAsync();
-
-            _logger.LogInformation("Proxied {Path} to Account Service, status: {Status}", path, response.StatusCode);
-
-            return new ContentResult
-            {
-                StatusCode = (int)response.StatusCode,
-                Content = content,
-                ContentType = "application/json"
-            };
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Error proxying to Account Service: {Path}", path);
-            return StatusCode(502, new { message = "Account service unavailable" });
-        }
-    }
-}
diff --git a/Glense.Server/Controllers/ChatProxyController.cs b/Glense.Server/Controllers/ChatProxyController.cs
deleted file mode 100644
index ec6f551..0000000
--- a/Glense.Server/Controllers/ChatProxyController.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-using System.Text;
-
-namespace Glense.Server.Controllers;
-
-[ApiController]
-[Route("api")]
-public class ChatProxyController : ControllerBase
-{
-    private readonly IHttpClientFactory _httpClientFactory;
-    private readonly ILogger<ChatProxyController> _logger;
-
-    public ChatProxyController(IHttpClientFactory httpClientFactory, ILogger<ChatProxyController> logger)
-    {
-        _httpClientFactory = httpClientFactory;
-        _logger = logger;
-    }
-
-    [HttpGet("chats")]
-    public Task<IActionResult> GetChats([FromQuery] Guid? cursor, [FromQuery] int pageSize = 50)
-    {
-        var qs = $"?pageSize={pageSize}" + (cursor.HasValue ? $"&cursor={cursor}" : "");
-        return ProxyGet($"/api/chats{qs}");
-    }
-
-    [HttpPost("chats")]
-    public Task<IActionResult> CreateChat() => ProxyPost("/api/chats");
-
-    [HttpGet("chats/{chatId:guid}")]
-    public Task<IActionResult> GetChat(Guid chatId) => ProxyGet($"/api/chats/{chatId}");
-
-    [HttpDelete("chats/{chatId:guid}")]
-    public Task<IActionResult> DeleteChat(Guid chatId) => ProxyDelete($"/api/chats/{chatId}");
-
-    [HttpGet("chats/{chatId:guid}/messages")]
-    public Task<IActionResult> GetMessages(Guid chatId, [FromQuery] Guid? cursor, [FromQuery] int pageSize = 50)
-    {
-        var qs = $"?pageSize={pageSize}" + (cursor.HasValue ? $"&cursor={cursor}" : "");
-        return ProxyGet($"/api/chats/{chatId}/messages{qs}");
-    }
-
-    [HttpPost("chats/{chatId:guid}/messages")]
-    public Task<IActionResult> PostMessage(Guid chatId) => ProxyPost($"/api/chats/{chatId}/messages");
-
-    [HttpGet("messages/{messageId:guid}")]
-    public Task<IActionResult> GetMessage(Guid messageId) => ProxyGet($"/api/messages/{messageId}");
-
-    [HttpDelete("messages/{messageId:guid}")]
-    public Task<IActionResult> DeleteMessage(Guid messageId) => ProxyDelete($"/api/messages/{messageId}");
-
-    private async Task<IActionResult> ProxyGet(string path)
-    {
-        var client = _httpClientFactory.CreateClient("ChatService");
-        try
-        {
-            var req = new HttpRequestMessage(HttpMethod.Get, path);
-            ForwardHeaders(req);
-            var resp = await client.SendAsync(req);
-            return await ToResult(resp);
-        }
-        catch (Exception ex) { return ServiceUnavailable(ex, path); }
-    }
-
-    private async Task<IActionResult> ProxyPost(string path)
-    {
-        var client = _httpClientFactory.CreateClient("ChatService");
-        try
-        {
-            using var reader = new StreamReader(Request.Body);
-            var body = await reader.ReadToEndAsync();
-            var req = new HttpRequestMessage(HttpMethod.Post, path)
-            {
-                Content = new StringContent(body, Encoding.UTF8, "application/json")
-            };
-            ForwardHeaders(req);
-            var resp = await client.SendAsync(req);
-            return await ToResult(resp);
-        }
-        catch (Exception ex) { return ServiceUnavailable(ex, path); }
-    }
-
-    private async Task<IActionResult> ProxyDelete(string path)
-    {
-        var client = _httpClientFactory.CreateClient("ChatService");
-        try
-        {
-            var req = new HttpRequestMessage(HttpMethod.Delete, path);
-            ForwardHeaders(req);
-            var resp = await client.SendAsync(req);
-            return await ToResult(resp);
-        }
-        catch (Exception ex) { return ServiceUnavailable(ex, path); }
-    }
-
-    private void ForwardHeaders(HttpRequestMessage req)
-    {
-        if (Request.Headers.TryGetValue("Authorization", out var auth))
-            req.Headers.Add("Authorization", auth.ToString());
-    }
-
-    private static async Task<ContentResult> ToResult(HttpResponseMessage resp)
-    {
-        var content = await resp.Content.ReadAsStringAsync();
-        return new ContentResult { StatusCode = (int)resp.StatusCode, Content = content, ContentType = "application/json" };
-    }
-
-    private IActionResult ServiceUnavailable(Exception ex, string path)
-    {
-        _logger.LogError(ex, "Error proxying to Chat Service: {Path}", path);
-        return StatusCode(502, new { message = "Chat service unavailable" });
-    }
-}
diff --git a/Glense.Server/Controllers/DonationProxyController.cs b/Glense.Server/Controllers/DonationProxyController.cs
deleted file mode 100644
index c0d645c..0000000
--- a/Glense.Server/Controllers/DonationProxyController.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-using System.Text;
-
-namespace Glense.Server.Controllers;
-
-/// <summary>
-/// Proxy controller for Donation Service donation endpoints
-/// </summary>
-[ApiController]
-[Route("api/donation")]
-public class DonationProxyController : ControllerBase
-{
-    private readonly IHttpClientFactory _httpClientFactory;
-    private readonly ILogger<DonationProxyController> _logger;
-
-    public DonationProxyController(IHttpClientFactory httpClientFactory, ILogger<DonationProxyController> logger)
-    {
-        _httpClientFactory = httpClientFactory;
-        _logger = logger;
-    }
-
-    [HttpGet("donor/{userId}")]
-    public async Task<IActionResult> GetDonationsByDonor(string userId)
-    {
-        return await ProxyGetToDonationService($"/api/donation/donor/{userId}");
-    }
-
-    [HttpGet("recipient/{userId}")]
-    public async Task<IActionResult> GetDonationsByRecipient(string userId)
-    {
-        return await ProxyGetToDonationService($"/api/donation/recipient/{userId}");
-    }
-
-    [HttpPost]
-    public async Task<IActionResult> CreateDonation()
-    {
-        return await ProxyPostToDonationService("/api/donation");
-    }
-
-    private async Task<IActionResult> ProxyGetToDonationService(string path)
-    {
-        var client = _httpClientFactory.CreateClient("DonationService");
-
-        try
-        {
-            var request = new HttpRequestMessage(HttpMethod.Get, path);
-
-            if (Request.Headers.TryGetValue("Authorization", out var authHeader))
-            {
-                request.Headers.Add("Authorization", authHeader.ToString());
-            }
-
-            var response = await client.SendAsync(request);
-            var content = await response.Content.ReadAsStringAsync();
-
-            return new ContentResult
-            {
-                StatusCode = (int)response.StatusCode,
-                Content = content,
-                ContentType = "application/json"
-            };
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Error proxying GET to Donation Service: {Path}", path);
-            return StatusCode(502, new { message = "Donation service unavailable" });
-        }
-    }
-
-    private async Task<IActionResult> ProxyPostToDonationService(string path)
-    {
-        var client = _httpClientFactory.CreateClient("DonationService");
-
-        try
-        {
-            using var reader = new StreamReader(Request.Body);
-            var body = await reader.ReadToEndAsync();
-
-            var request = new HttpRequestMessage(HttpMethod.Post, path)
-            {
-                Content = new StringContent(body, Encoding.UTF8, "application/json")
-            };
-
-            if (Request.Headers.TryGetValue("Authorization", out var authHeader))
-            {
-                request.Headers.Add("Authorization", authHeader.ToString());
-            }
-
-            var response = await client.SendAsync(request);
-            var content = await response.Content.ReadAsStringAsync();
-
-            return new ContentResult
-            {
-                StatusCode = (int)response.StatusCode,
-                Content = content,
-                ContentType = "application/json"
-            };
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Error proxying POST to Donation Service: {Path}", path);
-            return StatusCode(502, new { message = "Donation service unavailable" });
-        }
-    }
-}
diff --git a/Glense.Server/Controllers/NotificationProxyController.cs b/Glense.Server/Controllers/NotificationProxyController.cs
deleted file mode 100644
index 95b3b1e..0000000
--- a/Glense.Server/Controllers/NotificationProxyController.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-using System.Text;
-
-namespace Glense.Server.Controllers;
-
-/// <summary>
-/// Proxy controller for Account Service notification endpoints
-/// </summary>
-[ApiController]
-[Route("api/notification")]
-public class NotificationProxyController : ControllerBase
-{
-    private readonly IHttpClientFactory _httpClientFactory;
-    private readonly ILogger<NotificationProxyController> _logger;
-
-    public NotificationProxyController(IHttpClientFactory httpClientFactory, ILogger<NotificationProxyController> logger)
-    {
-        _httpClientFactory = httpClientFactory;
-        _logger = logger;
-    }
-
-    [HttpGet]
-    public async Task<IActionResult> GetNotifications()
-    {
-        return await ProxyGetToAccountService("/api/notification");
-    }
-
-    [HttpPut("{id}/read")]
-    public async Task<IActionResult> MarkAsRead(string id)
-    {
-        return await ProxyPutToAccountService($"/api/notification/{id}/read");
-    }
-
-    private async Task<IActionResult> ProxyGetToAccountService(string path)
-    {
-        var client = _httpClientFactory.CreateClient("AccountService");
-
-        try
-        {
-            var request = new HttpRequestMessage(HttpMethod.Get, path);
-
-            if (Request.Headers.TryGetValue("Authorization", out var authHeader))
-            {
-                request.Headers.Add("Authorization", authHeader.ToString());
-            }
-
-            var response = await client.SendAsync(request);
-            var content = await response.Content.ReadAsStringAsync();
-
-            return new ContentResult
-            {
-                StatusCode = (int)response.StatusCode,
-                Content = content,
-                ContentType = "application/json"
-            };
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Error proxying GET to Account Service: {Path}", path);
-            return StatusCode(502, new { message = "Account service unavailable" });
-        }
-    }
-
-    private async Task<IActionResult> ProxyPutToAccountService(string path)
-    {
-        var client = _httpClientFactory.CreateClient("AccountService");
-
-        try
-        {
-            var request = new HttpRequestMessage(HttpMethod.Put, path);
-
-            if (Request.Headers.TryGetValue("Authorization", out var authHeader))
-            {
-                request.Headers.Add("Authorization", authHeader.ToString());
-            }
-
-            var response = await client.SendAsync(request);
-            var content = await response.Content.ReadAsStringAsync();
-
-            return new ContentResult
-            {
-                StatusCode = (int)response.StatusCode,
-                Content = content,
-                ContentType = "application/json"
-            };
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Error proxying PUT to Account Service: {Path}", path);
-            return StatusCode(502, new { message = "Account service unavailable" });
-        }
-    }
-}
diff --git a/Glense.Server/Controllers/ProfileProxyController.cs b/Glense.Server/Controllers/ProfileProxyController.cs
deleted file mode 100644
index b337c3a..0000000
--- a/Glense.Server/Controllers/ProfileProxyController.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-using System.Text;
-
-namespace Glense.Server.Controllers;
-
-/// <summary>
-/// Proxy controller for Account Service profile endpoints
-/// </summary>
-[ApiController]
-[Route("api/profile")]
-public class ProfileProxyController : ControllerBase
-{
-    private readonly IHttpClientFactory _httpClientFactory;
-    private readonly ILogger<ProfileProxyController> _logger;
-
-    public ProfileProxyController(IHttpClientFactory httpClientFactory, ILogger<ProfileProxyController> logger)
-    {
-        _httpClientFactory = httpClientFactory;
-        _logger = logger;
-    }
-
-    [HttpGet("search")]
-    public async Task<IActionResult> SearchUsers([FromQuery] string? q, [FromQuery] int limit = 20)
-    {
-        var path = $"/api/profile/search?q={Uri.EscapeDataString(q ?? "")}&limit={limit}";
-        return await ProxyGetToAccountService(path);
-    }
-
-    [HttpGet("me")]
-    public async Task<IActionResult> GetCurrentProfile()
-    {
-        return await ProxyGetToAccountService("/api/profile/me");
-    }
-
-    [HttpGet("{userId:guid}")]
-    public async Task<IActionResult> GetUserById(Guid userId)
-    {
-        return await ProxyGetToAccountService($"/api/profile/{userId}");
-    }
-
-    [HttpPut("me")]
-    public async Task<IActionResult> UpdateProfile()
-    {
-        return await ProxyPostToAccountService("/api/profile/me", HttpMethod.Put);
-    }
-
-    private async Task<IActionResult> ProxyGetToAccountService(string path)
-    {
-        var client = _httpClientFactory.CreateClient("AccountService");
-
-        try
-        {
-            var request = new HttpRequestMessage(HttpMethod.Get, path);
-
-            // Forward authorization header
-            if (Request.Headers.TryGetValue("Authorization", out var authHeader))
-            {
-                request.Headers.Add("Authorization", authHeader.ToString());
-            }
-
-            var response = await client.SendAsync(request);
-            var content = await response.Content.ReadAsStringAsync();
-
-            return new ContentResult
-            {
-                StatusCode = (int)response.StatusCode,
-                Content = content,
-                ContentType = "application/json"
-            };
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Error proxying GET to Account Service: {Path}", path);
-            return StatusCode(502, new { message = "Account service unavailable" });
-        }
-    }
-
-    private async Task<IActionResult> ProxyPostToAccountService(string path, HttpMethod method)
-    {
-        var client = _httpClientFactory.CreateClient("AccountService");
-
-        try
-        {
-            using var reader = new StreamReader(Request.Body);
-            var body = await reader.ReadToEndAsync();
-
-            var request = new HttpRequestMessage(method, path);
-
-            if (!string.IsNullOrEmpty(body))
-            {
-                request.Content = new StringContent(body, Encoding.UTF8, "application/json");
-            }
-
-            if (Request.Headers.TryGetValue("Authorization", out var authHeader))
-            {
-                request.Headers.Add("Authorization", authHeader.ToString());
-            }
-
-            var response = await client.SendAsync(request);
-            var content = await response.Content.ReadAsStringAsync();
-
-            return new ContentResult
-            {
-                StatusCode = (int)response.StatusCode,
-                Content = content,
-                ContentType = "application/json"
-            };
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Error proxying {Method} to Account Service: {Path}", method, path);
-            return StatusCode(502, new { message = "Account service unavailable" });
-        }
-    }
-}
diff --git a/Glense.Server/Controllers/TestController.cs b/Glense.Server/Controllers/TestController.cs
deleted file mode 100644
index 6e80247..0000000
--- a/Glense.Server/Controllers/TestController.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using Glense.Server;
-using Microsoft.AspNetCore.Mvc;
-
-[ApiController]
-[Route("api/[controller]")]
-public class TestController : ControllerBase
-{
-    private readonly ApplicationDbContext _context;
-
-    public TestController(ApplicationDbContext context)
-    {
-        _context = context;
-    }
-
-    [HttpGet("test-connection")]
-    public IActionResult TestConnection()
-    {
-        try
-        {
-            var canConnect = _context.Database.CanConnect();
-            return Ok(new { success = canConnect });
-        }
-        catch (Exception ex)
-        {
-            return StatusCode(500, new { error = ex.Message });
-        }
-    }
-}
diff --git a/Glense.Server/Controllers/VideoProxyController.cs b/Glense.Server/Controllers/VideoProxyController.cs
deleted file mode 100644
index 64ae827..0000000
--- a/Glense.Server/Controllers/VideoProxyController.cs
+++ /dev/null
@@ -1,155 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-using System.Text;
-
-namespace Glense.Server.Controllers;
-
-[ApiController]
-[Route("api")]
-public class VideoProxyController : ControllerBase
-{
-    private readonly IHttpClientFactory _httpClientFactory;
-    private readonly ILogger<VideoProxyController> _logger;
-
-    public VideoProxyController(IHttpClientFactory httpClientFactory, ILogger<VideoProxyController> logger)
-    {
-        _httpClientFactory = httpClientFactory;
-        _logger = logger;
-    }
-
-    [HttpGet("videos")]
-    public Task<IActionResult> ListVideos() => ProxyGet("/api/videos");
-
-    [HttpGet("videos/{id:guid}")]
-    public Task<IActionResult> GetVideo(Guid id) => ProxyGet($"/api/videos/{id}");
-
-    [HttpGet("videos/{id:guid}/comments")]
-    public Task<IActionResult> GetComments(Guid id) => ProxyGet($"/api/videos/{id}/comments");
-
-    [HttpPost("videos/{id:guid}/comments")]
-    public Task<IActionResult> PostComment(Guid id) => ProxyPost($"/api/videos/{id}/comments");
-
-    [HttpDelete("videos/{videoId:guid}/comments/{commentId:guid}")]
-    public Task<IActionResult> DeleteComment(Guid videoId, Guid commentId) => ProxyDelete($"/api/videos/{videoId}/comments/{commentId}");
-
-    [HttpPost("videos/upload")]
-    public Task<IActionResult> UploadVideo() => ProxyUpload("/api/videos/upload");
-
-    [HttpGet("videos/{id:guid}/stream")]
-    public Task<IActionResult> StreamVideo(Guid id) => ProxyGet($"/api/videos/{id}/stream");
-
-    [HttpPost("subscriptions")]
-    public Task<IActionResult> Subscribe() => ProxyPost("/api/subscriptions");
-
-    [HttpDelete("subscriptions")]
-    public Task<IActionResult> Unsubscribe() => ProxyDelete("/api/subscriptions");
-
-    [HttpPost("videolikes")]
-    public Task<IActionResult> Like() => ProxyPost("/api/videolikes");
-
-    [HttpPost("playlists")]
-    public Task<IActionResult> CreatePlaylist() => ProxyPost("/api/playlists");
-
-    [HttpGet("playlists")]
-    public Task<IActionResult> ListPlaylists() => ProxyGet("/api/playlists");
-
-    [HttpGet("playlists/{id:guid}")]
-    public Task<IActionResult> GetPlaylist(Guid id) => ProxyGet($"/api/playlists/{id}");
-
-    [HttpPost("playlistvideos")]
-    public Task<IActionResult> AddToPlaylist() => ProxyPost("/api/playlistvideos");
-
-    [HttpDelete("playlistvideos")]
-    public Task<IActionResult> RemoveFromPlaylist() => ProxyDelete("/api/playlistvideos");
-
-    [HttpGet("playlistvideos/{playlistId:guid}")]
-    public Task<IActionResult> ListPlaylistVideos(Guid playlistId) => ProxyGet($"/api/playlistvideos/{playlistId}");
-
-    private async Task<IActionResult> ProxyGet(string path)
-    {
-        var client = _httpClientFactory.CreateClient("VideoService");
-        try
-        {
-            var req = new HttpRequestMessage(HttpMethod.Get, path);
-            ForwardHeaders(req);
-            var resp = await client.SendAsync(req);
-            return await ToResult(resp);
-        }
-        catch (Exception ex) { return ServiceUnavailable(ex, path); }
-    }
-
-    private async Task<IActionResult> ProxyPost(string path)
-    {
-        var client = _httpClientFactory.CreateClient("VideoService");
-        try
-        {
-            using var reader = new StreamReader(Request.Body);
-            var body = await reader.ReadToEndAsync();
-            var req = new HttpRequestMessage(HttpMethod.Post, path)
-            {
-                Content = new StringContent(body, Encoding.UTF8, "application/json")
-            };
-            ForwardHeaders(req);
-            var resp = await client.SendAsync(req);
-            return await ToResult(resp);
-        }
-        catch (Exception ex) { return ServiceUnavailable(ex, path); }
-    }
-
-    private async Task<IActionResult> ProxyDelete(string path)
-    {
-        var client = _httpClientFactory.CreateClient("VideoService");
-        try
-        {
-            using var reader = new StreamReader(Request.Body);
-            var body = await reader.ReadToEndAsync();
-            var req = new HttpRequestMessage(HttpMethod.Delete, path);
-            if (!string.IsNullOrEmpty(body))
-                req.Content = new StringContent(body, Encoding.UTF8, "application/json");
-            ForwardHeaders(req);
-            var resp = await client.SendAsync(req);
-            return await ToResult(resp);
-        }
-        catch (Exception ex) { return ServiceUnavailable(ex, path); }
-    }
-
-    private async Task<IActionResult> ProxyUpload(string path)
-    {
-        var client = _httpClientFactory.CreateClient("VideoService");
-        try
-        {
-            var content = new StreamContent(Request.Body);
-            content.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue(Request.ContentType ?? "application/octet-stream");
-            var req = new HttpRequestMessage(HttpMethod.Post, path) { Content = content };
-            ForwardHeaders(req);
-            var resp = await client.SendAsync(req);
-            return await ToResult(resp);
-        }
-        catch (Exception ex) { return ServiceUnavailable(ex, path); }
-    }
-
-    private void ForwardHeaders(HttpRequestMessage req)
-    {
-        if (Request.Headers.TryGetValue("Authorization", out var auth))
-            req.Headers.Add("Authorization", auth.ToString());
-        if (Request.Headers.TryGetValue("X-Uploader-Id", out var uid))
-            req.Headers.Add("X-Uploader-Id", uid.ToString());
-        if (Request.Headers.TryGetValue("X-User-Id", out var userId))
-            req.Headers.Add("X-User-Id", userId.ToString());
-        if (Request.Headers.TryGetValue("X-Creator-Id", out var cid))
-            req.Headers.Add("X-Creator-Id", cid.ToString());
-        if (Request.Headers.TryGetValue("X-Username", out var uname))
-            req.Headers.Add("X-Username", uname.ToString());
-    }
-
-    private static async Task<ContentResult> ToResult(HttpResponseMessage resp)
-    {
-        var content = await resp.Content.ReadAsStringAsync();
-        return new ContentResult { StatusCode = (int)resp.StatusCode, Content = content, ContentType = "application/json" };
-    }
-
-    private IActionResult ServiceUnavailable(Exception ex, string path)
-    {
-        _logger.LogError(ex, "Error proxying to Video Service: {Path}", path);
-        return StatusCode(502, new { message = "Video service unavailable" });
-    }
-}
diff --git a/Glense.Server/Controllers/WalletProxyController.cs b/Glense.Server/Controllers/WalletProxyController.cs
deleted file mode 100644
index b2a2317..0000000
--- a/Glense.Server/Controllers/WalletProxyController.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-using System.Text;
-
-namespace Glense.Server.Controllers;
-
-/// <summary>
-/// Proxy controller for Donation Service wallet endpoints
-/// </summary>
-[ApiController]
-[Route("api/wallet")]
-public class WalletProxyController : ControllerBase
-{
-    private readonly IHttpClientFactory _httpClientFactory;
-    private readonly ILogger<WalletProxyController> _logger;
-
-    public WalletProxyController(IHttpClientFactory httpClientFactory, ILogger<WalletProxyController> logger)
-    {
-        _httpClientFactory = httpClientFactory;
-        _logger = logger;
-    }
-
-    [HttpGet("user/{userId}")]
-    public async Task<IActionResult> GetWallet(string userId)
-    {
-        return await ProxyGetToDonationService($"/api/wallet/user/{userId}");
-    }
-
-    [HttpPost]
-    public async Task<IActionResult> CreateWallet()
-    {
-        return await ProxyPostToDonationService("/api/wallet");
-    }
-
-    [HttpPost("user/{userId}/topup")]
-    public async Task<IActionResult> TopUpWallet(string userId)
-    {
-        return await ProxyPostToDonationService($"/api/wallet/user/{userId}/topup");
-    }
-
-    [HttpPost("user/{userId}/withdraw")]
-    public async Task<IActionResult> WithdrawFromWallet(string userId)
-    {
-        return await ProxyPostToDonationService($"/api/wallet/user/{userId}/withdraw");
-    }
-
-    private async Task<IActionResult> ProxyGetToDonationService(string path)
-    {
-        var client = _httpClientFactory.CreateClient("DonationService");
-
-        try
-        {
-            var request = new HttpRequestMessage(HttpMethod.Get, path);
-
-            if (Request.Headers.TryGetValue("Authorization", out var authHeader))
-            {
-                request.Headers.Add("Authorization", authHeader.ToString());
-            }
-
-            var response = await client.SendAsync(request);
-            var content = await response.Content.ReadAsStringAsync();
-
-            return new ContentResult
-            {
-                StatusCode = (int)response.StatusCode,
-                Content = content,
-                ContentType = "application/json"
-            };
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Error proxying GET to Donation Service: {Path}", path);
-            return StatusCode(502, new { message = "Donation service unavailable" });
-        }
-    }
-
-    private async Task<IActionResult> ProxyPostToDonationService(string path)
-    {
-        var client = _httpClientFactory.CreateClient("DonationService");
-
-        try
-        {
-            using var reader = new StreamReader(Request.Body);
-            var body = await reader.ReadToEndAsync();
-
-            var request = new HttpRequestMessage(HttpMethod.Post, path)
-            {
-                Content = new StringContent(body, Encoding.UTF8, "application/json")
-            };
-
-            if (Request.Headers.TryGetValue("Authorization", out var authHeader))
-            {
-                request.Headers.Add("Authorization", authHeader.ToString());
-            }
-
-            var response = await client.SendAsync(request);
-            var content = await response.Content.ReadAsStringAsync();
-
-            return new ContentResult
-            {
-                StatusCode = (int)response.StatusCode,
-                Content = content,
-                ContentType = "application/json"
-            };
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Error proxying POST to Donation Service: {Path}", path);
-            return StatusCode(502, new { message = "Donation service unavailable" });
-        }
-    }
-}
diff --git a/Glense.Server/Controllers/WeatherForecastController.cs b/Glense.Server/Controllers/WeatherForecastController.cs
deleted file mode 100644
index d6daae4..0000000
--- a/Glense.Server/Controllers/WeatherForecastController.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-
-namespace Glense.Server.Controllers
-{
-    [ApiController]
-    [Route("[controller]")]
-    public class WeatherForecastController : ControllerBase
-    {
-        private static readonly string[] Summaries = new[]
-        {
-            "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"
-        };
-
-        private readonly ILogger<WeatherForecastController> _logger;
-
-        public WeatherForecastController(ILogger<WeatherForecastController> logger)
-        {
-            _logger = logger;
-        }
-
-        [HttpGet(Name = "GetWeatherForecast")]
-        public IEnumerable<WeatherForecast> Get()
-        {
-            return Enumerable.Range(1, 5).Select(index => new WeatherForecast
-            {
-                Date = DateOnly.FromDateTime(DateTime.Now.AddDays(index)),
-                TemperatureC = Random.Shared.Next(-20, 55),
-                Summary = Summaries[Random.Shared.Next(Summaries.Length)]
-            })
-            .ToArray();
-        }
-    }
-}
diff --git a/Glense.Server/Dockerfile b/Glense.Server/Dockerfile
new file mode 100644
index 0000000..dfd3e39
--- /dev/null
+++ b/Glense.Server/Dockerfile
@@ -0,0 +1,19 @@
+FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
+WORKDIR /app
+EXPOSE 5050
+
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
+WORKDIR /src
+COPY ["Glense.Server.csproj", "./"]
+RUN dotnet restore "Glense.Server.csproj"
+COPY . .
+RUN dotnet build "Glense.Server.csproj" -c Release -o /app/build
+
+FROM build AS publish
+RUN dotnet publish "Glense.Server.csproj" -c Release -o /app/publish /p:UseAppHost=false
+
+FROM base AS final
+WORKDIR /app
+COPY --chown=app:app --from=publish /app/publish .
+USER app
+ENTRYPOINT ["dotnet", "Glense.Server.dll"]
diff --git a/Glense.Server/Glense.Server.csproj b/Glense.Server/Glense.Server.csproj
index 4e6164a..f309a22 100644
--- a/Glense.Server/Glense.Server.csproj
+++ b/Glense.Server/Glense.Server.csproj
@@ -9,31 +9,10 @@
     <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <SpaRoot>..\glense.client</SpaRoot>
-    <SpaProxyLaunchCommand>npm run dev</SpaProxyLaunchCommand>
-    <SpaProxyServerUrl>https://localhost:50653</SpaProxyServerUrl>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="DotNetEnv" Version="3.1.1" />
-    <PackageReference Include="Microsoft.AspNetCore.SpaProxy">
-      <Version>8.*-*</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.0">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.0" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.2" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\glense.client\glense.client.esproj">
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
+    <PackageReference Include="Yarp.ReverseProxy" Version="2.1.0" />
   </ItemGroup>
 
 </Project>
diff --git a/Glense.Server/Migrations/20241202224517_InitialCreate.Designer.cs b/Glense.Server/Migrations/20241202224517_InitialCreate.Designer.cs
deleted file mode 100644
index 9d26c07..0000000
--- a/Glense.Server/Migrations/20241202224517_InitialCreate.Designer.cs
+++ /dev/null
@@ -1,495 +0,0 @@
-// <auto-generated />
-using System;
-using Glense.Server;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-
-#nullable disable
-
-namespace Glense.Server.Migrations
-{
-    [DbContext(typeof(ApplicationDbContext))]
-    [Migration("20241202224517_InitialCreate")]
-    partial class InitialCreate
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "9.0.0")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128);
-
-            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
-
-            modelBuilder.Entity("Glense.Server.Category", b =>
-                {
-                    b.Property<int>("categoryID")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("categoryID"));
-
-                    b.Property<string>("name")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("categoryID");
-
-                    b.ToTable("Category");
-                });
-
-            modelBuilder.Entity("Glense.Server.Comment", b =>
-                {
-                    b.Property<int>("commentId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("commentId"));
-
-                    b.Property<int>("commentLikes")
-                        .HasColumnType("int");
-
-                    b.Property<string>("commentText")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<DateTime>("createdAt")
-                        .HasColumnType("datetime2");
-
-                    b.Property<int>("parentCommentId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("userId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("videoId")
-                        .HasColumnType("int");
-
-                    b.HasKey("commentId");
-
-                    b.HasIndex("parentCommentId");
-
-                    b.HasIndex("userId");
-
-                    b.HasIndex("videoId");
-
-                    b.ToTable("Comments");
-                });
-
-            modelBuilder.Entity("Glense.Server.CommentLikes", b =>
-                {
-                    b.Property<int>("commentId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("userId")
-                        .HasColumnType("int");
-
-                    b.HasKey("commentId", "userId");
-
-                    b.HasIndex("userId");
-
-                    b.ToTable("CommentLikes");
-                });
-
-            modelBuilder.Entity("Glense.Server.Conversation", b =>
-                {
-                    b.Property<int>("conversationId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("conversationId"));
-
-                    b.Property<DateTime>("createdAt")
-                        .HasColumnType("datetime2");
-
-                    b.Property<int>("user1Id")
-                        .HasColumnType("int");
-
-                    b.Property<int>("user2Id")
-                        .HasColumnType("int");
-
-                    b.HasKey("conversationId");
-
-                    b.HasIndex("user1Id");
-
-                    b.HasIndex("user2Id");
-
-                    b.ToTable("Conversations");
-                });
-
-            modelBuilder.Entity("Glense.Server.Donation", b =>
-                {
-                    b.Property<int>("donatorId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("recipientId")
-                        .HasColumnType("int");
-
-                    b.Property<DateTime>("donatedAt")
-                        .HasColumnType("datetime2");
-
-                    b.Property<int>("amount")
-                        .HasColumnType("int");
-
-                    b.HasKey("donatorId", "recipientId", "donatedAt");
-
-                    b.HasIndex("recipientId");
-
-                    b.ToTable("Donations");
-                });
-
-            modelBuilder.Entity("Glense.Server.Message", b =>
-                {
-                    b.Property<int>("messageId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("messageId"));
-
-                    b.Property<int>("conversationId")
-                        .HasColumnType("int");
-
-                    b.Property<bool>("seen")
-                        .HasColumnType("bit");
-
-                    b.Property<int>("senderuserId")
-                        .HasColumnType("int");
-
-                    b.Property<DateTime>("sentAt")
-                        .HasColumnType("datetime2");
-
-                    b.Property<string>("text")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("messageId");
-
-                    b.HasIndex("conversationId");
-
-                    b.HasIndex("senderuserId");
-
-                    b.ToTable("Messages");
-                });
-
-            modelBuilder.Entity("Glense.Server.Subscription", b =>
-                {
-                    b.Property<int>("subscriberId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("subscribedToId")
-                        .HasColumnType("int");
-
-                    b.HasKey("subscriberId", "subscribedToId");
-
-                    b.HasIndex("subscribedToId");
-
-                    b.ToTable("Subscriptions");
-                });
-
-            modelBuilder.Entity("Glense.Server.User", b =>
-                {
-                    b.Property<int>("userId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("userId"));
-
-                    b.Property<string>("account")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<DateTime>("createdAt")
-                        .HasColumnType("datetime2");
-
-                    b.Property<string>("email")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("passwordSHA256")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("profilePictureURL")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("username")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("userId");
-
-                    b.ToTable("Users");
-                });
-
-            modelBuilder.Entity("Glense.Server.Video", b =>
-                {
-                    b.Property<int>("videoID")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("videoID"));
-
-                    b.Property<int>("categoryId")
-                        .HasColumnType("int");
-
-                    b.Property<string>("description")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<int>("dislikeCount")
-                        .HasColumnType("int");
-
-                    b.Property<int>("likeCount")
-                        .HasColumnType("int");
-
-                    b.Property<string>("thumbnailUrl")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("title")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<DateTime>("uploadedAt")
-                        .HasColumnType("datetime2");
-
-                    b.Property<int>("uploaderuserId")
-                        .HasColumnType("int");
-
-                    b.Property<string>("videoUrl")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<int>("viewCount")
-                        .HasColumnType("int");
-
-                    b.HasKey("videoID");
-
-                    b.HasIndex("categoryId");
-
-                    b.HasIndex("uploaderuserId");
-
-                    b.ToTable("Videos");
-                });
-
-            modelBuilder.Entity("Glense.Server.VideoLikes", b =>
-                {
-                    b.Property<int>("videoId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("userId")
-                        .HasColumnType("int");
-
-                    b.Property<bool>("isLiked")
-                        .HasColumnType("bit");
-
-                    b.HasKey("videoId", "userId");
-
-                    b.HasIndex("userId");
-
-                    b.ToTable("VideoLikes");
-                });
-
-            modelBuilder.Entity("Glense.Server.Comment", b =>
-                {
-                    b.HasOne("Glense.Server.Comment", "parentComment")
-                        .WithMany("ChildComments")
-                        .HasForeignKey("parentCommentId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("Glense.Server.User", "user")
-                        .WithMany("Comments")
-                        .HasForeignKey("userId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("Glense.Server.Video", "video")
-                        .WithMany("Comments")
-                        .HasForeignKey("videoId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("parentComment");
-
-                    b.Navigation("user");
-
-                    b.Navigation("video");
-                });
-
-            modelBuilder.Entity("Glense.Server.CommentLikes", b =>
-                {
-                    b.HasOne("Glense.Server.Comment", "comment")
-                        .WithMany("CLikes")
-                        .HasForeignKey("commentId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("Glense.Server.User", "user")
-                        .WithMany("CLikes")
-                        .HasForeignKey("userId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("comment");
-
-                    b.Navigation("user");
-                });
-
-            modelBuilder.Entity("Glense.Server.Conversation", b =>
-                {
-                    b.HasOne("Glense.Server.User", "user1")
-                        .WithMany("ConversationsStarted")
-                        .HasForeignKey("user1Id")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("Glense.Server.User", "user2")
-                        .WithMany("ConversationsInvited")
-                        .HasForeignKey("user2Id")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("user1");
-
-                    b.Navigation("user2");
-                });
-
-            modelBuilder.Entity("Glense.Server.Donation", b =>
-                {
-                    b.HasOne("Glense.Server.User", "recipient")
-                        .WithMany("Donations")
-                        .HasForeignKey("recipientId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("recipient");
-                });
-
-            modelBuilder.Entity("Glense.Server.Message", b =>
-                {
-                    b.HasOne("Glense.Server.Conversation", "conversation")
-                        .WithMany("Messages")
-                        .HasForeignKey("conversationId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("Glense.Server.User", "sender")
-                        .WithMany()
-                        .HasForeignKey("senderuserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("conversation");
-
-                    b.Navigation("sender");
-                });
-
-            modelBuilder.Entity("Glense.Server.Subscription", b =>
-                {
-                    b.HasOne("Glense.Server.User", "subscribedTo")
-                        .WithMany("Subscriptions")
-                        .HasForeignKey("subscribedToId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("Glense.Server.User", "subscriber")
-                        .WithMany("Subscribers")
-                        .HasForeignKey("subscriberId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("subscribedTo");
-
-                    b.Navigation("subscriber");
-                });
-
-            modelBuilder.Entity("Glense.Server.Video", b =>
-                {
-                    b.HasOne("Glense.Server.Category", "category")
-                        .WithMany("Videos")
-                        .HasForeignKey("categoryId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("Glense.Server.User", "uploader")
-                        .WithMany()
-                        .HasForeignKey("uploaderuserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("category");
-
-                    b.Navigation("uploader");
-                });
-
-            modelBuilder.Entity("Glense.Server.VideoLikes", b =>
-                {
-                    b.HasOne("Glense.Server.User", "user")
-                        .WithMany("VLikes")
-                        .HasForeignKey("userId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("Glense.Server.Video", "video")
-                        .WithMany("VLikes")
-                        .HasForeignKey("videoId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("user");
-
-                    b.Navigation("video");
-                });
-
-            modelBuilder.Entity("Glense.Server.Category", b =>
-                {
-                    b.Navigation("Videos");
-                });
-
-            modelBuilder.Entity("Glense.Server.Comment", b =>
-                {
-                    b.Navigation("CLikes");
-
-                    b.Navigation("ChildComments");
-                });
-
-            modelBuilder.Entity("Glense.Server.Conversation", b =>
-                {
-                    b.Navigation("Messages");
-                });
-
-            modelBuilder.Entity("Glense.Server.User", b =>
-                {
-                    b.Navigation("CLikes");
-
-                    b.Navigation("Comments");
-
-                    b.Navigation("ConversationsInvited");
-
-                    b.Navigation("ConversationsStarted");
-
-                    b.Navigation("Donations");
-
-                    b.Navigation("Subscribers");
-
-                    b.Navigation("Subscriptions");
-
-                    b.Navigation("VLikes");
-                });
-
-            modelBuilder.Entity("Glense.Server.Video", b =>
-                {
-                    b.Navigation("Comments");
-
-                    b.Navigation("VLikes");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/Glense.Server/Migrations/20241202224517_InitialCreate.cs b/Glense.Server/Migrations/20241202224517_InitialCreate.cs
deleted file mode 100644
index 59c6a81..0000000
--- a/Glense.Server/Migrations/20241202224517_InitialCreate.cs
+++ /dev/null
@@ -1,364 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace Glense.Server.Migrations
-{
-    /// <inheritdoc />
-    public partial class InitialCreate : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "Category",
-                columns: table => new
-                {
-                    categoryID = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    name = table.Column<string>(type: "nvarchar(max)", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Category", x => x.categoryID);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "Users",
-                columns: table => new
-                {
-                    userId = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    username = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    passwordSHA256 = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    email = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    profilePictureURL = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    account = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    createdAt = table.Column<DateTime>(type: "datetime2", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Users", x => x.userId);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "Conversations",
-                columns: table => new
-                {
-                    conversationId = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    user1Id = table.Column<int>(type: "int", nullable: false),
-                    user2Id = table.Column<int>(type: "int", nullable: false),
-                    createdAt = table.Column<DateTime>(type: "datetime2", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Conversations", x => x.conversationId);
-                    table.ForeignKey(
-                        name: "FK_Conversations_Users_user1Id",
-                        column: x => x.user1Id,
-                        principalTable: "Users",
-                        principalColumn: "userId",
-                        onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_Conversations_Users_user2Id",
-                        column: x => x.user2Id,
-                        principalTable: "Users",
-                        principalColumn: "userId",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "Donations",
-                columns: table => new
-                {
-                    donatorId = table.Column<int>(type: "int", nullable: false),
-                    recipientId = table.Column<int>(type: "int", nullable: false),
-                    donatedAt = table.Column<DateTime>(type: "datetime2", nullable: false),
-                    amount = table.Column<int>(type: "int", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Donations", x => new { x.donatorId, x.recipientId, x.donatedAt });
-                    table.ForeignKey(
-                        name: "FK_Donations_Users_recipientId",
-                        column: x => x.recipientId,
-                        principalTable: "Users",
-                        principalColumn: "userId",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "Subscriptions",
-                columns: table => new
-                {
-                    subscriberId = table.Column<int>(type: "int", nullable: false),
-                    subscribedToId = table.Column<int>(type: "int", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Subscriptions", x => new { x.subscriberId, x.subscribedToId });
-                    table.ForeignKey(
-                        name: "FK_Subscriptions_Users_subscribedToId",
-                        column: x => x.subscribedToId,
-                        principalTable: "Users",
-                        principalColumn: "userId",
-                        onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_Subscriptions_Users_subscriberId",
-                        column: x => x.subscriberId,
-                        principalTable: "Users",
-                        principalColumn: "userId",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "Videos",
-                columns: table => new
-                {
-                    videoID = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    uploaderuserId = table.Column<int>(type: "int", nullable: false),
-                    title = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    description = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    videoUrl = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    uploadedAt = table.Column<DateTime>(type: "datetime2", nullable: false),
-                    viewCount = table.Column<int>(type: "int", nullable: false),
-                    likeCount = table.Column<int>(type: "int", nullable: false),
-                    dislikeCount = table.Column<int>(type: "int", nullable: false),
-                    thumbnailUrl = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    categoryId = table.Column<int>(type: "int", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Videos", x => x.videoID);
-                    table.ForeignKey(
-                        name: "FK_Videos_Category_categoryId",
-                        column: x => x.categoryId,
-                        principalTable: "Category",
-                        principalColumn: "categoryID",
-                        onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_Videos_Users_uploaderuserId",
-                        column: x => x.uploaderuserId,
-                        principalTable: "Users",
-                        principalColumn: "userId",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "Messages",
-                columns: table => new
-                {
-                    messageId = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    conversationId = table.Column<int>(type: "int", nullable: false),
-                    senderuserId = table.Column<int>(type: "int", nullable: false),
-                    text = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    sentAt = table.Column<DateTime>(type: "datetime2", nullable: false),
-                    seen = table.Column<bool>(type: "bit", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Messages", x => x.messageId);
-                    table.ForeignKey(
-                        name: "FK_Messages_Conversations_conversationId",
-                        column: x => x.conversationId,
-                        principalTable: "Conversations",
-                        principalColumn: "conversationId",
-                        onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_Messages_Users_senderuserId",
-                        column: x => x.senderuserId,
-                        principalTable: "Users",
-                        principalColumn: "userId",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "Comments",
-                columns: table => new
-                {
-                    commentId = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    videoId = table.Column<int>(type: "int", nullable: false),
-                    userId = table.Column<int>(type: "int", nullable: false),
-                    commentText = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    createdAt = table.Column<DateTime>(type: "datetime2", nullable: false),
-                    parentCommentId = table.Column<int>(type: "int", nullable: false),
-                    commentLikes = table.Column<int>(type: "int", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Comments", x => x.commentId);
-                    table.ForeignKey(
-                        name: "FK_Comments_Comments_parentCommentId",
-                        column: x => x.parentCommentId,
-                        principalTable: "Comments",
-                        principalColumn: "commentId",
-                        onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_Comments_Users_userId",
-                        column: x => x.userId,
-                        principalTable: "Users",
-                        principalColumn: "userId",
-                        onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_Comments_Videos_videoId",
-                        column: x => x.videoId,
-                        principalTable: "Videos",
-                        principalColumn: "videoID",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "VideoLikes",
-                columns: table => new
-                {
-                    videoId = table.Column<int>(type: "int", nullable: false),
-                    userId = table.Column<int>(type: "int", nullable: false),
-                    isLiked = table.Column<bool>(type: "bit", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_VideoLikes", x => new { x.videoId, x.userId });
-                    table.ForeignKey(
-                        name: "FK_VideoLikes_Users_userId",
-                        column: x => x.userId,
-                        principalTable: "Users",
-                        principalColumn: "userId",
-                        onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_VideoLikes_Videos_videoId",
-                        column: x => x.videoId,
-                        principalTable: "Videos",
-                        principalColumn: "videoID",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "CommentLikes",
-                columns: table => new
-                {
-                    commentId = table.Column<int>(type: "int", nullable: false),
-                    userId = table.Column<int>(type: "int", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_CommentLikes", x => new { x.commentId, x.userId });
-                    table.ForeignKey(
-                        name: "FK_CommentLikes_Comments_commentId",
-                        column: x => x.commentId,
-                        principalTable: "Comments",
-                        principalColumn: "commentId",
-                        onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_CommentLikes_Users_userId",
-                        column: x => x.userId,
-                        principalTable: "Users",
-                        principalColumn: "userId",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_CommentLikes_userId",
-                table: "CommentLikes",
-                column: "userId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Comments_parentCommentId",
-                table: "Comments",
-                column: "parentCommentId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Comments_userId",
-                table: "Comments",
-                column: "userId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Comments_videoId",
-                table: "Comments",
-                column: "videoId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Conversations_user1Id",
-                table: "Conversations",
-                column: "user1Id");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Conversations_user2Id",
-                table: "Conversations",
-                column: "user2Id");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Donations_recipientId",
-                table: "Donations",
-                column: "recipientId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Messages_conversationId",
-                table: "Messages",
-                column: "conversationId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Messages_senderuserId",
-                table: "Messages",
-                column: "senderuserId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Subscriptions_subscribedToId",
-                table: "Subscriptions",
-                column: "subscribedToId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_VideoLikes_userId",
-                table: "VideoLikes",
-                column: "userId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Videos_categoryId",
-                table: "Videos",
-                column: "categoryId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Videos_uploaderuserId",
-                table: "Videos",
-                column: "uploaderuserId");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "CommentLikes");
-
-            migrationBuilder.DropTable(
-                name: "Donations");
-
-            migrationBuilder.DropTable(
-                name: "Messages");
-
-            migrationBuilder.DropTable(
-                name: "Subscriptions");
-
-            migrationBuilder.DropTable(
-                name: "VideoLikes");
-
-            migrationBuilder.DropTable(
-                name: "Comments");
-
-            migrationBuilder.DropTable(
-                name: "Conversations");
-
-            migrationBuilder.DropTable(
-                name: "Videos");
-
-            migrationBuilder.DropTable(
-                name: "Category");
-
-            migrationBuilder.DropTable(
-                name: "Users");
-        }
-    }
-}
diff --git a/Glense.Server/Migrations/ApplicationDbContextModelSnapshot.cs b/Glense.Server/Migrations/ApplicationDbContextModelSnapshot.cs
deleted file mode 100644
index 844363d..0000000
--- a/Glense.Server/Migrations/ApplicationDbContextModelSnapshot.cs
+++ /dev/null
@@ -1,492 +0,0 @@
-// <auto-generated />
-using System;
-using Glense.Server;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-
-#nullable disable
-
-namespace Glense.Server.Migrations
-{
-    [DbContext(typeof(ApplicationDbContext))]
-    partial class ApplicationDbContextModelSnapshot : ModelSnapshot
-    {
-        protected override void BuildModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "9.0.0")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128);
-
-            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
-
-            modelBuilder.Entity("Glense.Server.Category", b =>
-                {
-                    b.Property<int>("categoryID")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("categoryID"));
-
-                    b.Property<string>("name")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("categoryID");
-
-                    b.ToTable("Category");
-                });
-
-            modelBuilder.Entity("Glense.Server.Comment", b =>
-                {
-                    b.Property<int>("commentId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("commentId"));
-
-                    b.Property<int>("commentLikes")
-                        .HasColumnType("int");
-
-                    b.Property<string>("commentText")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<DateTime>("createdAt")
-                        .HasColumnType("datetime2");
-
-                    b.Property<int>("parentCommentId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("userId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("videoId")
-                        .HasColumnType("int");
-
-                    b.HasKey("commentId");
-
-                    b.HasIndex("parentCommentId");
-
-                    b.HasIndex("userId");
-
-                    b.HasIndex("videoId");
-
-                    b.ToTable("Comments");
-                });
-
-            modelBuilder.Entity("Glense.Server.CommentLikes", b =>
-                {
-                    b.Property<int>("commentId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("userId")
-                        .HasColumnType("int");
-
-                    b.HasKey("commentId", "userId");
-
-                    b.HasIndex("userId");
-
-                    b.ToTable("CommentLikes");
-                });
-
-            modelBuilder.Entity("Glense.Server.Conversation", b =>
-                {
-                    b.Property<int>("conversationId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("conversationId"));
-
-                    b.Property<DateTime>("createdAt")
-                        .HasColumnType("datetime2");
-
-                    b.Property<int>("user1Id")
-                        .HasColumnType("int");
-
-                    b.Property<int>("user2Id")
-                        .HasColumnType("int");
-
-                    b.HasKey("conversationId");
-
-                    b.HasIndex("user1Id");
-
-                    b.HasIndex("user2Id");
-
-                    b.ToTable("Conversations");
-                });
-
-            modelBuilder.Entity("Glense.Server.Donation", b =>
-                {
-                    b.Property<int>("donatorId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("recipientId")
-                        .HasColumnType("int");
-
-                    b.Property<DateTime>("donatedAt")
-                        .HasColumnType("datetime2");
-
-                    b.Property<int>("amount")
-                        .HasColumnType("int");
-
-                    b.HasKey("donatorId", "recipientId", "donatedAt");
-
-                    b.HasIndex("recipientId");
-
-                    b.ToTable("Donations");
-                });
-
-            modelBuilder.Entity("Glense.Server.Message", b =>
-                {
-                    b.Property<int>("messageId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("messageId"));
-
-                    b.Property<int>("conversationId")
-                        .HasColumnType("int");
-
-                    b.Property<bool>("seen")
-                        .HasColumnType("bit");
-
-                    b.Property<int>("senderuserId")
-                        .HasColumnType("int");
-
-                    b.Property<DateTime>("sentAt")
-                        .HasColumnType("datetime2");
-
-                    b.Property<string>("text")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("messageId");
-
-                    b.HasIndex("conversationId");
-
-                    b.HasIndex("senderuserId");
-
-                    b.ToTable("Messages");
-                });
-
-            modelBuilder.Entity("Glense.Server.Subscription", b =>
-                {
-                    b.Property<int>("subscriberId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("subscribedToId")
-                        .HasColumnType("int");
-
-                    b.HasKey("subscriberId", "subscribedToId");
-
-                    b.HasIndex("subscribedToId");
-
-                    b.ToTable("Subscriptions");
-                });
-
-            modelBuilder.Entity("Glense.Server.User", b =>
-                {
-                    b.Property<int>("userId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("userId"));
-
-                    b.Property<string>("account")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<DateTime>("createdAt")
-                        .HasColumnType("datetime2");
-
-                    b.Property<string>("email")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("passwordSHA256")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("profilePictureURL")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("username")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("userId");
-
-                    b.ToTable("Users");
-                });
-
-            modelBuilder.Entity("Glense.Server.Video", b =>
-                {
-                    b.Property<int>("videoID")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("videoID"));
-
-                    b.Property<int>("categoryId")
-                        .HasColumnType("int");
-
-                    b.Property<string>("description")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<int>("dislikeCount")
-                        .HasColumnType("int");
-
-                    b.Property<int>("likeCount")
-                        .HasColumnType("int");
-
-                    b.Property<string>("thumbnailUrl")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("title")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<DateTime>("uploadedAt")
-                        .HasColumnType("datetime2");
-
-                    b.Property<int>("uploaderuserId")
-                        .HasColumnType("int");
-
-                    b.Property<string>("videoUrl")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<int>("viewCount")
-                        .HasColumnType("int");
-
-                    b.HasKey("videoID");
-
-                    b.HasIndex("categoryId");
-
-                    b.HasIndex("uploaderuserId");
-
-                    b.ToTable("Videos");
-                });
-
-            modelBuilder.Entity("Glense.Server.VideoLikes", b =>
-                {
-                    b.Property<int>("videoId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("userId")
-                        .HasColumnType("int");
-
-                    b.Property<bool>("isLiked")
-                        .HasColumnType("bit");
-
-                    b.HasKey("videoId", "userId");
-
-                    b.HasIndex("userId");
-
-                    b.ToTable("VideoLikes");
-                });
-
-            modelBuilder.Entity("Glense.Server.Comment", b =>
-                {
-                    b.HasOne("Glense.Server.Comment", "parentComment")
-                        .WithMany("ChildComments")
-                        .HasForeignKey("parentCommentId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("Glense.Server.User", "user")
-                        .WithMany("Comments")
-                        .HasForeignKey("userId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("Glense.Server.Video", "video")
-                        .WithMany("Comments")
-                        .HasForeignKey("videoId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("parentComment");
-
-                    b.Navigation("user");
-
-                    b.Navigation("video");
-                });
-
-            modelBuilder.Entity("Glense.Server.CommentLikes", b =>
-                {
-                    b.HasOne("Glense.Server.Comment", "comment")
-                        .WithMany("CLikes")
-                        .HasForeignKey("commentId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("Glense.Server.User", "user")
-                        .WithMany("CLikes")
-                        .HasForeignKey("userId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("comment");
-
-                    b.Navigation("user");
-                });
-
-            modelBuilder.Entity("Glense.Server.Conversation", b =>
-                {
-                    b.HasOne("Glense.Server.User", "user1")
-                        .WithMany("ConversationsStarted")
-                        .HasForeignKey("user1Id")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("Glense.Server.User", "user2")
-                        .WithMany("ConversationsInvited")
-                        .HasForeignKey("user2Id")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("user1");
-
-                    b.Navigation("user2");
-                });
-
-            modelBuilder.Entity("Glense.Server.Donation", b =>
-                {
-                    b.HasOne("Glense.Server.User", "recipient")
-                        .WithMany("Donations")
-                        .HasForeignKey("recipientId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("recipient");
-                });
-
-            modelBuilder.Entity("Glense.Server.Message", b =>
-                {
-                    b.HasOne("Glense.Server.Conversation", "conversation")
-                        .WithMany("Messages")
-                        .HasForeignKey("conversationId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("Glense.Server.User", "sender")
-                        .WithMany()
-                        .HasForeignKey("senderuserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("conversation");
-
-                    b.Navigation("sender");
-                });
-
-            modelBuilder.Entity("Glense.Server.Subscription", b =>
-                {
-                    b.HasOne("Glense.Server.User", "subscribedTo")
-                        .WithMany("Subscriptions")
-                        .HasForeignKey("subscribedToId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("Glense.Server.User", "subscriber")
-                        .WithMany("Subscribers")
-                        .HasForeignKey("subscriberId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("subscribedTo");
-
-                    b.Navigation("subscriber");
-                });
-
-            modelBuilder.Entity("Glense.Server.Video", b =>
-                {
-                    b.HasOne("Glense.Server.Category", "category")
-                        .WithMany("Videos")
-                        .HasForeignKey("categoryId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("Glense.Server.User", "uploader")
-                        .WithMany()
-                        .HasForeignKey("uploaderuserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("category");
-
-                    b.Navigation("uploader");
-                });
-
-            modelBuilder.Entity("Glense.Server.VideoLikes", b =>
-                {
-                    b.HasOne("Glense.Server.User", "user")
-                        .WithMany("VLikes")
-                        .HasForeignKey("userId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("Glense.Server.Video", "video")
-                        .WithMany("VLikes")
-                        .HasForeignKey("videoId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("user");
-
-                    b.Navigation("video");
-                });
-
-            modelBuilder.Entity("Glense.Server.Category", b =>
-                {
-                    b.Navigation("Videos");
-                });
-
-            modelBuilder.Entity("Glense.Server.Comment", b =>
-                {
-                    b.Navigation("CLikes");
-
-                    b.Navigation("ChildComments");
-                });
-
-            modelBuilder.Entity("Glense.Server.Conversation", b =>
-                {
-                    b.Navigation("Messages");
-                });
-
-            modelBuilder.Entity("Glense.Server.User", b =>
-                {
-                    b.Navigation("CLikes");
-
-                    b.Navigation("Comments");
-
-                    b.Navigation("ConversationsInvited");
-
-                    b.Navigation("ConversationsStarted");
-
-                    b.Navigation("Donations");
-
-                    b.Navigation("Subscribers");
-
-                    b.Navigation("Subscriptions");
-
-                    b.Navigation("VLikes");
-                });
-
-            modelBuilder.Entity("Glense.Server.Video", b =>
-                {
-                    b.Navigation("Comments");
-
-                    b.Navigation("VLikes");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/Glense.Server/Program.cs b/Glense.Server/Program.cs
index 845e6bf..79d0e76 100644
--- a/Glense.Server/Program.cs
+++ b/Glense.Server/Program.cs
@@ -1,88 +1,43 @@
-using DotNetEnv;
-
-// Load environment variables from .env file (for local development)
-Env.Load();
-
 var builder = WebApplication.CreateBuilder(args);
 
-// Register MVC controllers and API documentation services
-builder.Services.AddControllers();
-builder.Services.AddEndpointsApiExplorer();
-builder.Services.AddSwaggerGen();
+// Allow large file uploads (videos) through the gateway
+builder.WebHost.ConfigureKestrel(options =>
+{
+    options.Limits.MaxRequestBodySize = 500 * 1024 * 1024; // 500 MB
+});
+
+// Add YARP reverse proxy from configuration
+builder.Services.AddReverseProxy()
+    .LoadFromConfig(builder.Configuration.GetSection("ReverseProxy"));
 
 // Configure CORS for frontend
+var allowedOrigins = builder.Configuration.GetSection("Cors:AllowedOrigins").Get<string[]>()
+    ?? ["http://localhost:5173", "http://localhost:50653", "http://localhost:50654", "http://localhost:3000"];
+
 builder.Services.AddCors(options =>
 {
     options.AddPolicy("AllowFrontend", policy =>
     {
-        policy.WithOrigins(
-                "http://localhost:5173",   // Vite dev server
-                "http://localhost:50653",  // Vite dev server (alt port)
-                "http://localhost:50654",  // Vite dev server (alt port)
-                "http://localhost:3000"    // Production/Docker
-            )
+        policy.WithOrigins(allowedOrigins)
             .AllowAnyMethod()
             .AllowAnyHeader()
             .AllowCredentials();
     });
 });
 
-// HTTP clients for communicating with microservices
-// Account Service
-builder.Services.AddHttpClient("AccountService", client =>
-{
-    var serviceUrl = Environment.GetEnvironmentVariable("ACCOUNT_SERVICE_URL")
-        ?? "http://localhost:5001";
-    client.BaseAddress = new Uri(serviceUrl);
-});
-
-// Donation Service
-builder.Services.AddHttpClient("DonationService", client =>
-{
-    var serviceUrl = Environment.GetEnvironmentVariable("DONATION_SERVICE_URL")
-        ?? "http://localhost:5100";
-    client.BaseAddress = new Uri(serviceUrl);
-});
-
-// Video Catalogue Service
-builder.Services.AddHttpClient("VideoService", client =>
-{
-    var serviceUrl = Environment.GetEnvironmentVariable("VIDEO_SERVICE_URL")
-        ?? "http://localhost:5002";
-    client.BaseAddress = new Uri(serviceUrl);
-});
-
-// Chat Service
-builder.Services.AddHttpClient("ChatService", client =>
-{
-    var serviceUrl = Environment.GetEnvironmentVariable("CHAT_SERVICE_URL")
-        ?? "http://localhost:5004";
-    client.BaseAddress = new Uri(serviceUrl);
-});
-
 var app = builder.Build();
 
-// Serve static files from wwwroot (for SPA frontend)
-app.UseDefaultFiles();
-app.UseStaticFiles();
-
-// Enable Swagger in development for API testing
-if (app.Environment.IsDevelopment())
-{
-    app.UseSwagger();
-    app.UseSwaggerUI();
-}
-
 app.UseCors("AllowFrontend");
 
-app.UseHttpsRedirection();
-app.UseAuthorization();
-app.MapControllers();
-
 // Health check endpoint
-app.MapGet("/health", () => Results.Ok(new { status = "healthy", service = "gateway", timestamp = DateTime.UtcNow }));
+app.MapGet("/health", () => Results.Ok(new
+{
+    status = "healthy",
+    service = "gateway",
+    timestamp = DateTime.UtcNow
+}));
 
-// SPA fallback - serves index.html for client-side routing
-app.MapFallbackToFile("/index.html");
+// Map YARP reverse proxy routes
+app.MapReverseProxy();
 
 app.Run();
diff --git a/Glense.Server/Properties/launchSettings.json b/Glense.Server/Properties/launchSettings.json
index 46a002e..db35273 100644
--- a/Glense.Server/Properties/launchSettings.json
+++ b/Glense.Server/Properties/launchSettings.json
@@ -1,45 +1,13 @@
 {
   "$schema": "http://json.schemastore.org/launchsettings.json",
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:11507",
-      "sslPort": 44302
-    }
-  },
   "profiles": {
     "http": {
       "commandName": "Project",
       "dotnetRunMessages": true,
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "applicationUrl": "http://localhost:5141",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development",
-        "ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.SpaProxy"
-      }
-    },
-    "https": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "applicationUrl": "https://localhost:7252;http://localhost:5141",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development",
-        "ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.SpaProxy"
-      }
-    },
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "launchUrl": "swagger",
+      "applicationUrl": "http://localhost:5050",
       "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development",
-        "ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.SpaProxy"
+        "ASPNETCORE_ENVIRONMENT": "Development"
       }
     }
   }
 }
-
diff --git a/Glense.Server/WeatherForecast.cs b/Glense.Server/WeatherForecast.cs
deleted file mode 100644
index 0d61d6f..0000000
--- a/Glense.Server/WeatherForecast.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace Glense.Server
-{
-    public class WeatherForecast
-    {
-        public DateOnly Date { get; set; }
-
-        public int TemperatureC { get; set; }
-
-        public int TemperatureF => 32 + (int)(TemperatureC / 0.5556);
-
-        public string? Summary { get; set; }
-    }
-}
diff --git a/Glense.Server/appsettings.Docker.json b/Glense.Server/appsettings.Docker.json
new file mode 100644
index 0000000..c10a257
--- /dev/null
+++ b/Glense.Server/appsettings.Docker.json
@@ -0,0 +1,34 @@
+{
+  "ReverseProxy": {
+    "Clusters": {
+      "account-cluster": {
+        "Destinations": {
+          "account-service": {
+            "Address": "http://account_service:5000"
+          }
+        }
+      },
+      "video-cluster": {
+        "Destinations": {
+          "video-service": {
+            "Address": "http://video_service:5002"
+          }
+        }
+      },
+      "donation-cluster": {
+        "Destinations": {
+          "donation-service": {
+            "Address": "http://donation_service:5100"
+          }
+        }
+      },
+      "chat-cluster": {
+        "Destinations": {
+          "chat-service": {
+            "Address": "http://chat_service:5000"
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/Glense.Server/appsettings.json b/Glense.Server/appsettings.json
index 602eff0..60f936d 100644
--- a/Glense.Server/appsettings.json
+++ b/Glense.Server/appsettings.json
@@ -1,10 +1,174 @@
 {
-    "Logging": {
-        "LogLevel": {
-            "Default": "Information",
-            "Microsoft.AspNetCore": "Warning"
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning",
+      "Yarp": "Information"
+    }
+  },
+  "AllowedHosts": "*",
+  "Cors": {
+    "AllowedOrigins": [
+      "http://localhost:5173",
+      "http://localhost:50653",
+      "http://localhost:50654",
+      "http://localhost:3000"
+    ]
+  },
+  "ReverseProxy": {
+    "Routes": {
+      "auth-route": {
+        "ClusterId": "account-cluster",
+        "Match": {
+          "Path": "/api/auth/{**catch-all}"
         }
+      },
+      "profile-route": {
+        "ClusterId": "account-cluster",
+        "Match": {
+          "Path": "/api/profile/{**catch-all}"
+        }
+      },
+      "notification-route": {
+        "ClusterId": "account-cluster",
+        "Match": {
+          "Path": "/api/notification/{**catch-all}"
+        }
+      },
+      "videos-route": {
+        "ClusterId": "video-cluster",
+        "Match": {
+          "Path": "/api/videos/{**catch-all}"
+        }
+      },
+      "subscriptions-route": {
+        "ClusterId": "video-cluster",
+        "Match": {
+          "Path": "/api/subscriptions/{**catch-all}"
+        }
+      },
+      "videolikes-route": {
+        "ClusterId": "video-cluster",
+        "Match": {
+          "Path": "/api/videolikes/{**catch-all}"
+        }
+      },
+      "playlists-route": {
+        "ClusterId": "video-cluster",
+        "Match": {
+          "Path": "/api/playlists/{**catch-all}"
+        }
+      },
+      "playlistvideos-route": {
+        "ClusterId": "video-cluster",
+        "Match": {
+          "Path": "/api/playlistvideos/{**catch-all}"
+        }
+      },
+      "donation-route": {
+        "ClusterId": "donation-cluster",
+        "Match": {
+          "Path": "/api/donation/{**catch-all}"
+        }
+      },
+      "wallet-route": {
+        "ClusterId": "donation-cluster",
+        "Match": {
+          "Path": "/api/wallet/{**catch-all}"
+        }
+      },
+      "chats-route": {
+        "ClusterId": "chat-cluster",
+        "Match": {
+          "Path": "/api/chats/{**catch-all}"
+        }
+      },
+      "messages-route": {
+        "ClusterId": "chat-cluster",
+        "Match": {
+          "Path": "/api/messages/{**catch-all}"
+        }
+      },
+      "signalr-route": {
+        "ClusterId": "chat-cluster",
+        "Match": {
+          "Path": "/hubs/chat/{**catch-all}"
+        }
+      }
     },
-    "AllowedHosts": "*"
-
+    "Clusters": {
+      "account-cluster": {
+        "Destinations": {
+          "account-service": {
+            "Address": "http://localhost:5001"
+          }
+        },
+        "HealthCheck": {
+          "Active": {
+            "Enabled": true,
+            "Interval": "00:00:10",
+            "Timeout": "00:00:05",
+            "Path": "/health"
+          }
+        },
+        "HttpRequest": {
+          "ActivityTimeout": "00:00:30"
+        }
+      },
+      "video-cluster": {
+        "Destinations": {
+          "video-service": {
+            "Address": "http://localhost:5002"
+          }
+        },
+        "HealthCheck": {
+          "Active": {
+            "Enabled": true,
+            "Interval": "00:00:10",
+            "Timeout": "00:00:05",
+            "Path": "/health"
+          }
+        },
+        "HttpRequest": {
+          "ActivityTimeout": "00:05:00"
+        }
+      },
+      "donation-cluster": {
+        "Destinations": {
+          "donation-service": {
+            "Address": "http://localhost:5100"
+          }
+        },
+        "HealthCheck": {
+          "Active": {
+            "Enabled": true,
+            "Interval": "00:00:10",
+            "Timeout": "00:00:05",
+            "Path": "/health"
+          }
+        },
+        "HttpRequest": {
+          "ActivityTimeout": "00:00:30"
+        }
+      },
+      "chat-cluster": {
+        "Destinations": {
+          "chat-service": {
+            "Address": "http://localhost:5004"
+          }
+        },
+        "HealthCheck": {
+          "Active": {
+            "Enabled": true,
+            "Interval": "00:00:10",
+            "Timeout": "00:00:05",
+            "Path": "/health"
+          }
+        },
+        "HttpRequest": {
+          "ActivityTimeout": "00:00:30"
+        }
+      }
+    }
+  }
 }
diff --git a/Glense.Server/entities/Category.cs b/Glense.Server/entities/Category.cs
deleted file mode 100644
index 052f943..0000000
--- a/Glense.Server/entities/Category.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace Glense.Server
-{
-    public class Category
-    {
-        public int categoryID { get; set; }
-        public string name { get; set; } = string.Empty;
-        public ICollection<Video> Videos { get; set; } = new List<Video>();
-    }
-}
diff --git a/Glense.Server/entities/Comment.cs b/Glense.Server/entities/Comment.cs
deleted file mode 100644
index e102b5f..0000000
--- a/Glense.Server/entities/Comment.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-namespace Glense.Server
-{
-    public class Comment
-    {
-        public int commentId { get; set; }
-        public Video video { get; set; } = null!;
-        public int videoId { get; set; }
-        public User user { get; set; } = null!;
-        public int userId { get; set; }
-        public string commentText { get; set; } = string.Empty;
-        public DateTime createdAt { get; set; }
-        public Comment? parentComment { get; set; }
-        public int? parentCommentId { get; set; }
-        public int commentLikes { get; set; }
-        public ICollection<Comment> ChildComments { get; set; } = new List<Comment>();
-        public ICollection<CommentLikes> CLikes { get; set; } = new List<CommentLikes>();
-    }
-}
diff --git a/Glense.Server/entities/CommentLikes.cs b/Glense.Server/entities/CommentLikes.cs
deleted file mode 100644
index fd209f4..0000000
--- a/Glense.Server/entities/CommentLikes.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace Glense.Server
-{
-    public class CommentLikes
-    {
-        public Comment comment { get; set; } = null!;
-        public int commentId { get; set; }
-        public User user { get; set; } = null!;
-        public int userId { get; set; }
-        public bool isLiked { get; set; }
-    }
-}
diff --git a/Glense.Server/entities/Conversation.cs b/Glense.Server/entities/Conversation.cs
deleted file mode 100644
index b126545..0000000
--- a/Glense.Server/entities/Conversation.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace Glense.Server
-{
-    public class Conversation
-    {
-        public int conversationId { get; set; }
-        public User user1 { get; set; } = null!;
-        public int user1Id { get; set; }
-        public User user2 { get; set; } = null!;
-        public int user2Id { get; set; }
-        public DateTime createdAt { get; set; }
-        public ICollection<Message> Messages { get; set; } = new List<Message>();
-    }
-}
diff --git a/Glense.Server/entities/Donation.cs b/Glense.Server/entities/Donation.cs
deleted file mode 100644
index 5968565..0000000
--- a/Glense.Server/entities/Donation.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace Glense.Server
-{
-    public class Donation
-    {
-        public int donatorId { get; set; }
-        public User recipient { get; set; } = null!;
-        public int recipientId { get; set; }
-        public int amount { get; set; }
-        public DateTime donatedAt { get; set; }
-    }
-}
diff --git a/Glense.Server/entities/Message.cs b/Glense.Server/entities/Message.cs
deleted file mode 100644
index c63b2a5..0000000
--- a/Glense.Server/entities/Message.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace Glense.Server
-{
-    public class Message
-    {
-        public int messageId { get; set; }
-        public Conversation conversation { get; set; } = null!;
-        public int conversationId { get; set; }
-        public User sender { get; set; } = null!;
-        public string text { get; set; } = string.Empty;
-        public DateTime sentAt { get; set; }
-        public bool seen { get; set; }
-    }
-}
diff --git a/Glense.Server/entities/Subscription.cs b/Glense.Server/entities/Subscription.cs
deleted file mode 100644
index 4d1cab6..0000000
--- a/Glense.Server/entities/Subscription.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace Glense.Server
-{
-    public class Subscription
-    {
-        public User subscriber { get; set; } = null!;
-        public int subscriberId { get; set; }
-        public User subscribedTo { get; set; } = null!;
-        public int subscribedToId { get; set; }
-    }
-}
diff --git a/Glense.Server/entities/User.cs b/Glense.Server/entities/User.cs
deleted file mode 100644
index 88c1013..0000000
--- a/Glense.Server/entities/User.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-namespace Glense.Server
-{
-    public class User
-    {
-        public int userId { get; set; }
-        public string username { get; set; } = string.Empty;
-        public string passwordSHA256 { get; set; } = string.Empty;
-        public string email { get; set; } = string.Empty;
-        public string? profilePictureURL { get; set; }
-        public string account { get; set; } = string.Empty;
-        public DateTime createdAt { get; set; }
-        public ICollection<Subscription> Subscriptions { get; set; } = new List<Subscription>();
-        public ICollection<Subscription> Subscribers { get; set; } = new List<Subscription>();
-        public ICollection<Donation> Donations { get; set; } = new List<Donation>();
-        public ICollection<Conversation> ConversationsStarted { get; set; } = new List<Conversation>();
-        public ICollection<Conversation> ConversationsInvited { get; set; } = new List<Conversation>();
-        public ICollection<Comment> Comments { get; set; } = new List<Comment>();
-        public ICollection<CommentLikes> CLikes { get; set; } = new List<CommentLikes>();
-        public ICollection<VideoLikes> VLikes { get; set; } = new List<VideoLikes>();
-    }
-}
diff --git a/Glense.Server/entities/Video.cs b/Glense.Server/entities/Video.cs
deleted file mode 100644
index af5fb5e..0000000
--- a/Glense.Server/entities/Video.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System.ComponentModel;
-using System.Runtime.CompilerServices;
-
-namespace Glense.Server
-{
-    public class Video
-    {
-        public int videoID { get; set; }
-        public User uploader { get; set; } = null!;
-        public string title { get; set; } = string.Empty;
-        public string description { get; set; } = string.Empty;
-        public string videoUrl { get; set; } = string.Empty;
-        public DateTime uploadedAt { get; set; }
-        public int viewCount { get; set; }
-        public int likeCount { get; set; }
-        public int dislikeCount { get; set; }
-        public string? thumbnailUrl { get; set; }
-        public Category category { get; set; } = null!;
-        public int categoryId { get; set; }
-        public ICollection<Comment> Comments { get; set; } = new List<Comment>();
-        public ICollection<VideoLikes> VLikes { get; set; } = new List<VideoLikes>();
-    }
-}
diff --git a/Glense.Server/entities/VideoLikes.cs b/Glense.Server/entities/VideoLikes.cs
deleted file mode 100644
index 6e8db40..0000000
--- a/Glense.Server/entities/VideoLikes.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace Glense.Server
-{
-    public class VideoLikes
-    {
-        public Video video { get; set; } = null!;
-        public int videoId { get; set; }
-        public User user { get; set; } = null!;
-        public int userId { get; set; }
-        public bool isLiked { get; set; }
-    }
-}
diff --git a/README.md b/README.md
index 4c65dc7..6b3de9e 100644
--- a/README.md
+++ b/README.md
@@ -4,92 +4,120 @@ A microservice-based video streaming platform built with .NET 8, React, and Post
 
 ## Architecture
 
-All frontend requests go through the **API Gateway** (port 5050), which proxies to the appropriate microservice. Services communicate with each other via HTTP.
+All frontend requests go through the **API Gateway** ([YARP](https://microsoft.github.io/reverse-proxy/) reverse proxy, port 5050), which routes to the appropriate microservice based on URL path. Services communicate with each other via HTTP.
 
 ```
-                          ┌─────────────────┐
-                          │    Frontend      │
-                          │   (React/Vite)   │
-                          └────────┬─────────┘
-                                   │
-                          ┌────────▼─────────┐
-                          │   API Gateway     │
-                          │     :5050         │
-                          └──┬──┬──┬──┬──────┘
-                  ┌──────────┘  │  │  └──────────┐
-                  ▼             ▼  ▼             ▼
-          ┌──────────────┐ ┌────────────┐ ┌──────────────┐
-          │   Account    │ │  Donation  │ │    Video     │
-          │   :5001      │ │   :5100    │ │  Catalogue   │
-          │              │ │            │ │    :5002     │
-          │ Auth/Profile │ │  Wallets   │ │   Upload     │
-          │ Notification │ │  Donations │ │  Comments    │
-          └──────┬───────┘ └─────┬──────┘ │  Playlists   │
-                 │    ▲          │   ▲    └──────┬───────┘
-                 │    └──────────┘   │           │
-                 │    wallet create  │           │
-                 │    on register    │           │
-                 │                   │           │
-                 │    validate user  │           │
-                 │    + notify       │           │
-                 │                   │           │
-                 │◄──────────────────┘           │
-                 │                               │
-                 │   resolve uploader username   │
-                 │◄──────────────────────────────┘
-                 │
-          ┌──────▼───────┐
-          │    Chat      │
-          │    :5004     │
-          │              │
-          │  Rooms       │
-          │  Messages    │
-          │  SignalR     │
-          └──────────────┘
+                      ┌─────────────────┐
+                      │    Frontend      │
+                      │   (React/Vite)   │
+                      └────────┬─────────┘
+                               │
+                    ┌──────────▼──────────┐
+                    │   API Gateway       │
+                    │   YARP :5050        │
+                    │                     │
+                    │ /api/auth/*     ──→ account   │
+                    │ /api/profile/*  ──→ account   │
+                    │ /api/videos/*   ──→ video     │
+                    │ /api/donation/* ──→ donation  │
+                    │ /api/chats/*    ──→ chat      │
+                    │ /hubs/chat      ──→ chat (WS) │
+                    └──┬──┬──┬──┬────────┘
+         ┌────────────┘  │  │  └────────────┐
+         ▼               ▼  ▼               ▼
+  ┌────────────┐  ┌──────────┐  ┌────────────┐
+  │  Account   │  │ Donation │  │   Video    │
+  │   :5001    │  │  :5100   │  │ Catalogue  │
+  │            │  │          │  │   :5002    │
+  │ Auth       │  │ Wallets  │  │ Upload     │
+  │ Profiles   │  │ Donations│  │ Comments   │
+  │ Notifs     │  │          │  │ Playlists  │
+  └──────┬─────┘  └────┬─────┘  └─────┬─────┘
+         │    ▲         │   ▲          │
+         │    └─────────┘   │          │
+         │  wallet create   │          │
+         │  on register     │          │
+         │                  │          │
+         │  validate user   │          │
+         │  + notify        │          │
+         │◄─────────────────┘          │
+         │                             │
+         │  resolve uploader username  │
+         │◄────────────────────────────┘
+         │
+  ┌──────▼─────┐
+  │   Chat     │
+  │   :5004    │
+  │            │
+  │ Rooms      │
+  │ Messages   │
+  │ SignalR    │
+  └────────────┘
 ```
 
-### Inter-service communication
-
-| Flow | Direction | Description |
-|------|-----------|-------------|
-| User registration | Account → Donation | Auto-creates a wallet for the new user |
-| Donation | Donation → Account | Validates recipient exists, sends notification after success |
-| Video listing | Video → Account | Resolves uploader usernames for video responses |
-| Chat messages | JWT → Chat | Username extracted from JWT token, stored with message |
-
-Secondary operations (wallet creation, notifications) are non-blocking — if a downstream service is unavailable, the primary operation still succeeds.
+The gateway is config-driven — adding a new route is a few lines of JSON in `appsettings.json`, not a new controller. YARP handles header forwarding, WebSocket proxying (SignalR), and active health checks automatically.
 
 ### Services and ports
 
 | Service | Port | Database | Description |
 |---------|------|----------|-------------|
-| API Gateway | 5050 | — | Proxies all frontend requests |
+| API Gateway (YARP) | 5050 | — | Routes all frontend requests, health checks backends |
 | Account | 5001 | PostgreSQL :5432 | Auth, profiles, notifications |
 | Donation | 5100 | PostgreSQL :5434 | Wallets and donations |
 | Video Catalogue | 5002 | PostgreSQL :5433 | Video upload, comments, playlists |
 | Chat | 5004 | PostgreSQL :5435 | Chat rooms, messages, SignalR |
 
+### Inter-service communication
+
+| Flow | Direction | Description |
+|------|-----------|-------------|
+| User registration | Account -> Donation | Auto-creates a wallet for the new user |
+| Donation | Donation -> Account | Validates recipient exists, sends notification |
+| Video listing | Video -> Account | Resolves uploader usernames |
+| Chat messages | JWT -> Chat | Username extracted from JWT token |
+
+Secondary operations (wallet creation, notifications) are non-blocking.
+
 ## Quick start
 
-See [DEV_QUICKSTART.md](DEV_QUICKSTART.md) for full setup instructions.
+```bash
+# Start everything (containers + seed data)
+./dev.sh
+
+# Start the frontend (separate terminal)
+cd glense.client && npm install && npm run dev
+```
+
+Other commands:
 
 ```bash
-# Start all services
-docker compose up --build -d
+./dev.sh down      # Stop everything
+./dev.sh restart   # Full clean restart + seed
+./dev.sh logs      # Follow all container logs
+./dev.sh logs gateway  # Follow a single service
+./dev.sh seed      # Re-seed test data
+./dev.sh prune     # Nuclear option: stop + wipe all images/cache
+```
 
-# Start the gateway
-cd Glense.Server && dotnet run --urls http://localhost:5050
+The seed script creates 3 users (password: `Password123!`), wallets, donations, 8 videos with comments.
 
-# Start the frontend
-cd glense.client && npm install && npm run dev
+### Manual setup
 
-# Seed test data (users, videos, donations, comments)
+If you prefer to start services individually:
+
+```bash
+# Start databases, then services, then gateway
+docker compose up --build -d postgres_account postgres_video postgres_donation postgres_chat
+docker compose up --build -d account_service video_service donation_service chat_service gateway
+
+# Seed test data
 ./scripts/seed.sh
 ```
 
+Works with both Docker and Podman.
+
 ## Prerequisites
 
-- .NET 8 SDK
 - Node.js v22
 - Docker or Podman
 
@@ -112,5 +140,3 @@ Each microservice owns its own database. See individual service READMEs for sche
 # Setup pre-commit hook for C# formatting (one-time)
 ./scripts/setup-hooks.sh
 ```
-
-The pre-commit hook auto-formats C# code. If files are modified by formatting, stage them and commit again.
diff --git a/dev.sh b/dev.sh
new file mode 100755
index 0000000..8606932
--- /dev/null
+++ b/dev.sh
@@ -0,0 +1,143 @@
+#!/usr/bin/env bash
+# Glense Development Environment (Container-based)
+# Usage:
+#   ./dev.sh          Start everything + seed data
+#   ./dev.sh up       Start everything + seed data
+#   ./dev.sh down     Stop everything
+#   ./dev.sh restart  Full restart + seed data
+#   ./dev.sh logs     Follow all container logs
+#   ./dev.sh seed     Seed test data only
+
+set -e
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+cd "$SCRIPT_DIR"
+
+# Auto-detect container runtime
+if command -v podman-compose &> /dev/null; then
+    COMPOSE="podman-compose"
+    RUNTIME="podman"
+elif command -v podman &> /dev/null && podman compose version &> /dev/null; then
+    COMPOSE="podman compose"
+    RUNTIME="podman"
+elif command -v docker &> /dev/null; then
+    COMPOSE="docker compose"
+    RUNTIME="docker"
+else
+    echo "ERROR: No container runtime found (podman or docker)"
+    exit 1
+fi
+
+echo "Using: $COMPOSE"
+
+GATEWAY_URL="http://localhost:5050"
+SERVICES="postgres_account postgres_video postgres_donation postgres_chat account_service video_service donation_service chat_service gateway"
+
+kill_stale_dotnet() {
+    echo "Checking for stale dotnet processes on service ports..."
+    local killed=0
+    for port in 5050 5001 5002 5100 5004; do
+        local pids
+        pids=$(lsof -ti :$port 2>/dev/null || true)
+        if [ -n "$pids" ]; then
+            for pid in $pids; do
+                local pname
+                pname=$(ps -p "$pid" -o comm= 2>/dev/null || true)
+                # Only kill dotnet/Glense processes, not container runtime
+                if echo "$pname" | grep -qiE "dotnet|glense"; then
+                    kill "$pid" 2>/dev/null && echo "  Killed stale process $pname (PID $pid) on port $port" && killed=1
+                fi
+            done
+        fi
+    done
+    [ $killed -eq 0 ] && echo "  None found"
+}
+
+wait_for_health() {
+    local url=$1 name=$2 max=60 attempt=0
+    printf "  Waiting for %-20s" "$name..."
+    while ! curl -sf "$url" > /dev/null 2>&1; do
+        if [ $attempt -ge $max ]; then
+            echo " FAILED (timeout after ${max}s)"
+            echo "  Check logs: $RUNTIME logs glense_${name// /_}"
+            return 1
+        fi
+        sleep 1
+        attempt=$((attempt + 1))
+    done
+    echo " OK (${attempt}s)"
+}
+
+do_up() {
+    kill_stale_dotnet
+    echo ""
+    echo "Starting containers..."
+    $COMPOSE up --build -d $SERVICES 2>&1 | tail -5
+
+    echo ""
+    echo "Waiting for services to be healthy..."
+    wait_for_health "$GATEWAY_URL/health" "gateway"
+    wait_for_health "http://localhost:5001/health" "account_service"
+    wait_for_health "http://localhost:5002/health" "video_service"
+    wait_for_health "http://localhost:5100/health" "donation_service"
+    wait_for_health "http://localhost:5004/health" "chat_service"
+
+    echo ""
+    do_seed
+
+    echo ""
+    echo "Ready!"
+    echo "  Gateway:  $GATEWAY_URL"
+    echo "  Frontend: cd glense.client && npm run dev"
+    echo ""
+    echo "  Logs:     ./dev.sh logs"
+    echo "  Stop:     ./dev.sh down"
+}
+
+do_down() {
+    kill_stale_dotnet
+    echo ""
+    echo "Stopping containers..."
+    $COMPOSE down 2>&1 | tail -5
+    echo "Done"
+}
+
+do_seed() {
+    echo "Seeding test data..."
+    bash "$SCRIPT_DIR/scripts/seed.sh" "$GATEWAY_URL"
+}
+
+do_logs() {
+    local target=${1:-}
+    if [ -n "$target" ]; then
+        $RUNTIME logs -f "glense_$target"
+    else
+        # podman-compose doesn't support multi-container logs remotely
+        echo "Tailing all service logs (Ctrl+C to stop)..."
+        local pids=()
+        for c in gateway account_service video_service donation_service chat_service; do
+            $RUNTIME logs -f "glense_$c" 2>&1 | sed "s/^/[$c] /" &
+            pids+=($!)
+        done
+        trap "kill ${pids[*]} 2>/dev/null; exit" INT TERM
+        wait
+    fi
+}
+
+do_prune() {
+    do_down
+    echo ""
+    echo "Pruning all container images and build cache..."
+    $RUNTIME system prune -a -f
+    echo "Done"
+}
+
+case "${1:-up}" in
+    up)       do_up ;;
+    down)     do_down ;;
+    restart)  do_down; echo ""; do_up ;;
+    logs)     do_logs "$2" ;;
+    seed)     do_seed ;;
+    prune)    do_prune ;;
+    *)        echo "Usage: ./dev.sh [up|down|restart|logs|seed|prune]" ;;
+esac
diff --git a/docker-compose.yml b/docker-compose.yml
index 8ba496b..0e59c33 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   # PostgreSQL for Account Service
   postgres_account:
@@ -144,6 +142,26 @@ services:
       - glense_network
     restart: unless-stopped
 
+  # API Gateway (YARP reverse proxy)
+  gateway:
+    build:
+      context: ./Glense.Server
+      dockerfile: Dockerfile
+    container_name: glense_gateway
+    environment:
+      - ASPNETCORE_ENVIRONMENT=Docker
+      - ASPNETCORE_URLS=http://+:5050
+    ports:
+      - "5050:5050"
+    depends_on:
+      - account_service
+      - video_service
+      - donation_service
+      - chat_service
+    networks:
+      - glense_network
+    restart: unless-stopped
+
   # Frontend (existing React app)
   frontend:
     build:
@@ -153,14 +171,11 @@ services:
     ports:
       - "3000:3000"
     environment:
-      - VITE_ACCOUNT_API_URL=http://localhost:5001
-      - VITE_VIDEO_API_URL=http://localhost:5002
-      - VITE_DONATION_API_URL=http://localhost:5003
-      - VITE_CHAT_API_URL=http://localhost:5004
+      - VITE_API_URL=http://localhost:5050
     networks:
       - glense_network
     depends_on:
-      - account_service
+      - gateway
 
   # Chat Service
   chat_service:
diff --git a/glense.client/src/components/Upload.jsx b/glense.client/src/components/Upload.jsx
index b299880..8055dbd 100644
--- a/glense.client/src/components/Upload.jsx
+++ b/glense.client/src/components/Upload.jsx
@@ -1,6 +1,8 @@
 /* eslint-disable react/prop-types */
-import { useState } from "react";
-import { Box, TextField, Button, Typography } from "@mui/material";
+import { useState, useRef } from "react";
+import { Box, TextField, Button, Typography, Stack } from "@mui/material";
+import CloudUploadIcon from '@mui/icons-material/CloudUpload';
+import ImageIcon from '@mui/icons-material/Image';
 import { useNavigate } from "react-router-dom";
 import { useAuth } from "../context/AuthContext";
 import { uploadVideo } from "../utils/videoApi";
@@ -10,29 +12,54 @@ import "../css/Upload.css";
 function Upload() {
   const { user } = useAuth();
   const navigate = useNavigate();
+  const videoRef = useRef(null);
+  const thumbRef = useRef(null);
 
   const [file, setFile] = useState(null);
+  const [thumbnail, setThumbnail] = useState(null);
+  const [thumbPreview, setThumbPreview] = useState(null);
   const [title, setTitle] = useState("");
   const [description, setDescription] = useState("");
   const [loading, setLoading] = useState(false);
   const [message, setMessage] = useState("");
+  const [messageType, setMessageType] = useState("error");
 
-  const handleFile = (e) => {
-    setFile(e.target.files?.[0] || null);
+  const handleThumbnail = (e) => {
+    const img = e.target.files?.[0];
+    if (!img) { setThumbnail(null); setThumbPreview(null); return; }
+    const url = URL.createObjectURL(img);
+    const image = new Image();
+    image.onload = () => {
+      const ratio = image.width / image.height;
+      if (ratio < 1.6 || ratio > 1.9) {
+        URL.revokeObjectURL(url);
+        setMessage("Thumbnail must be 16:9 aspect ratio (e.g. 1280x720)");
+        setMessageType("error");
+        setThumbnail(null);
+        setThumbPreview(null);
+        e.target.value = '';
+      } else {
+        setMessage("");
+        setThumbnail(img);
+        setThumbPreview(url);
+      }
+    };
+    image.src = url;
   };
 
   const handleSubmit = async (e) => {
     e.preventDefault();
-    if (!file) {
-      setMessage("Please select a file to upload.");
+    if (!file || !thumbnail) {
+      setMessage("Please select both a video file and a thumbnail image.");
+      setMessageType("error");
       return;
     }
     setLoading(true);
     setMessage("");
     try {
-      const resp = await uploadVideo(file, title, description, user?.id || '');
-      setMessage("Upload successful");
-      // navigate to video page
+      const resp = await uploadVideo(file, title, description, user?.id || '', thumbnail);
+      setMessage("Upload successful!");
+      setMessageType("success");
       if (resp?.id) {
         navigate(`/video/${resp.id}`);
       } else {
@@ -40,6 +67,7 @@ function Upload() {
       }
     } catch (err) {
       setMessage(err.message || String(err));
+      setMessageType("error");
       setLoading(false);
     }
   };
@@ -49,16 +77,51 @@ function Upload() {
       <Box className="upload-form" component="form" onSubmit={handleSubmit}>
         <Typography variant="h5">Upload Video</Typography>
 
-        <input accept="video/*" type="file" onChange={handleFile} />
+        <Stack spacing={2}>
+          <Box>
+            <input ref={videoRef} accept="video/*" type="file" hidden onChange={(e) => setFile(e.target.files?.[0] || null)} />
+            <Button
+              variant="outlined"
+              startIcon={<CloudUploadIcon />}
+              onClick={() => videoRef.current?.click()}
+              fullWidth
+              className="upload-file-btn"
+            >
+              {file ? file.name : "Choose video file"}
+            </Button>
+          </Box>
+
+          <Box>
+            <input ref={thumbRef} accept="image/*" type="file" hidden onChange={handleThumbnail} />
+            <Button
+              variant="outlined"
+              startIcon={<ImageIcon />}
+              onClick={() => thumbRef.current?.click()}
+              fullWidth
+              className="upload-file-btn"
+            >
+              {thumbnail ? thumbnail.name : "Choose thumbnail (16:9)"}
+            </Button>
+            {thumbPreview && (
+              <Box className="upload-thumb-preview">
+                <img src={thumbPreview} alt="Thumbnail preview" />
+              </Box>
+            )}
+          </Box>
+        </Stack>
 
         <TextField label="Title" value={title} onChange={(e) => setTitle(e.target.value)} fullWidth margin="normal" />
         <TextField label="Description" value={description} onChange={(e) => setDescription(e.target.value)} fullWidth multiline rows={4} margin="normal" />
 
-        <Button variant="contained" color="primary" type="submit" disabled={loading}>
+        <Button variant="contained" color="primary" type="submit" disabled={loading || !file || !thumbnail}>
           {loading ? "Uploading..." : "Upload"}
         </Button>
 
-        {message && <Typography sx={{ mt: 2 }}>{message}</Typography>}
+        {message && (
+          <Typography sx={{ mt: 1, color: messageType === "success" ? "#4caf50" : "#f44336" }}>
+            {message}
+          </Typography>
+        )}
       </Box>
     </Box>
   );
diff --git a/glense.client/src/components/VideoCard.jsx b/glense.client/src/components/VideoCard.jsx
index 95bd6d4..bfc59e9 100644
--- a/glense.client/src/components/VideoCard.jsx
+++ b/glense.client/src/components/VideoCard.jsx
@@ -10,14 +10,19 @@ import {
     demoThumbnailUrl,
 } from "../utils/constants";
 
-import "../css/VideoCard.css"; 
+import "../css/VideoCard.css";
+
+const API_BASE = import.meta.env.VITE_API_URL || 'http://localhost:5050';
 
 function VideoCard({ video }) {
     // Support both YouTube-like shape ({ id: { videoId } }) and catalogue shape ({ id: "guid", thumbnailUrl, title })
     const nestedId = video?.id?.videoId;
     const simpleId = video?.id && typeof video.id === 'string' ? video.id : null;
     const videoId = nestedId || simpleId || video?.videoId;
-    const thumbnail = video?.thumbnailUrl || demoThumbnailUrl;
+    const rawThumb = video?.thumbnailUrl;
+    const thumbnail = rawThumb
+        ? (rawThumb.startsWith('http') ? rawThumb : `${API_BASE}${rawThumb}`)
+        : demoThumbnailUrl;
     const title = video?.title || demoVideoTitle;
 
     return (
diff --git a/glense.client/src/components/VideoStream.jsx b/glense.client/src/components/VideoStream.jsx
index edd3b3d..36f3c8d 100644
--- a/glense.client/src/components/VideoStream.jsx
+++ b/glense.client/src/components/VideoStream.jsx
@@ -51,7 +51,7 @@ function VideoStream() {
       <Box className="video-player-container">
         <Box className="video-player-box">
             <ReactPlayer 
-              url={video?.videoUrl || (id && id.includes('-') ? undefined : `https://www.youtube.com/watch?v=${id}`)}
+              url={video?.videoUrl?.startsWith('http') ? video.videoUrl : `${import.meta.env.VITE_API_URL || 'http://localhost:5050'}/api/videos/${id}/stream`}
               controls
               width="100%"
               height="100%"
diff --git a/glense.client/src/css/Upload.css b/glense.client/src/css/Upload.css
index 0e9a479..dddf258 100644
--- a/glense.client/src/css/Upload.css
+++ b/glense.client/src/css/Upload.css
@@ -44,16 +44,30 @@
   color: var(--color-primary);
 }
 
-.upload-form input[type="file"] {
-  color: var(--color-text-secondary);
-  padding: 12px;
-  border: 1px dashed rgba(255, 255, 255, 0.2);
+.upload-file-btn {
+  color: var(--color-text-secondary) !important;
+  border-color: rgba(255, 255, 255, 0.2) !important;
+  text-transform: none !important;
+  justify-content: flex-start !important;
+  padding: 12px 16px !important;
+}
+
+.upload-file-btn:hover {
+  border-color: rgba(255, 255, 255, 0.4) !important;
+  background-color: rgba(255, 255, 255, 0.05) !important;
+}
+
+.upload-thumb-preview {
+  margin-top: 12px;
   border-radius: 8px;
-  cursor: pointer;
+  overflow: hidden;
+  max-width: 320px;
 }
 
-.upload-form input[type="file"]:hover {
-  border-color: rgba(255, 255, 255, 0.4);
+.upload-thumb-preview img {
+  width: 100%;
+  display: block;
+  border-radius: 8px;
 }
 
 .upload-form .MuiButton-contained {
diff --git a/glense.client/src/utils/videoApi.js b/glense.client/src/utils/videoApi.js
index 658b2ff..9968bf8 100644
--- a/glense.client/src/utils/videoApi.js
+++ b/glense.client/src/utils/videoApi.js
@@ -18,17 +18,20 @@ export async function getVideo(id) {
   return handleRes(res);
 }
 
-export async function uploadVideo(file, title, description, uploaderId = 0) {
+export async function uploadVideo(file, title, description, uploaderId = 0, thumbnail = null) {
   const fd = new FormData();
   fd.append('file', file);
   if (title) fd.append('title', title);
   if (description) fd.append('description', description);
+  if (thumbnail) fd.append('thumbnail', thumbnail);
 
+  const token = localStorage.getItem('glense_auth_token');
   const res = await fetch(`${BASE}/api/videos/upload`, {
     method: 'POST',
     body: fd,
     headers: {
       ...(uploaderId ? { 'X-Uploader-Id': String(uploaderId) } : {}),
+      ...(token ? { 'Authorization': `Bearer ${token}` } : {}),
     },
   });
 
diff --git a/scripts/seed.sh b/scripts/seed.sh
index 19a0b34..4a693a2 100755
--- a/scripts/seed.sh
+++ b/scripts/seed.sh
@@ -1,11 +1,27 @@
 #!/usr/bin/env bash
 # Seed all test data for local development
-# Usage: ./scripts/seed.sh [ACCOUNT_URL] [DONATION_URL] [VIDEO_URL]
+# Usage: ./scripts/seed.sh [GATEWAY_URL]
+# Examples:
+#   ./scripts/seed.sh                          # defaults to http://localhost:5050
+#   ./scripts/seed.sh http://localhost:5050     # explicit gateway URL
+
+GATEWAY=${1:-http://localhost:5050}
+ACCOUNT=$GATEWAY
+DONATION=$GATEWAY
+VIDEO=$GATEWAY
+
+# Auto-detect container runtime (podman or docker)
+if command -v podman &> /dev/null; then
+    CONTAINER_CMD=podman
+elif command -v docker &> /dev/null; then
+    CONTAINER_CMD=docker
+else
+    echo "ERROR: Neither podman nor docker found in PATH"
+    exit 1
+fi
+echo "Using container runtime: $CONTAINER_CMD"
 
-ACCOUNT=${1:-http://localhost:5001}
-DONATION=${2:-http://localhost:5100}
-VIDEO=${3:-http://localhost:5002}
-PG_VIDEO=${DOCKER_PG_VIDEO:-glense_postgres_video}
+PG_VIDEO=${PG_VIDEO:-glense_postgres_video}
 
 echo "=== Seeding test users ==="
 
@@ -89,7 +105,7 @@ videos = [
     ('Build and Deploy 5 JavaScript and React API Projects', 'Full course covering 5 real-world API projects', 'GDa8kZLNhJ4', 54321, 4560, 10),
     ('.NET 8 Full Course for Beginners', 'Complete beginner guide to .NET 8 and C#', 'AhAxLiGC7Pc', 98000, 5600, 30),
     ('Node.js Ultimate Beginners Guide', 'Learn Node.js from scratch in this crash course', 'ENrzD9HAZK4', 445000, 21000, 1800),
-    ('PostgreSQL Tutorial for Beginners', 'Learn PostgreSQL from the ground up', 'qw--VYLpSFk', 187000, 9800, 120),
+    ('PostgreSQL Tutorial for Beginners', 'Learn PostgreSQL from the ground up', 'SpfIwlAYaKk', 187000, 9800, 120),
     ('Git and GitHub for Beginners', 'Full crash course on Git and GitHub', 'RGOj5yH7evk', 150000, 8700, 95),
 ]
 
@@ -129,7 +145,7 @@ for vid in video_ids:
               f"VALUES ('{cid}', '{vid}', '{uids[ni]}', '{names[ni]}', '{comments_list[ci]}', {lc}, NOW() - interval '{hrs} hours');")
 PYEOF
 
-    cat "$TMPFILE" | docker exec -i "$PG_VIDEO" psql -U glense -d glense_video > /dev/null 2>&1
+    cat "$TMPFILE" | $CONTAINER_CMD exec -i "$PG_VIDEO" psql -U glense -d glense_video > /dev/null 2>&1
     if [ $? -eq 0 ]; then
         echo "  Inserted 8 videos with comments"
     else
diff --git a/services/Glense.VideoCatalogue/Controllers/VideosController.cs b/services/Glense.VideoCatalogue/Controllers/VideosController.cs
index bc504e9..01eb976 100644
--- a/services/Glense.VideoCatalogue/Controllers/VideosController.cs
+++ b/services/Glense.VideoCatalogue/Controllers/VideosController.cs
@@ -33,6 +33,13 @@ public VideosController(Upload uploader, VideoCatalogueDbContext db, IVideoStora
             _logger = logger;
         }
 
+        private static string? ResolveThumbnailUrl(Guid videoId, string? thumbnailUrl)
+        {
+            if (string.IsNullOrEmpty(thumbnailUrl)) return null;
+            if (thumbnailUrl.StartsWith("http", StringComparison.OrdinalIgnoreCase)) return thumbnailUrl;
+            return $"/api/videos/{videoId}/thumbnail";
+        }
+
         private async Task<string?> GetUsernameAsync(Guid userId)
         {
             if (userId == Guid.Empty) return null;
@@ -64,7 +71,7 @@ public async Task<IActionResult> Upload([FromForm] DTOs.UploadRequestDTO dto, [F
         {
             if (dto == null || dto.File == null || dto.File.Length == 0) return BadRequest("No file provided");
 
-            var video = await _uploader.UploadFileAsync(dto.File, dto.Title, dto.Description, uploaderId);
+            var video = await _uploader.UploadFileAsync(dto.File, dto.Title, dto.Description, uploaderId, dto.Thumbnail);
 
             var resp = new DTOs.UploadResponseDTO
             {
@@ -72,7 +79,7 @@ public async Task<IActionResult> Upload([FromForm] DTOs.UploadRequestDTO dto, [F
                 Title = video.Title,
                 Description = video.Description,
                 VideoUrl = video.VideoUrl,
-                ThumbnailUrl = video.ThumbnailUrl,
+                ThumbnailUrl = ResolveThumbnailUrl(video.Id, video.ThumbnailUrl),
                 UploadDate = video.UploadDate,
                 UploaderId = video.UploaderId,
                 ViewCount = video.ViewCount,
@@ -95,7 +102,7 @@ public async Task<IActionResult> List()
                 Title = video.Title,
                 Description = video.Description,
                 VideoUrl = video.VideoUrl,
-                ThumbnailUrl = video.ThumbnailUrl,
+                ThumbnailUrl = ResolveThumbnailUrl(video.Id, video.ThumbnailUrl),
                 UploadDate = video.UploadDate,
                 UploaderId = video.UploaderId,
                 UploaderUsername = usernames.GetValueOrDefault(video.UploaderId),
@@ -121,7 +128,7 @@ public async Task<IActionResult> Get(Guid id)
                 Title = video.Title,
                 Description = video.Description,
                 VideoUrl = video.VideoUrl,
-                ThumbnailUrl = video.ThumbnailUrl,
+                ThumbnailUrl = ResolveThumbnailUrl(video.Id, video.ThumbnailUrl),
                 UploadDate = video.UploadDate,
                 UploaderId = video.UploaderId,
                 UploaderUsername = username,
@@ -133,6 +140,24 @@ public async Task<IActionResult> Get(Guid id)
             return Ok(resp);
         }
 
+        [HttpGet("{id:guid}/thumbnail")]
+        public async Task<IActionResult> Thumbnail(Guid id)
+        {
+            var video = await _db.Videos.FirstOrDefaultAsync(v => v.Id == id);
+            if (video == null || string.IsNullOrEmpty(video.ThumbnailUrl)) return NotFound();
+
+            var physicalPath = _storage.GetPhysicalPath(video.ThumbnailUrl);
+            if (physicalPath == null) return NotFound();
+
+            var provider = new FileExtensionContentTypeProvider();
+            if (!provider.TryGetContentType(video.ThumbnailUrl, out var contentType))
+            {
+                contentType = "image/jpeg";
+            }
+
+            return PhysicalFile(physicalPath, contentType);
+        }
+
         [HttpGet("{id:guid}/stream")]
         public async Task<IActionResult> Stream(Guid id)
         {
@@ -142,21 +167,8 @@ public async Task<IActionResult> Stream(Guid id)
             var storedName = video.VideoUrl;
             if (string.IsNullOrEmpty(storedName)) return NotFound();
 
-            Request.Headers.TryGetValue("Range", out var rangeHeader);
-            long? start = null, end = null;
-            if (!string.IsNullOrEmpty(rangeHeader))
-            {
-                // Expecting "bytes=start-end"
-                var range = rangeHeader.ToString();
-                if (range.StartsWith("bytes=", StringComparison.OrdinalIgnoreCase))
-                {
-                    var parts = range.Substring(6).Split('-');
-                    if (long.TryParse(parts[0], out var s)) start = s;
-                    if (parts.Length > 1 && long.TryParse(parts[1], out var e)) end = e;
-                }
-            }
-
-            var (stream, total) = await _storage.OpenReadRangeAsync(storedName, start, end);
+            var physicalPath = _storage.GetPhysicalPath(storedName);
+            if (physicalPath == null) return NotFound();
 
             var provider = new FileExtensionContentTypeProvider();
             if (!provider.TryGetContentType(storedName, out var contentType))
@@ -164,20 +176,6 @@ public async Task<IActionResult> Stream(Guid id)
                 contentType = "application/octet-stream";
             }
 
-            Response.Headers["Accept-Ranges"] = "bytes";
-
-            if (start.HasValue)
-            {
-                var s = start.Value;
-                var e = end ?? (total - 1);
-                var contentLength = e - s + 1;
-                Response.StatusCode = 206;
-                Response.Headers["Content-Range"] = $"bytes {s}-{e}/{total}";
-                Response.ContentLength = contentLength;
-                return File(stream, contentType);
-            }
-
-            Response.ContentLength = total;
-            return File(stream, contentType);
+            return PhysicalFile(physicalPath, contentType, enableRangeProcessing: true);
         }
     }
diff --git a/services/Glense.VideoCatalogue/DTOs/UploadRequestDTO.cs b/services/Glense.VideoCatalogue/DTOs/UploadRequestDTO.cs
index bee2b52..20a5296 100644
--- a/services/Glense.VideoCatalogue/DTOs/UploadRequestDTO.cs
+++ b/services/Glense.VideoCatalogue/DTOs/UploadRequestDTO.cs
@@ -12,4 +12,6 @@ public class UploadRequestDTO
 	public string? Title { get; set; }
 
 	public string? Description { get; set; }
+
+	public IFormFile? Thumbnail { get; set; }
 }
diff --git a/services/Glense.VideoCatalogue/Program.cs b/services/Glense.VideoCatalogue/Program.cs
index 1b7e7ac..346733e 100644
--- a/services/Glense.VideoCatalogue/Program.cs
+++ b/services/Glense.VideoCatalogue/Program.cs
@@ -7,6 +7,12 @@
 
 var builder = WebApplication.CreateBuilder(args);
 
+// Allow large video uploads (500 MB)
+builder.WebHost.ConfigureKestrel(options =>
+{
+    options.Limits.MaxRequestBodySize = 500 * 1024 * 1024;
+});
+
 // Add services to the container.
 builder.Services.AddControllers();
 builder.Services.AddEndpointsApiExplorer();
diff --git a/services/Glense.VideoCatalogue/Services/IVideoStorage.cs b/services/Glense.VideoCatalogue/Services/IVideoStorage.cs
index 017eacf..7794b5c 100644
--- a/services/Glense.VideoCatalogue/Services/IVideoStorage.cs
+++ b/services/Glense.VideoCatalogue/Services/IVideoStorage.cs
@@ -18,4 +18,5 @@ public interface IVideoStorage
         /// </summary>
         Task<(Stream Stream, long TotalLength)> OpenReadRangeAsync(string storedName, long? start = null, long? end = null, CancellationToken cancellationToken = default);
         Task DeleteAsync(string storedName, CancellationToken cancellationToken = default);
+        string? GetPhysicalPath(string storedName);
     }
diff --git a/services/Glense.VideoCatalogue/Services/LocalFileVideoStorage.cs b/services/Glense.VideoCatalogue/Services/LocalFileVideoStorage.cs
index a308a6c..1eb980d 100644
--- a/services/Glense.VideoCatalogue/Services/LocalFileVideoStorage.cs
+++ b/services/Glense.VideoCatalogue/Services/LocalFileVideoStorage.cs
@@ -75,4 +75,10 @@ public Task<Stream> OpenReadAsync(string storedName, CancellationToken cancellat
             // Note: callers are responsible for disposing the stream
             return Task.FromResult<(Stream, long)>((fs, total));
         }
+
+        public string? GetPhysicalPath(string storedName)
+        {
+            var path = Path.Combine(_basePath, storedName);
+            return File.Exists(path) ? path : null;
+        }
     }
diff --git a/services/Glense.VideoCatalogue/Services/Upload.cs b/services/Glense.VideoCatalogue/Services/Upload.cs
index 7b6ddba..c866693 100644
--- a/services/Glense.VideoCatalogue/Services/Upload.cs
+++ b/services/Glense.VideoCatalogue/Services/Upload.cs
@@ -17,13 +17,20 @@ public Upload(IVideoStorage storage, VideoCatalogueDbContext db)
 			_db = db;
 		}
 
-		public async Task<Videos> UploadFileAsync(IFormFile file, string? title, string? description, Guid uploaderId, CancellationToken cancellationToken = default)
+		public async Task<Videos> UploadFileAsync(IFormFile file, string? title, string? description, Guid uploaderId, IFormFile? thumbnail = null, CancellationToken cancellationToken = default)
 		{
 			if (file == null) throw new ArgumentNullException(nameof(file));
 
 			await using var stream = file.OpenReadStream();
 			var storedName = await _storage.SaveAsync(stream, file.FileName, cancellationToken).ConfigureAwait(false);
 
+			string? thumbnailName = null;
+			if (thumbnail != null)
+			{
+				await using var thumbStream = thumbnail.OpenReadStream();
+				thumbnailName = await _storage.SaveAsync(thumbStream, thumbnail.FileName, cancellationToken).ConfigureAwait(false);
+			}
+
 			var video = new Videos
 			{
 				Id = Guid.NewGuid(),
@@ -31,7 +38,7 @@ public async Task<Videos> UploadFileAsync(IFormFile file, string? title, string?
 				Description = description,
 				UploadDate = DateTime.UtcNow,
 				UploaderId = uploaderId,
-				ThumbnailUrl = null,
+				ThumbnailUrl = thumbnailName,
 				VideoUrl = storedName,
 				ViewCount = 0,
 				LikeCount = 0,