diff --git a/.travis.yml b/.travis.yml
index 82260b7..6420215 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,123 +1,127 @@
 ---
+dist: xenial
 language: ruby
 cache: bundler
 before_install:
   - bundle -v
   - rm -f Gemfile.lock
   - gem update --system $RUBYGEMS_VERSION
   - gem --version
   - bundle -v
 script:
   - 'bundle exec rake $CHECK'
 bundler_args: --without system_tests
 rvm:
-  - 2.5.1
-env:
-  global:
-    - PUPPET_GEM_VERSION="~> 6.0"
+  - 2.5.3
+stages:
+  - static
+  - spec
+  - acceptance
+  -
+    if: tag =~ ^v\d
+    name: deploy
 matrix:
   fast_finish: true
   include:
     -
       bundler_args:
       dist: trusty
       env: PLATFORMS=deb_puppet5
-      rvm: 2.5.1
+      rvm: 2.5.3
       before_script:
       - bundle exec rake 'litmus:provision_list[travis_deb]'
       - bundle exec rake 'litmus:install_agent[puppet5]'
       - bundle exec rake litmus:install_module
       script:
       - bundle exec rake litmus:acceptance:parallel
       services: docker
       sudo: required
+      stage: acceptance
     -
       bundler_args:
       dist: trusty
       env: PLATFORM=deb_puppet6
-      rvm: 2.5.1
+      rvm: 2.5.3
       before_script:
       - bundle exec rake 'litmus:provision_list[travis_deb]'
       - bundle exec rake 'litmus:install_agent[puppet6]'
       - bundle exec rake litmus:install_module
       script:
       - bundle exec rake litmus:acceptance:parallel
       services: docker
       sudo: required
+      stage: acceptance
     -
       bundler_args:
       dist: trusty
       env: PLATFORMS=el7_puppet5
-      rvm: 2.5.1
+      rvm: 2.5.3
       before_script:
       - bundle exec rake 'litmus:provision_list[travis_el7]'
       - bundle exec rake 'litmus:install_agent[puppet5]'
       - bundle exec rake litmus:install_module
       script:
       - bundle exec rake litmus:acceptance:parallel
       services: docker
       sudo: required
+      stage: acceptance
     -
       bundler_args:
       dist: trusty
       env: PLATFORM=el7_puppet6
-      rvm: 2.5.1
+      rvm: 2.5.3
       before_script:
       - bundle exec rake 'litmus:provision_list[travis_el7]'
       - bundle exec rake 'litmus:install_agent[puppet6]'
       - bundle exec rake litmus:install_module
       script:
       - bundle exec rake litmus:acceptance:parallel
       services: docker
       sudo: required
+      stage: acceptance
     -
       bundler_args:
       dist: trusty
       env: PLATFORMS=el6_puppet5
       rvm: 2.5.3
       before_script:
       - bundle exec rake 'litmus:provision_list[travis_el6]'
       - bundle exec rake 'litmus:install_agent[puppet5]'
       - bundle exec rake litmus:install_module
       script:
       - bundle exec rake litmus:acceptance:parallel
       services: docker
       sudo: required
+      stage: acceptance
     -
       bundler_args:
       dist: trusty
       env: PLATFORMS=el6_puppet6
       rvm: 2.5.3
       before_script:
       - bundle exec rake 'litmus:provision_list[travis_el6]'
       - bundle exec rake 'litmus:install_agent[puppet6]'
       - bundle exec rake litmus:install_module
       script:
       - bundle exec rake litmus:acceptance:parallel
       services: docker
       sudo: required
-
+      stage: acceptance
     -
       env: CHECK="check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop syntax lint metadata_lint"
+      stage: static
     -
       env: PUPPET_GEM_VERSION="~> 5.0" CHECK=parallel_spec
       rvm: 2.4.5
+      stage: spec
     -
       env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec
       rvm: 2.5.3
+      stage: spec
 branches:
   only:
     - master
     - /^v\d/
     - release
 notifications:
   email: false
-deploy:
-  provider: puppetforge
-  user: puppet
-  password:
-    secure: ""
-  on:
-    tags: true
-    all_branches: true
-    condition: "$DEPLOY_TO_FORGE = yes"