diff --git a/.travis.yml b/.travis.yml
index 1c87507..cd60211 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,174 +1,136 @@
 sudo: required
 # group: deprecated-2017Q4
 services:
 - docker
 cache:
   bundler: true
   directories:
   - spec/fixtures/artifacts
   - spec/fixtures/modules
 language: ruby
 script: travis_retry bundle exec rake $TASK
 jobs:
   allow_failures:
-  - env:
-    - TASK=beaker:ubuntu-server-1404-x64:snapshot
-  - env:
-    - OSS_PACKAGE=true
-    - TASK=beaker:ubuntu-server-1404-x64:snapshot
   - env:
     - TASK=beaker:ubuntu-server-1604-x64:snapshot
   - env:
     - OSS_PACKAGE=true
     - TASK=beaker:ubuntu-server-1604-x64:snapshot
-  - env:
-    - TASK=beaker:centos-6-x64:snapshot
-  - env:
-    - OSS_PACKAGE=true
-    - TASK=beaker:centos-6-x64:snapshot
   - env:
     - TASK=beaker:centos-7-x64:snapshot
   - env:
     - OSS_PACKAGE=true
     - TASK=beaker:centos-7-x64:snapshot
   - env:
     - TASK=beaker:debian-8-x64:snapshot
   - env:
     - OSS_PACKAGE=true
     - TASK=beaker:debian-8-x64:snapshot
   - env:
     - TASK=beaker:debian-9-x64:snapshot
   - env:
     - OSS_PACKAGE=true
     - TASK=beaker:debian-9-x64:snapshot
   include:
   - stage: intake
     env:
     - TASK=intake
   - env:
     - TASK=intake
     - PUPPET_VERSION='~> 5.0'
   - stage: acceptance
     env:
     - BEAKER_PUPPET_COLLECTION=puppet6
     - TASK=beaker:amazonlinux-1-x64:acceptance
   - env:
     - BEAKER_PUPPET_COLLECTION=puppet6
     - TASK=beaker:amazonlinux-1-x64:acceptance[6.8.12]
   - env:
     - BEAKER_PUPPET_COLLECTION=puppet6
     - TASK=beaker:amazonlinux-2-x64:acceptance
   - env:
     - BEAKER_PUPPET_COLLECTION=puppet6
     - TASK=beaker:amazonlinux-2-x64:acceptance[6.8.12]
-  - env:
-    - BEAKER_PUPPET_COLLECTION=puppet6
-    - TASK=beaker:centos-6-x64:acceptance
-  - env:
-    - BEAKER_PUPPET_COLLECTION=puppet6
-    - TASK=beaker:centos-6-x64:acceptance[6.8.12]
   - env:
     - BEAKER_PUPPET_COLLECTION=puppet6
     - TASK=beaker:centos-7-x64:acceptance
   - env:
     - BEAKER_PUPPET_COLLECTION=puppet6
     - TASK=beaker:centos-7-x64:acceptance[6.8.12]
   - env:
     - BEAKER_PUPPET_COLLECTION=puppet6
     - TASK=beaker:centos-8-x64:acceptance
   - env:
     - BEAKER_PUPPET_COLLECTION=puppet6
     - TASK=beaker:centos-8-x64:acceptance[6.8.12]
-  - env:
-    - BEAKER_PUPPET_COLLECTION=puppet6
-    - TASK=beaker:oracle-6-x64:acceptance
-  - env:
-    - BEAKER_PUPPET_COLLECTION=puppet6
-    - TASK=beaker:oracle-6-x64:acceptance[6.8.12]
   - env:
     - BEAKER_PUPPET_COLLECTION=puppet6
     - TASK=beaker:oracle-7-x64:acceptance
   - env:
     - BEAKER_PUPPET_COLLECTION=puppet6
     - TASK=beaker:oracle-7-x64:acceptance[6.8.12]
   - env:
     - BEAKER_PUPPET_COLLECTION=puppet6
     - TASK=beaker:debian-8-x64:acceptance
   - env:
     - BEAKER_PUPPET_COLLECTION=puppet6
     - TASK=beaker:debian-8-x64:acceptance[6.8.12]
   - env:
     - BEAKER_PUPPET_COLLECTION=puppet6
     - TASK=beaker:debian-9-x64:acceptance
   - env:
     - BEAKER_PUPPET_COLLECTION=puppet6
     - TASK=beaker:debian-9-x64:acceptance[6.8.12]
   - env:
     - BEAKER_PUPPET_COLLECTION=puppet6
     - TASK=beaker:debian-10-x64:acceptance
   - env:
     - BEAKER_PUPPET_COLLECTION=puppet6
     - TASK=beaker:debian-10-x64:acceptance[6.8.12]
