diff --git a/Dockerfile b/Dockerfile
index 5785e5bf9..cc381aab4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -70,7 +70,9 @@ RUN mkdir -p /var/www/html/tmp
 WORKDIR /src
 
 RUN haxe server_legacy.hxml
-RUN haxe server.hxml
+RUN haxe server_website.hxml
+RUN haxe server_tasks.hxml
+RUN haxe server_api.hxml
 
 EXPOSE 80
 VOLUME ["/var/www/html/files", "/var/www/html/tmp"]
diff --git a/server.hxml b/server.hxml
index de9770afa..55a1e32b2 100644
--- a/server.hxml
+++ b/server.hxml
@@ -1,20 +1,7 @@
 # The new haxelib website (on the same 3.0 repo)
-server_each.hxml
--main website.Server
--neko www/index.n
 
+server_website.hxml
 --next
-
-server_each.hxml
--lib ufront-uftasks
--main website.Tasks
--neko www/tasks.n
-
+server_tasks.hxml
 --next
-
--cp src
--neko www/api/3.0/index.n
--main haxelib.server.Repo
--lib aws-sdk-neko:0.1.0
--dce no
--D haxelib_api
+server_api.hxml
\ No newline at end of file
diff --git a/server_api.hxml b/server_api.hxml
new file mode 100644
index 000000000..82b32a315
--- /dev/null
+++ b/server_api.hxml
@@ -0,0 +1,6 @@
+-cp src
+-neko www/api/3.0/index.n
+-main haxelib.server.Repo
+-lib aws-sdk-neko:0.1.0
+-dce no
+-D haxelib_api
diff --git a/server_tasks.hxml b/server_tasks.hxml
new file mode 100644
index 000000000..6e87d06a3
--- /dev/null
+++ b/server_tasks.hxml
@@ -0,0 +1,4 @@
+server_each.hxml
+-lib ufront-uftasks
+-main website.Tasks
+-neko www/tasks.n
diff --git a/server_website.hxml b/server_website.hxml
new file mode 100644
index 000000000..eb28c416e
--- /dev/null
+++ b/server_website.hxml
@@ -0,0 +1,3 @@
+server_each.hxml
+-main website.Server
+-neko www/index.n