diff --git a/Dockerfile b/Dockerfile
index 4c8d2ad..7bc6089 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,8 @@
 # Prepare runtime docker image
-FROM mcr.microsoft.com/dotnet/aspnet:8.0-noble-chiseled AS base
-WORKDIR /app
+FROM cgr.dev/chainguard/aspnet-runtime:latest AS base
 
 # Prepare build image
-FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
 
 # === Heavy download/install tasks ===
 # should be put here for caching reasons
diff --git a/compose.yml b/compose.yml
index 2a3fd09..4fc8c45 100644
--- a/compose.yml
+++ b/compose.yml
@@ -18,7 +18,7 @@ services:
       - MOONLIGHT_DATABASE_PASSWORD=s3cret
       - MOONLIGHT_DATABASE_DATABASE=moonlight
       - MOONLIGHT_PUBLICURL=http://localhost:9069
-      - MOONLIGHT_AUTHENTICATION_OAUTH2_ACCESSENDPOINT=http://localhost:8080 # Use this when moonlight is using local oauth2 and a different port as the public url
+      - MOONLIGHT_AUTHENTICATION_OAUTH2_ACCESSENDPOINT=http://localhost:8080/oauth2/handle # Use this when moonlight is using local oauth2 and a different port as the public url
     volumes:
       - ./data/moonlight:/app/storage
     links: