diff --git a/.travis.yml b/.travis.yml
index 4eea218..75d816b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,4 +26,11 @@ jobs:
       script:
         - mkdir /home/travis/build/mroote/build
         - docker run -t -e FAC_BRANCH=$TRAVIS_BRANCH -v /home/travis/build/mroote/build:/build factorio-server-manager
-        - ls /home/travis/build/mroote/build
+        - mv /home/travis/build/mroote/build/factorio-server-manager-linux.zip /home/travis/factorio-server-manager-linux-${TRAVIS_TAG}.zip
+        - mv /home/travis/build/mroote/build/factorio-server-manager-windows.zip /home/travis/factorio-server-manager-windows-${TRAVIS_TAG}.zip
+      deploy:
+        provider: releases
+        api_key: ""
+        file:
+          - /home/travis/factorio-server-manager-linux-${TRAVIS_TAG}.zip
+          - /home/travis/factorio-server-manager-windows-${TRAVIS_TAG}.zip
\ No newline at end of file
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 7deb69e..52be601 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,8 +1,6 @@
 # glibc is required for Factorio Server binaries to run
 FROM frolvlad/alpine-glibc
 
-MAINTAINER Mitch Roote <mitch@r00t.ca>
-
 ENV FACTORIO_VERSION=latest \
     MANAGER_VERSION=0.8.1 \
     ADMIN_PASSWORD=factorio
diff --git a/docker/Makefile b/docker/Makefile
index 56fc545..e3bbad3 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -5,16 +5,14 @@ SECURITY_PATH ?= $(FACTORIO_PATH)/security
 SAVES_PATH ?= $(FACTORIO_PATH)/saves
 MODS_PATH ?= $(FACTORIO_PATH)/mods
 PORT_FORWARD ?= -p 80:80 -p 443:443 -p 34197:34197/udp
+FACTORIO_BRANCH ?= develop
 
 build:
+	docker build --build-arg FAC_BRANCH=$FACTORIO_BRANCH -f Dockerfile-build -t fsm-build .
 	docker build -t factorio-server-manager .
 
 logs:
-	docker logs factorio-server
-	echo "Nginx Access Logs"
-	docker exec -it factorio-server cat /var/log/nginx/access.log
-	echo "Nginx Error Logs"
-	docker exec -it factorio-server cat /var/log/nginx/error.log
+	docker logs factorio-server -f
 
 run:
 	docker run -d --name factorio-server -v $(SECURITY_PATH):/security -v $(SAVES_PATH):/opt/factorio/saves -v $(MODS_PATH):/opt/factorio/mods $(PORT_FORWARD) factorio-server-manager
@@ -25,3 +23,5 @@ stop:
 
 clean:
 	docker rmi factorio-server-manager
+	docker stop fsm-build
+	docker rmi fsm-build
diff --git a/docker/build.sh b/docker/build.sh
index a1be6c9..b3be17c 100644
--- a/docker/build.sh
+++ b/docker/build.sh
@@ -4,4 +4,5 @@ echo "Cloning ${FAC_BRANCH}"
 git clone -b ${FAC_BRANCH} https://github.com/mroote/factorio-server-manager.git ${FAC_ROOT}
 echo "Creating build..."
 make gen_release
-cp build/* /build/
\ No newline at end of file
+echo "Copying build artifacts..."
+cp -v build/* /build/
\ No newline at end of file