-  - env:
-    - BEAKER_PUPPET_COLLECTION=puppet6
-    - TASK=beaker:ubuntu-server-1404-x64:acceptance
-  - env:
-    - BEAKER_PUPPET_COLLECTION=puppet6
-    - TASK=beaker:ubuntu-server-1404-x64:acceptance[6.8.12]
   - env:
     - BEAKER_PUPPET_COLLECTION=puppet6
     - TASK=beaker:ubuntu-server-1604-x64:acceptance
   - env:
     - BEAKER_PUPPET_COLLECTION=puppet6
     - TASK=beaker:ubuntu-server-1604-x64:acceptance[6.8.12]
   - env:
     - BEAKER_PUPPET_COLLECTION=puppet6
     - TASK=beaker:ubuntu-server-1804-x64:acceptance
   - env:
     - BEAKER_PUPPET_COLLECTION=puppet6
     - TASK=beaker:ubuntu-server-1804-x64:acceptance[6.8.12]
-  # - env:
-  #   - BEAKER_PUPPET_COLLECTION=puppet6
-  #   - TASK=beaker:ubuntu-server-2004-x64:acceptance
-  # - env:
-  #   - BEAKER_PUPPET_COLLECTION=puppet6
-  #   - TASK=beaker:ubuntu-server-2004-x64:acceptance[6.8.12]
+  - env:
+    - BEAKER_PUPPET_COLLECTION=puppet6
+    - TASK=beaker:ubuntu-server-2004-x64:acceptance
+  - env:
+    - BEAKER_PUPPET_COLLECTION=puppet6
+    - TASK=beaker:ubuntu-server-2004-x64:acceptance[6.8.12]
   - stage: snapshots
-    env:
-    - TASK=beaker:ubuntu-server-1404-x64:snapshot
-    env:
-    - OSS_PACKAGE=true
-    - TASK=beaker:ubuntu-server-1404-x64:snapshot
   - env:
     - TASK=beaker:ubuntu-server-1604-x64:snapshot
   - env:
     - OSS_PACKAGE=true
     - TASK=beaker:ubuntu-server-1604-x64:snapshot
