diff --git a/.travis.yml b/.travis.yml
index a481991..0c97d29 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,23 +2,30 @@ language: ruby
 sudo: false
 bundler_args: --without development
 before_install: rm Gemfile.lock || true
-script: bundle exec rake test
+script: bundle exec rake $CHECK
 matrix:
   fast_finish: true
   include:
   - rvm: 2.1.9
-    env: PUPPET_GEM_VERSION="~> 3.8.5" FACTER_GEM_VERSION="~> 2.4" HIERA_GEM_VERSION="~> 1.3" FUTURE_PARSER="yes"
+    env: PUPPET_GEM_VERSION="~> 4.5.0" FACTER_GEM_VERSION="~> 2.4" HIERA_GEM_VERSION="~> 3.3.0" CHECK=test
   - rvm: 2.1.9
-    env: PUPPET_GEM_VERSION="~> 4.5.0" FACTER_GEM_VERSION="~> 2.4" HIERA_GEM_VERSION="~> 3.3.0"
+    env: PUPPET_GEM_VERSION="~> 4.7.0" FACTER_GEM_VERSION="~> 2.4" HIERA_GEM_VERSION="~> 3.3.0" CHECK=test
   - rvm: 2.1.9
-    env: PUPPET_GEM_VERSION="~> 4.7.0" FACTER_GEM_VERSION="~> 2.4" HIERA_GEM_VERSION="~> 3.3.0"
+    env: PUPPET_GEM_VERSION="~> 4.8.0" FACTER_GEM_VERSION="~> 2.4" HIERA_GEM_VERSION="~> 3.3.0" CHECK=test
   - rvm: 2.1.9
-    env: PUPPET_GEM_VERSION="~> 4.8.0" FACTER_GEM_VERSION="~> 2.4" HIERA_GEM_VERSION="~> 3.3.0"
+    env: PUPPET_GEM_VERSION="~> 4.9.0" FACTER_GEM_VERSION="~> 2.4" HIERA_GEM_VERSION="~> 3.3.0" CHECK=test
   - rvm: 2.1.9
-    env: PUPPET_GEM_VERSION="~> 4.9.0" FACTER_GEM_VERSION="~> 2.4" HIERA_GEM_VERSION="~> 3.3.0"
+    env: PUPPET_GEM_VERSION="~> 4.10.0" FACTER_GEM_VERSION="~> 2.4" HIERA_GEM_VERSION="~> 3.3.0" CHECK=test
   - rvm: 2.1.9
-    env: PUPPET_GEM_VERSION="~> 4.10.4" FACTER_GEM_VERSION="~> 2.4" HIERA_GEM_VERSION="~> 3.3.0"
-
+    env: PUPPET_GEM_VERSION="~> 4.10.0" FACTER_GEM_VERSION="~> 2.4" HIERA_GEM_VERSION="~> 3.3.0" CHECK=build DEPLOY_TO_FORGE=yes
+  - rvm: 2.4.1
+    env: PUPPET_GEM_VERSION="~> 5.0.0" FACTER_GEM_VERSION="~> 2.4" HIERA_GEM_VERSION="~> 3.3.0" CHECK=test
+branches:
+  only:
+  - production
+  - /^\d/
+notifications:
+  email: false
 deploy:
   provider: puppetforge
   user: abstractit
@@ -29,5 +36,6 @@ deploy:
     # all_branches is required to use tags
     all_branches: true
     rvm: 2.1.9
+    # Only publish the build marked with "DEPLOY_TO_FORGE"
     condition:
-    - $PUPPET_GEM_VERSION = '4.10.4'
+    - $DEPLOY_TO_FORGE = "yes"
diff --git a/metadata.json b/metadata.json
index 2970c20..f6c407d 100644
--- a/metadata.json
+++ b/metadata.json
@@ -12,8 +12,8 @@
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
-        "12.04",
-        "14.04"
+        "14.04",
+        "16.04"
       ]
     },
     {
@@ -26,7 +26,6 @@
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
-        "5",
         "6",
         "7"
       ]
@@ -34,7 +33,6 @@
     {
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
-        "5",
         "6",
         "7"
       ]
@@ -43,14 +41,10 @@
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">=4.0.0 <5.0.0"
+      "version_requirement": ">=4.0.0 <6.0.0"
     }
   ],
   "dependencies": [
-    {
-      "name": "puppetlabs/apache",
-      "version_requirement": ">=1.4.0 <2.0.0"
-    },
     {
       "name": "puppetlabs/stdlib",
       "version_requirement": ">=4.6.0 <5.0.0"