diff --git a/Dockerfile b/Dockerfile
index 18653e98..bf1f1d72 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,20 @@
 FROM mcr.microsoft.com/dotnet/core/sdk:2.2-alpine
 
 WORKDIR /app
+
+# Copy all solution files to container, and run restore
+COPY PluralKit.API/PluralKit.API.csproj /app/PluralKit.API/
+COPY PluralKit.Bot/PluralKit.Bot.csproj /app/PluralKit.Bot/
+COPY PluralKit.Core/PluralKit.Core.csproj /app/PluralKit.Core/
+COPY PluralKit.Web/PluralKit.Web.csproj /app/PluralKit.Web/
+COPY PluralKit.sln /app
+RUN dotnet restore 
+
+# Copy actual source code to container and build
 COPY PluralKit.API /app/PluralKit.API
 COPY PluralKit.Bot /app/PluralKit.Bot
 COPY PluralKit.Core /app/PluralKit.Core
 COPY PluralKit.Web /app/PluralKit.Web
-COPY PluralKit.sln /app
 RUN dotnet build
+
+ENTRYPOINT dotnet run
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 2e3c3a1f..16c03235 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3"
 services:
   bot:
     build: .
-    entrypoint: ["dotnet", "run", "--project", "PluralKit.Bot"]
+    command: ["--project", "PluralKit.Bot"]
     environment:
       - "PluralKit:Database=Host=db;Username=postgres;Password=postgres;Database=postgres"
       - "PluralKit:InfluxUrl=http://influx:8086"
@@ -17,7 +17,7 @@ services:
     restart: always
   web:
     build: .
-    entrypoint: ["dotnet", "run", "--project", "PluralKit.Web"]
+    command: ["--project", "PluralKit.Web"]
     environment:
       - "PluralKit:Database=Host=db;Username=postgres;Password=postgres;Database=postgres"
     links: 
@@ -27,7 +27,7 @@ services:
     restart: always
   api:
     build: .
-    entrypoint: ["dotnet", "run", "--project", "PluralKit.API"]
+    command: ["--project", "PluralKit.API"]
     environment:
       - "PluralKit:Database=Host=db;Username=postgres;Password=postgres;Database=postgres"
     links: