diff --git a/.travis.yml b/.travis.yml
index 4244f5b9417ef7344036cda7c3535d655112ac8a..12f8ece9cb5509ae38c069cbe2ab76d9120e1fe3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,10 +3,10 @@
 #
 env:
   global:
-  - secure: SPjEJ+yo4V+BxmswdRBGLv+eRO9/TkhZRPud5z/Pu9n7jTv3V/0mL25nwnwyiFWv5ZTvR/nrYucZGa8gHbauVKTNad/scrO4pq4vooxLDJKrmRo36v4UFrLDhKuBYEAYzZU6fW9QJexU7EzOVnpXxlleb5BXH+zd8EIGOBVLxzUMznew8eekWH67ZkqtMCpiq04tuuZYiiJypxxvhdTnb97/VL66/FtwfKG06k0EgDFe3dsjIb47uQH73B20+SEZVrS1csdA5KcxcqSOPjX9M92DhF6ozkYNqhTNdQBag6N6h833aYZAOoZT+84PdlfmDHJdPI7fJqr8XRLsrnj4+v1r9CT6XFkR7HA7HVPksm1ZJ1w9qDvr6ucVCt6vXC3M4PG/2FgWvZjY4UT4fd18vhjSKHhz4F8qaz6qqYr+yOL0uC/uLijYCPq5ZzA32oiSZbEkbUKtL5KBVGWVKiAq7hMDT+mS/I/EyweFjI27bVa4LKPyPX2vLOI5NqsUtgAOOI5cTkVYGq/7FscoMmhI2xfjMuqth67bgw2FU6wqErkTlcqTHr++sEz2/t2ZEajqQyGZxETZ/YiTHPhYwPXUd24JHdp+txpSMd6y2IC8BZJxkyV6ZMyenSCkjyr+KUPkuDbAspTsZ23yHEMmniZCZEAswW0dBiY/yg8knkb4UPk=
+  - 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=
   - AUTHOR_EMAIL=gambol99@gmail.com
-  - REGISTRY_USERNAME=gambol99
-  - REGISTRY=docker.io
+  - REGISTRY_USERNAME=gambol99+rebotbuilder
+  - REGISTRY=quay.io
 
 services:
   - docker
@@ -17,10 +17,9 @@ go:
 
 install:
   - go get github.com/tools/godep
-  - docker login -u ${REGISTRY_USERNAME} -p ${REGISTRY_TOKEN} -e ${AUTHOR_EMAIL} ${REGISTRY}
 
 script:
   - make test
+  - docker login -u ${REGISTRY_USERNAME} -p ${REGISTRY_TOKEN} -e ${AUTHOR_EMAIL} ${REGISTRY}
   - if [ "$TRAVIS_BRANCH" == "master" ]; then VERSION=latest make docker-release; fi
   - if [ -n "$TRAVIS_TAG" ]; then VERSION=$TRAVIS_TAG make docker-release; fi
-
diff --git a/Makefile b/Makefile
index 324ae045b2fc0bbf9c1fe9046a85d11e9c1b6e6f..dbdc466c4d064d391f949abb34aab224e101992a 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 NAME=keycloak-proxy
 AUTHOR=gambol99
 AUTHOR_EMAIL=gambol99@gmail.com
-REGISTRY=docker.io
+REGISTRY=quay.io
 GOVERSION=1.6.0
 SUDO=
 ROOT_DIR=${PWD}
@@ -47,7 +47,7 @@ docker-release:
 	@echo "--> Building a release image"
 	@make static
 	@make docker
-	docker push ${REGISTRY}/${AUTHOR}/${NAME}:${VERSION}
+	@docker push ${REGISTRY}/${AUTHOR}/${NAME}:${VERSION}
 
 docker-push:
 	@echo "--> Pushing the docker images to the registry"
diff --git a/README.md b/README.md
index 9c67d0bfcea1485085df3f070c205e6b4c7ddad8..8da36f6ff289facd70b02e8a617dff314e55d200 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
 [![Build Status](https://travis-ci.org/gambol99/keycloak-proxy.svg?branch=master)](https://travis-ci.org/gambol99/keycloak-proxy)
 [![GoDoc](http://godoc.org/github.com/gambol99/keycloak-proxy?status.png)](http://godoc.org/github.com/gambol99/keycloak-proxy)
+[![Docker Repository on Quay](https://quay.io/repository/gambol99/keycloak-proxy/status "Docker Repository on Quay")](https://quay.io/repository/gambol99/keycloak-proxy)
 
 ### **Keycloak Proxy**
 ----
@@ -324,7 +325,7 @@ Assuming access response responds with a refresh token and the --enable-refresh-
 
 #### **- Logout Endpoint**
 
-A /oauth/logout?redirect=url is provided as a helper to logout the users, aside from dropping a sessions cookies, we also attempt to refrevoke session access via revocation url (config revocation-url or --revocation-url) with the provider. For keycloak the url for this would be https://keycloak.example.com/auth/realms/REALM_NAME/protocol/openid-connect/logout, for google /oauth/revoke 
+A /oauth/logout?redirect=url is provided as a helper to logout the users, aside from dropping a sessions cookies, we also attempt to refrevoke session access via revocation url (config revocation-url or --revocation-url) with the provider. For keycloak the url for this would be https://keycloak.example.com/auth/realms/REALM_NAME/protocol/openid-connect/logout, for google /oauth/revoke
 
 #### **- Cross Origin Resource Sharing (CORS)**