diff --git a/.travis.yml b/.travis.yml
index 0e04701f756263cfa12c2c688dc558619e9070a6..d1265b3194e02a063594f5f531ddcb820e2be33a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,3 @@
-#
-#  vim:ts=2:sw=2:et
-#
 env:
   global:
   - secure: TNsg6LtrEmf7Q2JxmCR4A7vEapS/ikM4LBTJqhq9k6/ugy2ZlE4I9neXwGQLI/ohCYF1FXV+qg18qXJUzz0dQTZ1Sfma2hVUh2wU5E58J16g7SeubSYLJ79kBAJRYoNOrgWyBHKRSvXvYN6Lj9o+BgZSi5q9q7nlw3oNeY/LuZ9WGUQmK0HQwS0m/bHAfcrsTafWvrILA1d+dHM5YRElDrVOaVy7QOj1mK3aqPyMIS82PBSTwdR27FekDrZKKrHt0DAfARDgOfMyl7Dzfhn26tSBTBwRXVu73bFQGYpa9vUfyKZb6EWYKdhSEdWOCW4Znk98HdPSGRJtXuIVR3K+wbxc0gkCeNLBqZ1QK5aVl96SB8RITQ3Ah/JYczp1gSGGAeW/ov7fgZ0DRUdj8QPxvOxq7V57LbnP3L2M+0KwpYCqpvxPBH5NC6G/T0iOK9v9Om0fk8DcNmws+RYc39JIaYZv+9cmeZf5XrNfN1cPo7wGMIuBzvz6uA+cRYaHgzo1pvwnL2fgNLQEeDjpD7QbFkxj87y3E0D0afS5vC1jgd32GmM+tFkXXhN7mi8mBvnn7IN4PC8SNa4alfyvxwwG+AWcut7fErPZA7EwDAGBEt3j9S9xb6GwqY7fFT+3+2VFXH0mW9KK+p/wT+sigGsFVAQIGjitvR+EzThPvezXDaA=
@@ -9,15 +6,41 @@ env:
   - REGISTRY=quay.io
 
 services:
-  - docker
+- docker
 
 language: go
+
 go:
-  - 1.6
-  - 1.7beta2
+- 1.6
+- 1.7beta2
+
 install:
-  - go get github.com/tools/godep
+- go get github.com/tools/godep
 
 script:
-  - make test
-  - if [ -n "$TRAVIS_TAG" ]; then docker login -u ${REGISTRY_USERNAME} -p ${REGISTRY_TOKEN} -e ${AUTHOR_EMAIL} ${REGISTRY}; VERSION=$TRAVIS_TAG make docker-release; fi
+- make test
+
+before_deploy:
+- NAME=GOOS=windows GOARCH=amd64 godep go build -o bin/keycloak-proxy-windows-amd64.exe
+- NAME=GOOS=windows GOARCH=386 godep go build -o bin/keycloak-proxy-windows-i386.exe
+- NAME=GOOS=linux GOARCH=amd64 godep go build -o bin/keycloak-proxy-linux-amd64
+- NAME=GOOS=linux GOARCH=386 godep go build -o bin/keycloak-proxy-linux-i386
+
+after_deploy:
+- docker login -u ${REGISTRY_USERNAME} -p ${REGISTRY_TOKEN} -e ${AUTHOR_EMAIL} ${REGISTRY}
+- VERSION=$TRAVIS_TAG make docker-release
+
+deploy:
+  skip_cleanup: true
+  on:
+    go: 1.6
+    repo: gambol99/keycloak-proxy
+    tags: true
+  provider: releases
+  api_key:
+    secure: "[rohith please put github oauth key here]"
+  file:
+    - "bin/keycloak-proxy-windows-amd64.exe"
+    - "bin/keycloak-proxy-windows-i386.exe"
+    - "bin/keycloak-proxy-linux-amd64"
+    - "bin/keycloak-proxy-linux-i386"