diff --git a/.gitignore b/.gitignore
index e8db029..93121e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 **/.idea/**
 **/data/**
-**/.env
\ No newline at end of file
+**/.env
+**/additional.env
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index d0bf1dd..3263f45 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -72,13 +72,13 @@ RUN dotnet nuget remove source moonlightNuget
 RUN dotnet nuget add source /src/pluginNuget -n pluginNuget
 
 # Prepare moonlight for compilation
-RUN dotnet moonlight  prebuild /src/Moonlight /src/pluginNuget
+RUN dotnet moonlight prebuild /src/Moonlight /src/pluginNuget
 
 FROM build-plugins AS build-final
 
 # Build tailwind
 WORKDIR /src/Moonlight/Moonlight.Client/Styles
-RUN npm run tailwind
+RUN npm run tailwind-build
 
 # Build moonlight
 WORKDIR "/src/Moonlight/Moonlight.ApiServer"
diff --git a/compose.yml b/compose.yml
index 32d5d15..868d544 100644
--- a/compose.yml
+++ b/compose.yml
@@ -22,11 +22,14 @@ services:
       - MOONLIGHT_DATABASE_DATABASE=${MOONLIGHT_DATABASE_NAME}
       - MOONLIGHT_PUBLICURL=${MOONLIGHT_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
+    env_file:
+      - path: "additional.env"
+        required: false
     volumes:
       - ${MOONLIGHT_DATA}/moonlight:/app/storage
     links:
       - db
-    pull_policy: build
+    pull_policy: ${MOONLIGHT_BUILD}
   
   db:
     image: postgres:latest