-  - env:
-    - TASK=beaker:centos-6-x64:snapshot
-  - env:
-    - OSS_PACKAGE=true
-    - TASK=beaker:centos-6-x64:snapshot
   - env:
     - TASK=beaker:centos-7-x64:snapshot
   - env:
     - OSS_PACKAGE=true
     - TASK=beaker:centos-7-x64:snapshot
   - env:
     - TASK=beaker:debian-8-x64:snapshot
   - env:
     - OSS_PACKAGE=true
     - TASK=beaker:debian-8-x64:snapshot
   - env:
     - TASK=beaker:debian-9-x64:snapshot
   - env:
     - OSS_PACKAGE=true
     - TASK=beaker:debian-9-x64:snapshot
 notifications:
   slack:
     secure: T1FO+ttrJNH+bXmNR6349qcttG68Qr1xmMqVVRnUr7+129GQO5174Z8MFC8ck0qOCZGHO7GCNO5seNFflrjF/5EKbdkmVnqhf9gVa9kN7I4psMzxJX9bp29xJA6m3wA4VqCosDKVFSfilDZujAblWT+KDHZLjP8sEWEnHPvCjf69S2XDQEWUoxZan5V9IJQas4XR+hMdIZTA3ChVrEyqRfeehAZImbAr/LH8zChZaTdHZQY7p2rN3+qVNi3+GISV9fNPpOCynnX/ACbdUaRt3+1etxGGaQMPzGmTejN3VlMw4OZRXImb6HQ2rXE+fNCASXiKiwylxTbriQsS0dFv4skxH03YlYM8pqaBpeIOwzf4n45tTzdAQZJMC5cOb+RvwS7qkAwuaVlVxiiA+MWRG/UcFpWS+iNn4KEKxbpBjYP8X1JIP9DlHLME7DNMM2pePv9X6ZjY6eDhVM1gbKi77dXOo5y2Sp0ru8QkLpIKFVXS01O+x7oDHHv2Osvih0jNMgM66Byso3KJYJ6EJ0D2/3Q9ZNpVM4CMuIY5pBQfXf691zqkBHI6JUnU6VMw97cH0k6Gq0ypZoW5trXdnRC5aEg4jKKid84zKmAeTpj/iMuagyb/a5msJstIVboynRtfDHR0J8WWhfSU2wzqKAb6L66iyRe62Fe8OGzLhk2+KNU=
 env:
   global:
   - secure: WFFcjwBIRBG2zyk4c8Ugq0tgI1YaH/+s5eV9h3i2kR1ggobT+nrNqn3hCOkmPtwGYPBNjVj6yp+7qy//MRe8AS2eo1XuMD/P4MYcDGmZiMnqPhz1UsLltGTYlh3y6jl9DJvNujFBQMnAu/ey2g/iWrcHdtl2qninvN3wOrXi2Bs=
   - secure: bvBaKoV5wBj2eQb4Zx8E2NaBDsMOyuHczRByVLNX5YqeuRWL9kcsUYzAUshFpd2GFa4tzfnSLKCp0+h3T4Uei5e8CjV5dx0VFmijXoZif0OJplRaJ+S3dJSluTV04NoE4u6l5Pg6kkFTMnAaApKVB4je2nSlgvrm/tuavhd9i0M=
   - secure: akshyW92CqV3Wt+rzQ3ScxIG55ILEaiwQ011rNF1kCXTds5HrHOGy++4VEidaTpems8OQH2+hCLK5r/7FXXgRQEV/TRYRGhp/y9mwqdioyDQ1D0yA3f42NWGNDGg2yOTTbhqQFJg394LDMiLmnevoiajEVIH+Ksr5bV/cIJc4Tc=
diff --git a/metadata.json b/metadata.json
index fcba0f7..f8a7e63 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,86 +1,83 @@
 {
   "name": "elastic-elasticsearch",
   "version": "6.4.0",
   "source": "https://github.com/elastic/puppet-elasticsearch",
   "author": "elastic",
   "license": "Apache-2.0",
   "summary": "Module for managing and configuring Elasticsearch nodes",
-  "description": "Module for managing and configuring Elasticsearch nodes",
   "project_page": "https://github.com/elastic/puppet-elasticsearch",
   "issues_url": "https://github.com/elastic/puppet-elasticsearch/issues",
   "dependencies": [
     {
       "name": "elastic/elastic_stack",
-      "version_requirement": ">= 6.1.0 < 7.0.0"
+      "version_requirement": ">= 6.1.0 < 8.0.0"
     },
     {
       "name": "richardc/datacat",
       "version_requirement": ">= 0.6.2 < 1.0.0"
     },
     {
       "name": "puppetlabs/stdlib",
       "version_requirement": ">= 4.13.0 < 7.0.0"
     }
   ],
   "operatingsystem_support": [
     {
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
-        "5",
-        "6",
-        "7"
+        "7",
+        "8"
       ]
     },
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
-        "5",
-        "6",
-        "7"
+        "7",
+        "8"
       ]
     },
     {
       "operatingsystem": "OracleLinux",
       "operatingsystemrelease": [
-        "5",
-        "6",
-        "7"
+        "7",
+        "8"
       ]
     },
     {
       "operatingsystem": "Scientific",
       "operatingsystemrelease": [
-        "5",
-        "6",
-        "7"
+        "7",
+        "8"
       ]
     },
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
-        "7",
-        "8"
+        "8",
+        "9",
+        "10"
       ]
     },
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
-        "14.04",
-        "16.04"
+        "16.04",
+        "18.04",
+        "20.04"
       ]
     },
     {
       "operatingsystem": "SLES",
       "operatingsystemrelease": [
         "12.1",
         "12.2"
       ]
     }
   ],
   "requirements": [
     {
       "name": "puppet",
       "version_requirement": ">= 4.10.0 < 7.0.0"
     }
   ]
 }