diff --git a/.travis.yml b/.travis.yml
index 403117d..0f0cc69 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,12 +13,15 @@ before_script:
 
 script:
   - openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout keystone_key.pem -out keystone_cert.pem -subj "/CN=$HOST"
-  - docker run -d -it --name keystone -p 5000:5000 -p 35357:35357 -e IDENTITY_HOST="$HOST" -e KEYSTONE_ADMIN_PASSWORD="secret" -v `pwd`/keystone_cert.pem:/etc/nginx/ssl/keystone_cert.pem -v `pwd`/keystone_key.pem:/etc/nginx/ssl/keystone_key.pem -v `pwd`/verify-keystone.sh:/usr/bin/verify-keystone.sh clearlinux/keystone
+  - docker run -d -it --name keystone -p 5000:5000 -p 35357:35357 -e IDENTITY_HOST="$HOST" -e KEYSTONE_ADMIN_PASSWORD="secret" -v `pwd`/keystone_cert.pem:/etc/nginx/ssl/keystone_cert.pem -v `pwd`/keystone_key.pem:/etc/nginx/ssl/keystone_key.pem clearlinux/keystone
   - travis_retry docker exec -it  keystone /usr/bin/verify-keystone.sh
 
-after_success:
-  - echo OK
-
 deploy:
-  # Deploy Keystone if was changed
+  provider: releases
+  api_key: $GH_TOKEN
+  skip_cleanup: true
+  on:
+    tags: true
+
+after_deploy:
   -  "git diff --name-only HEAD^ --staged | grep keystone && curl -H \"Content-Type: application/json\" --data '{\"build\": true}' -X POST https://registry.hub.docker.com/u/clearlinux/keystone/trigger/$DOCKER_TOKEN/"
diff --git a/keystone/Dockerfile b/keystone/Dockerfile
index 33e358e..376efff 100644
--- a/keystone/Dockerfile
+++ b/keystone/Dockerfile
@@ -16,6 +16,7 @@ COPY keystone.wsgi.conf /etc/nginx/
 
 COPY bootstrap.sh /usr/bin
 COPY pre-setup.sh /usr/bin
+COPY verify-keystone.sh /usr/bin
 COPY openrc /root/
 RUN /usr/bin/pre-setup.sh