diff --git a/.travis.yml b/.travis.yml
index 7f55f9f53..ef30925f8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,4 @@
 language: php
-sudo: required
-dist: trusty
 env:
   global:
     - secure: unp8irwVXz37jxOFbuM4NciRaq326XktPJP0UuL5m1qdrGiLQVq18cIuXClkxbnCoXzpkL0gG1XdjaD0bRKWAnwRRZBEKDRBYXyF+IcGCfG1k8HUbZoV1OTP21qUXot70YrTiZJ3NkuS32RJdFV9qRAkaM1Srf+ZRHcsZSdXaSJTooMsDLtqk9Bjh9aHEltRCDS0AT2YPANZLW4Yn2QcwBmPhv+3xNxRt2etbl1EYvjYGbKw31JJnMHvS15DJEY52coJ+n4Yw/EI9My4O9TshrAEHeWwXT+dGACdNTD9lXkohuEyc10bgWTGeD5jytm5mbVbzlML3iro0sq6gNWr1iBzGL+FkWSR0ezkbADcnxoUwZa7OHwOPcrzmgkNp6jouGk6Xhl7NQgfwJJtQYPWfOuXIVNUk1Z2Ein/lw2WMzGmEHrqs1x2gIrD83sKqULT3kZBWr4RfhUPjol+V0MZJ+KCW2yo+2C8lZDQ5LWxftoqnG/ia70nFemWsyHSqe2OvN4WfwW9zdS0kRqMZVq/r3R+y0idacFkvO5yXk7cS45tAawIUK5Ipc3fib/ERv8zoDjcIt136hXhlYo44vPr2oprDnyvLcCbdG0A4uCnPpp3Bdbcn2NqIlsXhzBV+YJokaTv5zfWSH2YX6+wdv0C3+dkFjpZaASVg/R7oxg/oXY=
@@ -8,16 +6,24 @@ env:
     - GIT_EMAIL: builds@travis-ci.org
     - TRAVIS_REPO_SLUG: mitchellkrogza/nginx-ultimate-bad-bot-blocker
     - GIT_BRANCH: master
+sudo: required
+dist: trusty
 matrix:
+  include:
+    - php: 7.0
+  allow_failures:
+    - php: 7.0
+    - php: hhvm
   fast_finish: true
-php:
-  - '5.6'
 cache:
   - apt
 addons:
   apt:
     packages:
       - realpath
+      - mailutils
+before_install:
+  - export TZ=Africa/Johannesburg
 install:
   - sudo add-apt-repository -y ppa:nginx/stable
   - sudo apt-get update
@@ -57,6 +63,12 @@ deploy:
   on:
     repo: mitchellkrogza/nginx-ultimate-bad-bot-blocker
     tags: false
-    all_branches: true
+    branches:
+      except:
+        - "/^v[0-9]/"
+        - "/^V.*$/"
+    branches:
+       only:
+         - "master"
 notifications:
-    email: false
\ No newline at end of file
+  email: false
\ No newline at end of file