diff --git a/compose.yaml b/compose.yaml
index e18117fd..3f80e03b 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -1,13 +1,13 @@
 services:
   api:
     # Meta
-    image: webapp.api
+    image: moonlight.api
     
     # Build
     pull_policy: build
     build:
       context: .
-      dockerfile: Moonlight.Api/Dockerfile
+      dockerfile: Hosts/Moonlight.Api.Host/Dockerfile
       args:
         HTTP_PROXY: ${HTTP_PROXY}
         HTTPS_PROXY: ${HTTPS_PROXY}
@@ -19,17 +19,20 @@
     # Env Settings
     environment:
       # Database settings
-      - "WebApp__Database__Host=${DATABASE_HOST}"
-      - "WebApp__Database__Port=${DATABASE_PORT}"
-      - "WebApp__Database__Username=${DATABASE_USERNAME}"
-      - "WebApp__Database__Password=${DATABASE_PASSWORD}"
-      - "WebApp__Database__Database=${DATABASE_DATABASE}"
+      - "Moonlight__Database__Host=${DATABASE_HOST}"
+      - "Moonlight__Database__Port=${DATABASE_PORT}"
+      - "Moonlight__Database__Username=${DATABASE_USERNAME}"
+      - "Moonlight__Database__Password=${DATABASE_PASSWORD}"
+      - "Moonlight__Database__Database=${DATABASE_DATABASE}"
       
       # OIDC
-      - "WebApp__OIDC__Authority=${OIDC_AUTHORITY}"
-      - "WebApp__OIDC__ClientId=${OIDC_CLIENT_ID}"
-      - "WebApp__OIDC__Client_Secret=${OIDC_CLIENT_SECRET}"
-      - "WebApp__OIDC__RequireHttpsMetadata=${OIDC_REQUIRE_HTTPS_METADATA}"
+      - "Moonlight__OIDC__Authority=${OIDC_AUTHORITY}"
+      - "Moonlight__OIDC__ClientId=${OIDC_CLIENT_ID}"
+      - "Moonlight__OIDC__ClientSecret=${OIDC_CLIENT_SECRET}"
+      - "Moonlight__OIDC__RequireHttpsMetadata=${OIDC_REQUIRE_HTTPS_METADATA:-true}"
+      - "Moonlight__OIDC__Scopes__0=openid"
+      - "Moonlight__OIDC__Scopes__1=identify"
+      - "Moonlight__OIDC__Scopes__2=email"
       
       # Logging
       - "Logging__LogLevel__Default=Information"