diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000000..c3189160e5
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,9 @@
+.dockerignore
+docker-compose.yml
+.git
+.gitignore
+.vs
+.vscode
+legacy
+*/bin
+*/obj
diff --git a/build/Dockerfile b/build/Dockerfile
index d66d3aab02..1c99478ef7 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -7,11 +7,11 @@ COPY src/Tgstation.Server.Host.Console/Tgstation.Server.Host.Console.csproj src/
 COPY src/Tgstation.Server.Host/Tgstation.Server.Host.csproj src/Tgstation.Server.Host/
 COPY src/Tgstation.Server.Api/Tgstation.Server.Api.csproj src/Tgstation.Server.Api/
 
-COPY tests/Tgstation.Server.Api.Tests/Tgstation.Server.Api.Tests.csproj tests/Tgstation.Server.Api.Console.Tests/
-COPY tests/Tgstation.Server.Host.Tests/Tgstation.Server.Host.Tests.csproj tests/Tgstation.Server.Host.Console.Tests/
+COPY tests/Tgstation.Server.Api.Tests/Tgstation.Server.Api.Tests.csproj tests/Tgstation.Server.Api.Tests/
+COPY tests/Tgstation.Server.Host.Tests/Tgstation.Server.Host.Tests.csproj tests/Tgstation.Server.Host.Tests/
 COPY tests/Tgstation.Server.Host.Console.Tests/Tgstation.Server.Host.Console.Tests.csproj tests/Tgstation.Server.Host.Console.Tests/
 
-RUN dotnet restore -nowarn:msb3202,nu1503
+RUN dotnet restore -nowarn:MSB3202,nu1503 -p:RestoreUseSkipNonexistentTargets=false
 
 COPY . .
 
diff --git a/build/docker-compose/.dockerignore b/build/docker-compose/.dockerignore
deleted file mode 100644
index 4f1c2ff0b4..0000000000
--- a/build/docker-compose/.dockerignore
+++ /dev/null
@@ -1,11 +0,0 @@
-*/.dockerignore
-*/docker-compose.yml
-*/docker-compose.*.yml
-.env
-.git
-.gitignore
-.vs
-.vscode
-legacy
-*/bin
-*/obj
diff --git a/build/docker-compose/docker-compose.override.yml b/build/docker-compose/docker-compose.override.yml
deleted file mode 100644
index 6bdf591f00..0000000000
--- a/build/docker-compose/docker-compose.override.yml
+++ /dev/null
@@ -1 +0,0 @@
-version: '3'
diff --git a/build/docker-compose/docker-compose.dcproj b/docker-compose.dcproj
similarity index 76%
rename from build/docker-compose/docker-compose.dcproj
rename to docker-compose.dcproj
index 996cb0b18b..99c91b2938 100644
--- a/build/docker-compose/docker-compose.dcproj
+++ b/docker-compose.dcproj
@@ -6,9 +6,6 @@
     <ProjectGuid>db2a5ee6-af5c-410c-a36c-ea378fe9cbfe</ProjectGuid>
   </PropertyGroup>
   <ItemGroup>
-    <None Include="docker-compose.override.yml">
-      <DependentUpon>docker-compose.yml</DependentUpon>
-    </None>
     <None Include="docker-compose.yml" />
     <None Include=".dockerignore" />
   </ItemGroup>
diff --git a/build/docker-compose/docker-compose.yml b/docker-compose.yml
similarity index 84%
rename from build/docker-compose/docker-compose.yml
rename to docker-compose.yml
index 579b20745f..77f97d69bb 100644
--- a/build/docker-compose/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,5 +4,5 @@ services:
   tgstation.server:
     image: tgstationserver
     build:
-      context: ../..
+      context: .
       dockerfile: build/Dockerfile
diff --git a/src/Tgstation.Server.CommandLine/Program.cs b/src/Tgstation.Server.CommandLine/Program.cs
index 669d070b67..63d8f4fbdc 100644
--- a/src/Tgstation.Server.CommandLine/Program.cs
+++ b/src/Tgstation.Server.CommandLine/Program.cs
@@ -10,8 +10,7 @@ namespace Tgstation.Server.CommandLine
 		/// <summary>
 		/// Entrypoint for the application
 		/// </summary>
-		/// <param name="args">The command line arguments for the application</param>
 		/// <returns>A <see cref="Task"/> representing the running operation</returns>
-		public static Task Main(string[] args) => Task.CompletedTask;
+		public static Task Main() => Task.CompletedTask;
 	}
 }
diff --git a/src/Tgstation.Server.ControlPanel/MainWindow.xaml.cs b/src/Tgstation.Server.ControlPanel/MainWindow.xaml.cs
index 93f05f280f..09ab37f920 100644
--- a/src/Tgstation.Server.ControlPanel/MainWindow.xaml.cs
+++ b/src/Tgstation.Server.ControlPanel/MainWindow.xaml.cs
@@ -20,6 +20,9 @@ namespace Tgstation.Server.ControlPanel
 	/// </summary>
 	sealed partial class MainWindow : Window
 	{
+		/// <summary>
+		/// Construct a <see cref="MainWindow"/>
+		/// </summary>
 		public MainWindow()
 		{
 			InitializeComponent();
diff --git a/src/Tgstation.Server.Host.Console/Program.cs b/src/Tgstation.Server.Host.Console/Program.cs
index 2ce75674c3..0c8a1dc557 100644
--- a/src/Tgstation.Server.Host.Console/Program.cs
+++ b/src/Tgstation.Server.Host.Console/Program.cs
@@ -11,6 +11,10 @@ namespace Tgstation.Server.Host.Console
 		/// Entrypoint for the application
 		/// </summary>
 		/// <returns>A <see cref="Task"/> representing the running operation</returns>
-		public static Task Main() => Task.CompletedTask;
+		public static Task Main()
+		{
+			System.Console.WriteLine("Hello world!");
+			return Task.CompletedTask;
+		}
 	}
 }
diff --git a/src/Tgstation.Server.Host.Service/Program.cs b/src/Tgstation.Server.Host.Service/Program.cs
index 0e1f417d3d..880b0a08b6 100644
--- a/src/Tgstation.Server.Host.Service/Program.cs
+++ b/src/Tgstation.Server.Host.Service/Program.cs
@@ -8,7 +8,6 @@
 		/// <summary>
 		/// Entrypoint for the application
 		/// </summary>
-		/// <returns>A <see cref="Task"/> representing the running operation</returns>
 		static void Main()
 		{ 
 		}
diff --git a/tgstation-server.sln b/tgstation-server.sln
index 4b42b2e615..dda595392f 100644
--- a/tgstation-server.sln
+++ b/tgstation-server.sln
@@ -20,6 +20,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{6FF654E6-3E2C-46D4-872D-D528F77D6973}"
 	ProjectSection(SolutionItems) = preProject
 		build\BuildDox.ps1 = build\BuildDox.ps1
+		build\Dockerfile = build\Dockerfile
 		build\Doxyfile = build\Doxyfile
 		build\tgs.ico = build\tgs.ico
 		build\UploadCoverage.ps1 = build\UploadCoverage.ps1
@@ -49,7 +50,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tgstation.Server.CommandLin
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tgstation.Server.Host.Tests", "tests\Tgstation.Server.Host.Tests\Tgstation.Server.Host.Tests.csproj", "{A3362FF6-550F-480F-859E-8EC1EB6EAB31}"
 EndProject
-Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "build\docker-compose\docker-compose.dcproj", "{DB2A5EE6-AF5C-410C-A36C-EA378FE9CBFE}"
+Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-compose.dcproj", "{DB2A5EE6-AF5C-410C-A36C-EA378FE9CBFE}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution