diff --git a/.travis.yml b/.travis.yml
index 874ab1a..0151a55 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,7 +23,3 @@ deploy:
 notifications:
   webhooks:
     - https://ws.b0n.pl/relaunch
-env:
-  global:
-  - secure: "W6rdGN9tavB0DdzWcZ+2oKbodszrpUfodg0rbdRfA97ho3xwrRDtogzascSdu7tGXyN2w39CRtp+yY8i4+BJGqFl58m2qoWKOR/XBeAVzvZ093TQOBEPSOggIPgzpyGF+VgH9MOE4kPUViRKPMM0HGRs7Vq8ts9mGaNO9cX7tNr2QoRUpiHuNLZ18nKn25yZ/8kclL8KDz9UDD/sCCC+PLyvXCJsXEnKaJq/bLAPj/uo3kF5A8SJIN3agOQH/TQObycN4uyvo1XTFTSab0X3S78muEsRAY3zH4fHvEHwzuuCTITEwLna3KbAAKl5HCWP6o32ECLFyTsLWqoiSJjEEkvHS++SpK2JNWxq4K83riDhnzEofpeLlHb9FXXbD59En3Pc2OEAT7Zbf4OSdObF2AA80y28tYUAreo15YD6jNWALcac2x1ZRIKUH1drBByVZaFRpLM2aklPZvDuQXM7T1HmyTwhZzGYue03sg/XUcknmq9AoKukU8DlOxv9fydVzoq4tZhUEbjSii8kuiPU/EffT+hZVe0FyUZtnq7mQxcr+aXUIQqKlWDiUcQUWtb7BpQunqvdMg0lbxdaTFtpn+f8B3tPVAdKrxEsFTlhlYNNEsA4renhbPPLN5Qd0EMFi05Rf4QpLiB76E97m8BB9odaCtwVOoC7XKTX+kG/V40="
-  - secure: "hp+ghJqS4+ElM/mk0W/8L9JUoapFttkyhCBaWdwQSthj3pSpc5m54HqxOSIvFQREMUW6x/Q70CLx0IHR8D7EqtlJ/CD4HsiYLVNtB3I+05sXLJ/qLPh3HhJ0X7bLWkb5ti5b4hRSGUgeMRqbJOOS9qcJbUb05+3HxPpK761GYzgUy1zPqsL0BnEkaUVD460H9loK5MfYLJ19M2IfVu0Ls84E3s3dfPgnmxrnjH9jq8c3TyE5sI4QqIRpcwXP2zr3xQNxaYWqXQTqcz1ni5dU7YS4nikHAeu6lAVjAsN5wI5NqZXsSutxvj3BE0nGijaQjGmJBMAsOooNZmJw9ZvK/ohU8o43v4u2HMytrYla5ziRzlXn2dqBRCPu++r1UrMj1AM0d8f8lmO4e4xt5QiVlLdwWag2/uVxg9piChJLpDjBP5MRt7q4vi3S2jG+P6I23loV9e+WUCFykpcEFsfD/T7MyYKDIWDzPrLGSRSBZbl1Czbi6c7myApQGnoW9s/ZVTEzJvInbzv79jefxKCFMkLZkI3vnFXf2Ef/2nSAMGmNpB6ZVmSkXKPWeMWVICakco1/GhWAYxtLsdlW9iYJZrQfOa1vOpBpvh7eoX+rqLtfIrqwrwvH8O8MmXEllz52eXnhjpdDbB9p5usiH+wzrgDCcjAmeE8OPVvkEzh0hEY="
diff --git a/Dockerfile.amd64 b/Dockerfile.amd64
index 77cd20a..8233e1f 100644
--- a/Dockerfile.amd64
+++ b/Dockerfile.amd64
@@ -4,6 +4,6 @@ MAINTAINER Max Schmitt
 
 EXPOSE 8080
 
-COPY releases/golang-url-shortener_linux_amd64/golang-url-shortener /
+COPY docker_releases/golang-url-shortener_linux_amd64/golang-url-shortener /
 
 CMD ["/golang-url-shortener"]
diff --git a/Dockerfile.arm b/Dockerfile.arm
index 10ff030..a02322d 100644
--- a/Dockerfile.arm
+++ b/Dockerfile.arm
@@ -4,6 +4,6 @@ MAINTAINER Max Schmitt
 
 EXPOSE 8080
 
-COPY releases/golang-url-shortener_linux_arm/golang-url-shortener /
+COPY docker_releases/golang-url-shortener_linux_arm/golang-url-shortener /
 
 CMD ["/golang-url-shortener"]
diff --git a/Makefile b/Makefile
index 5751df6..a85f9af 100644
--- a/Makefile
+++ b/Makefile
@@ -27,5 +27,7 @@ buildProject:
 	find releases -maxdepth 1 -mindepth 1 -type d -exec tar -cvjf {}.tar.bz2 {} \;
 
 buildDockerImage:
-	rm -rf releases/*
-	CGO_ENABLED=0 gox -output="releases/{{.Dir}}_{{.OS}}_{{.Arch}}/{{.Dir}}" -osarch="linux/amd64 linux/arm"
\ No newline at end of file
+	@mkdir docker_releases
+	CGO_ENABLED=0 gox -output="docker_releases/{{.Dir}}_{{.OS}}_{{.Arch}}/{{.Dir}}" -osarch="linux/amd64 linux/arm"
+	docker build -t maxibanki/golang_url_shortener:arm -f Dockerfile.arm .
+	docker build -t maxibanki/golang_url_shortener -f Dockerfile.amd64 .
\ No newline at end of file