diff --git a/.sync.yml b/.sync.yml
index 713647f..524b193 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -1,104 +1,104 @@
 ---
 .travis.yml:
   dist: xenial
   extras:
     - env: CHECK="parallel_spec" PUPPET_GEM_VERSION="~> 5" FIXTURES_YML=".fixtures-latest.yml"
       rvm: 2.4.5
       stage: spec
     - env: CHECK="parallel_spec" PUPPET_GEM_VERSION="~> 6" FIXTURES_YML=".fixtures-latest.yml"
       rvm: 2.5.3
       stage: spec
   allow_failures:
     - env: CHECK="parallel_spec" PUPPET_GEM_VERSION="~> 5" FIXTURES_YML=".fixtures-latest.yml"
       rvm: 2.4.5
     - env: CHECK="parallel_spec" PUPPET_GEM_VERSION="~> 6" FIXTURES_YML=".fixtures-latest.yml"
       rvm: 2.5.3
   docker_defaults:
     dist: xenial
   docker_sets:
     - set: centos-7
       collection: puppet5
       extra_envs:
         - BEAKER_keycloak_full: yes
-    - set: centos-7
-      collection: puppet5
-      extra_envs:
-        - BEAKER_keycloak_version: 7.0.0
-        - BEAKER_keycloak_full: yes
-    - set: centos-7
-      collection: puppet6
-      extra_envs:
-        - BEAKER_keycloak_full: yes
+#    - set: centos-7
+#      collection: puppet5
+#      extra_envs:
+#        - BEAKER_keycloak_version: 7.0.0
+#        - BEAKER_keycloak_full: yes
     - set: centos-7
       collection: puppet6
       extra_envs:
-        - BEAKER_keycloak_version: 7.0.0
         - BEAKER_keycloak_full: yes
+#    - set: centos-7
+#      collection: puppet6
+#      extra_envs:
+#        - BEAKER_keycloak_version: 7.0.0
+#        - BEAKER_keycloak_full: yes
     - set: centos-8
       collection: puppet5
-    - set: centos-8
-      collection: puppet5
-      extra_envs:
-        - BEAKER_keycloak_version: 7.0.0
-    - set: centos-8
-      collection: puppet6
+#    - set: centos-8
+#      collection: puppet5
+#      extra_envs:
+#        - BEAKER_keycloak_version: 7.0.0
     - set: centos-8
       collection: puppet6
-      extra_envs:
-        - BEAKER_keycloak_version: 7.0.0
-    - set: debian-9
-      collection: puppet5
+#    - set: centos-8
+#      collection: puppet6
+#      extra_envs:
+#        - BEAKER_keycloak_version: 7.0.0
     - set: debian-9
       collection: puppet5
-      extra_envs:
-        - BEAKER_keycloak_version: 7.0.0
-    - set: debian-9
-      collection: puppet6
+#    - set: debian-9
+#      collection: puppet5
+#      extra_envs:
+#        - BEAKER_keycloak_version: 7.0.0
     - set: debian-9
       collection: puppet6
-      extra_envs:
-        - BEAKER_keycloak_version: 7.0.0
+#    - set: debian-9
+#      collection: puppet6
+#      extra_envs:
+#        - BEAKER_keycloak_version: 7.0.0
     - set: debian-10
       collection: puppet5
-    - set: debian-10
-      collection: puppet5
-      extra_envs:
-        - BEAKER_keycloak_version: 7.0.0
-    - set: debian-10
-      collection: puppet6
+#    - set: debian-10
+#      collection: puppet5
+#      extra_envs:
+#        - BEAKER_keycloak_version: 7.0.0
     - set: debian-10
       collection: puppet6
-      extra_envs:
-        - BEAKER_keycloak_version: 7.0.0
-    - set: ubuntu-1804
-      collection: puppet5
+#    - set: debian-10
+#      collection: puppet6
+#      extra_envs:
+#        - BEAKER_keycloak_version: 7.0.0
     - set: ubuntu-1804
       collection: puppet5
-      extra_envs:
-        - BEAKER_keycloak_version: 7.0.0
-    - set: ubuntu-1804
-      collection: puppet6
+#    - set: ubuntu-1804
+#      collection: puppet5
+#      extra_envs:
+#        - BEAKER_keycloak_version: 7.0.0
     - set: ubuntu-1804
       collection: puppet6
-      extra_envs:
-        - BEAKER_keycloak_version: 7.0.0
+#    - set: ubuntu-1804
+#      collection: puppet6
+#      extra_envs:
+#        - BEAKER_keycloak_version: 7.0.0
   user: treydock
   secure: "u4N3WOhiO4X0mmEF7I+ARGpcw4Wrmt1xA8cmG2Qlnvr+r3c7RgWfc6GoabLicGKoN/OqVPD1b6lXJ+Xrg8VAJb9NmFjXYkowbTYgyyPsx6fSIshaquThkrEUsaF1C5hWx1rADXCz8hkpvX537xye/uKQlvDjwHyHaJWu3rpCfsDApYwYZhIkKtsSk2hOlcX9jfI1LE/H6YYo44uRBxg2lyUusScJQcDe023mBYOOSet3C4w4UpPBqR0mu9XvjJHk0KJzBE2Jk6g7W+02/ZkVW9qDXh70mCE562uQN/CE8rjcM5V1M6L69YzG5rv0LSuV4rnrjNtkNz6GZPDKIpuwOLEkA0M+jBr+F2d4tPHyMVDGLQHIIl5/TxXU2A9+gDe9yZFeZ7KEOSkkYfEgKgHcPHMZQJhs7Xkj2ab+F3AFjrSbjWngX892NQXp9XK4EXBZzogdsEp+wHULc9ybb9BKUNS0FIbCOjJoqBuwe7Is8vfVQ+OXAxVnP1POEoAgmgD3gQVHtedBAYrT7Ge+uxILua+KaPYkxBh/Cg9TYYSJeO/y0LH8pV3zSOQ3oU3MGZRbZrLbNkFAq9sYu3Klw52NEgfgXNRaE5AIpC0Tjf/BHZuaGGPyZML4A14tctwzFCFmG8SXkN2fFtpS5LAfLzbizi2KecPMyEjSpHJATJ/6HuQ="
 .gitlab-ci.yml:
   delete: true
 appveyor.yml:
   delete: true
 spec/acceptance/nodesets/centos-6.yml:
   delete: true
 spec/acceptance/nodesets/debian-8.yml:
   delete: true
 spec/acceptance/nodesets/debian-10.yml:
   packages:
     - iproute2
 spec/acceptance/nodesets/ubuntu-1404.yml:
   delete: true
 spec/acceptance/nodesets/ubuntu-1604.yml:
   delete: true
 spec/acceptance/nodesets/ubuntu-1804.yml:
   packages:
     - iproute2
diff --git a/.travis.yml b/.travis.yml
index cbe9cdf..9cf18db 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,248 +1,158 @@
 ---
 dist: xenial
 language: ruby
 cache: bundler
 before_install:
   - bundle -v
   - rm -f Gemfile.lock
   - gem --version
   - bundle -v
 script:
   - 'bundle exec rake $CHECK'
 bundler_args: --without system_tests
 rvm:
   - 2.5.3
 stages:
   - static
   - spec
   - acceptance
   -
     if: tag =~ ^v\d
     name: deploy
 matrix:
   fast_finish: true
   include:
     -
       bundler_args: --with system_tests
       dist: xenial
       env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_set=centos-7 BEAKER_TESTMODE=apply BEAKER_keycloak_full=true
       rvm: 2.5.3
       script: bundle exec rake beaker
       services: docker
       stage: acceptance
       sudo: required
-    -
-      bundler_args: --with system_tests
-      dist: xenial
-      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_set=centos-7 BEAKER_TESTMODE=apply BEAKER_keycloak_version=8.0.1 BEAKER_keycloak_full=true
-      rvm: 2.5.3
-      script: bundle exec rake beaker
-      services: docker
-      stage: acceptance
-      sudo: required
     -
       bundler_args: --with system_tests
       dist: xenial
       env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=centos-7 BEAKER_TESTMODE=apply BEAKER_keycloak_full=true
       rvm: 2.5.3
       script: bundle exec rake beaker
       services: docker
       stage: acceptance
       sudo: required
-    -
-      bundler_args: --with system_tests
-      dist: xenial
-      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=centos-7 BEAKER_TESTMODE=apply BEAKER_keycloak_version=8.0.1 BEAKER_keycloak_full=true
-      rvm: 2.5.3
-      script: bundle exec rake beaker
-      services: docker
-      stage: acceptance
-      sudo: required
     -
       bundler_args: --with system_tests
       dist: xenial
       env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_set=centos-8 BEAKER_TESTMODE=apply
       rvm: 2.5.3
       script: bundle exec rake beaker
       services: docker
       stage: acceptance
       sudo: required
-    -
-      bundler_args: --with system_tests
-      dist: xenial
-      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_set=centos-8 BEAKER_TESTMODE=apply BEAKER_keycloak_version=8.0.1
-      rvm: 2.5.3
-      script: bundle exec rake beaker
-      services: docker
-      stage: acceptance
-      sudo: required
     -
       bundler_args: --with system_tests
       dist: xenial
       env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=centos-8 BEAKER_TESTMODE=apply
       rvm: 2.5.3
       script: bundle exec rake beaker
       services: docker
       stage: acceptance
       sudo: required
-    -
-      bundler_args: --with system_tests
-      dist: xenial
-      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=centos-8 BEAKER_TESTMODE=apply BEAKER_keycloak_version=8.0.1
-      rvm: 2.5.3
-      script: bundle exec rake beaker
-      services: docker
-      stage: acceptance
-      sudo: required
     -
       bundler_args: --with system_tests
       dist: xenial
       env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_set=debian-9 BEAKER_TESTMODE=apply
       rvm: 2.5.3
       script: bundle exec rake beaker
       services: docker
       stage: acceptance
       sudo: required
-    -
-      bundler_args: --with system_tests
-      dist: xenial
-      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_set=debian-9 BEAKER_TESTMODE=apply BEAKER_keycloak_version=8.0.1
-      rvm: 2.5.3
-      script: bundle exec rake beaker
-      services: docker
-      stage: acceptance
-      sudo: required
     -
       bundler_args: --with system_tests
       dist: xenial
       env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=debian-9 BEAKER_TESTMODE=apply
       rvm: 2.5.3
       script: bundle exec rake beaker
       services: docker
       stage: acceptance
       sudo: required
-    -
-      bundler_args: --with system_tests
-      dist: xenial
-      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=debian-9 BEAKER_TESTMODE=apply BEAKER_keycloak_version=8.0.1
-      rvm: 2.5.3
-      script: bundle exec rake beaker
-      services: docker
-      stage: acceptance
-      sudo: required
     -
       bundler_args: --with system_tests
       dist: xenial
       env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_set=debian-10 BEAKER_TESTMODE=apply
       rvm: 2.5.3
       script: bundle exec rake beaker
       services: docker
       stage: acceptance
       sudo: required
-    -
-      bundler_args: --with system_tests
-      dist: xenial
-      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_set=debian-10 BEAKER_TESTMODE=apply BEAKER_keycloak_version=7.0.0
-      rvm: 2.5.3
-      script: bundle exec rake beaker
-      services: docker
-      stage: acceptance
-      sudo: required
     -
       bundler_args: --with system_tests
       dist: xenial
       env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=debian-10 BEAKER_TESTMODE=apply
       rvm: 2.5.3
       script: bundle exec rake beaker
       services: docker
       stage: acceptance
       sudo: required
-    -
-      bundler_args: --with system_tests
-      dist: xenial
-      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=debian-10 BEAKER_TESTMODE=apply BEAKER_keycloak_version=7.0.0
-      rvm: 2.5.3
-      script: bundle exec rake beaker
-      services: docker
-      stage: acceptance
-      sudo: required
     -
       bundler_args: --with system_tests
       dist: xenial
       env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_set=ubuntu-1804 BEAKER_TESTMODE=apply
       rvm: 2.5.3
       script: bundle exec rake beaker
       services: docker
       stage: acceptance
       sudo: required
-    -
-      bundler_args: --with system_tests
-      dist: xenial
-      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_set=ubuntu-1804 BEAKER_TESTMODE=apply BEAKER_keycloak_version=8.0.1
-      rvm: 2.5.3
-      script: bundle exec rake beaker
-      services: docker
-      stage: acceptance
-      sudo: required
     -
       bundler_args: --with system_tests
       dist: xenial
       env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=ubuntu-1804 BEAKER_TESTMODE=apply
       rvm: 2.5.3
       script: bundle exec rake beaker
       services: docker
       stage: acceptance
       sudo: required
-    -
-      bundler_args: --with system_tests
-      dist: xenial
-      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=ubuntu-1804 BEAKER_TESTMODE=apply BEAKER_keycloak_version=8.0.1
-      rvm: 2.5.3
-      script: bundle exec rake beaker
-      services: docker
-      stage: acceptance
-      sudo: required
     -
       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
     -
       env: DEPLOY_TO_FORGE=yes
       stage: deploy
     -
       env: CHECK="parallel_spec" PUPPET_GEM_VERSION="~> 5" FIXTURES_YML=".fixtures-latest.yml"
       rvm: 2.4.5
       stage: spec
     -
       env: CHECK="parallel_spec" PUPPET_GEM_VERSION="~> 6" FIXTURES_YML=".fixtures-latest.yml"
       rvm: 2.5.3
       stage: spec
   allow_failures:
     -
       env: CHECK="parallel_spec" PUPPET_GEM_VERSION="~> 5" FIXTURES_YML=".fixtures-latest.yml"
       rvm: 2.4.5
     -
       env: CHECK="parallel_spec" PUPPET_GEM_VERSION="~> 6" FIXTURES_YML=".fixtures-latest.yml"
       rvm: 2.5.3
 branches:
   only:
     - master
     - /^v\d/
 notifications:
   email: treydock@gmail.com
 deploy:
   provider: puppetforge
   user: treydock
   password:
     secure: "u4N3WOhiO4X0mmEF7I+ARGpcw4Wrmt1xA8cmG2Qlnvr+r3c7RgWfc6GoabLicGKoN/OqVPD1b6lXJ+Xrg8VAJb9NmFjXYkowbTYgyyPsx6fSIshaquThkrEUsaF1C5hWx1rADXCz8hkpvX537xye/uKQlvDjwHyHaJWu3rpCfsDApYwYZhIkKtsSk2hOlcX9jfI1LE/H6YYo44uRBxg2lyUusScJQcDe023mBYOOSet3C4w4UpPBqR0mu9XvjJHk0KJzBE2Jk6g7W+02/ZkVW9qDXh70mCE562uQN/CE8rjcM5V1M6L69YzG5rv0LSuV4rnrjNtkNz6GZPDKIpuwOLEkA0M+jBr+F2d4tPHyMVDGLQHIIl5/TxXU2A9+gDe9yZFeZ7KEOSkkYfEgKgHcPHMZQJhs7Xkj2ab+F3AFjrSbjWngX892NQXp9XK4EXBZzogdsEp+wHULc9ybb9BKUNS0FIbCOjJoqBuwe7Is8vfVQ+OXAxVnP1POEoAgmgD3gQVHtedBAYrT7Ge+uxILua+KaPYkxBh/Cg9TYYSJeO/y0LH8pV3zSOQ3oU3MGZRbZrLbNkFAq9sYu3Klw52NEgfgXNRaE5AIpC0Tjf/BHZuaGGPyZML4A14tctwzFCFmG8SXkN2fFtpS5LAfLzbizi2KecPMyEjSpHJATJ/6HuQ="
   on:
     tags: true
     all_branches: true
     condition: "$DEPLOY_TO_FORGE = yes"
diff --git a/README.md b/README.md
index 2ca2445..9fb1cf4 100644
--- a/README.md
+++ b/README.md
@@ -1,307 +1,308 @@
 # puppet-module-keycloak
 
 [![Puppet Forge](http://img.shields.io/puppetforge/v/treydock/keycloak.svg)](https://forge.puppetlabs.com/treydock/keycloak)
 [![Build Status](https://travis-ci.org/treydock/puppet-module-keycloak.png)](https://travis-ci.org/treydock/puppet-module-keycloak)
 
 #### Table of Contents
 
 1. [Overview](#overview)
     * [Supported Versions of Keycloak](#supported-versions-of-keycloak)
 2. [Usage - Configuration options](#usage)
 3. [Reference - Parameter and detailed reference to all options](#reference)
 4. [Limitations - OS compatibility, etc.](#limitations)
 
 ## Overview
 
 The keycloak module allows easy installation and management of Keycloak.
 
 ### Supported Versions of Keycloak
 
 | Keycloak Version | Keycloak Puppet module versions |
 | ---------------- | ------------------------------- |
 | 3.x              | 2.x                             |
 | 4.x - 6.x        | 3.x                             |
-| 6.x - 7.x        | 4.x - 5.x                       |
+| 6.x - 8.x        | 4.x - 5.x                       |
+| 8.x              | 6.x                             |
 
 
 ## Usage
 
 ### keycloak
 
 Install Keycloak using default `h2` database storage.
 
 ```puppet
 class { 'keycloak': }
 ```
 
 Install a specific version of Keycloak.
 
 ```puppet
 class { 'keycloak':
   version           => '6.0.1',
   datasource_driver => 'mysql',
 }
 ```
 
 Upgrading Keycloak version works by changing `version` parameter as long as the `datasource_driver` is not the default of `h2`. An upgrade involves installing the new version without touching the old version, updating the symlink which defaults to `/opt/keycloak`, applying all changes to new version and then restarting the `keycloak` service.
 
 If the previous `version` was `6.0.1` using the following will upgrade to `7.0.0`:
 
 ```puppet
 class { 'keycloak':
   version           => '7.0.0',
   datasource_driver => 'mysql',
 }
 ```
 
 Install keycloak and use a local MySQL server for database storage
 
 ```puppet
 include mysql::server
 class { 'keycloak':
   datasource_driver   => 'mysql',
   datasource_host     => 'localhost',
   datasource_port     => 3306,
   datasource_dbname   => 'keycloak',
   datasource_username => 'keycloak',
   datasource_password => 'foobar',
 }
 ```
 
 The following example can be used to configure keycloak with a local PostgreSQL server.
 
 ```puppet
 include postgresql::server
 class { 'keycloak':
     datasource_driver     => 'postgresql',
     datasource_host       => 'localhost',
     datasource_port       => 5432,
     datasource_dbname     => 'keycloak',
     datasource_username   => 'keycloak',
     datasource_password   => 'foobar',
 }
 ```
 
 Configure a SSL certificate truststore and add a LDAP server's certificate to the truststore.
 
 ```puppet
 class { 'keycloak':
   truststore                              => true,
   truststore_password                     => 'supersecret',
   truststore_hostname_verification_policy => 'STRICT',
 }
 keycloak::truststore::host { 'ldap1.example.com':
   certificate => '/etc/openldap/certs/0a00000.0',
 }
 ```
 
 Setup Keycloak to proxy through Apache HTTPS.
 
 ```puppet
 class { 'keycloak':
   proxy_https => true
 }
 apache::vhost { 'idp.example.com':
   servername => 'idp.example.com',
   port        => '443',
   ssl         => true,
   manage_docroot  => false,
   docroot         => '/var/www/html',
   proxy_preserve_host => true,
   proxy_pass          => [
     {'path' => '/', 'url' => 'http://localhost:8080/'}
   ],
   request_headers     => [
     'set X-Forwarded-Proto "https"',
     'set X-Forwarded-Port "443"'
   ],
   ssl_cert            => '/etc/pki/tls/certs/idp.example.com/crt',
   ssl_key             => '/etc/pki/tls/private/idp.example.com.key',
 }
 ```
 
 Setup a host for theme development so that theme changes don't require a service restart, not recommended for production.
 
 ```puppet
 class { 'keycloak':
   theme_static_max_age  => -1,
   theme_cache_themes    => false,
   theme_cache_templates => false,
 }
 ```
 
 Run Keycloak using standalone clustered mode:
 
 ```puppet
 class { 'keycloak':
   operating_mode => 'clustered',
 }
 ```
 
 ### keycloak_realm
 
 Define a Keycloak realm that uses username and not email for login and to use a local branded theme.
 
 ```puppet
 keycloak_realm { 'test':
   ensure                   => 'present',
   remember_me              => true,
   login_with_email_allowed => false,
   login_theme              => 'my_theme',
 }
 ```
 
 ### keycloak\_ldap\_user_provider
 
 Define a LDAP user provider so that authentication can be performed against LDAP.  The example below uses two LDAP servers, disables importing of users and assumes the SSL certificates are trusted and do not require being in the truststore.
 
  ```puppet
 keycloak_ldap_user_provider { 'LDAP on test':
   ensure             => 'present',
   users_dn           => 'ou=People,dc=example,dc=com',
   connection_url     => 'ldaps://ldap1.example.com:636 ldaps://ldap2.example.com:636',
   import_enabled     => false,
   use_truststore_spi => 'never',
 }
 ```
 
 **NOTE** The `Id` for the above resource would be `LDAP-test` where the format is `${resource_name}-${realm}`.
 
 ### keycloak\_ldap_mapper
 
 Use the LDAP attribute 'gecos' as the full name attribute.
 
 ```puppet
 keycloak_ldap_mapper { 'full name for LDAP-test on test:
   ensure         => 'present',
   resource_name  => 'full name',
   type           => 'full-name-ldap-mapper',
   ldap_attribute => 'gecos',
 }
 ```
 
 ### keycloak\_sssd\_user\_provider
 
 Define SSSD user provider.  **NOTE** This type requires that SSSD be properly configured and Keycloak service restarted after SSSD ifp service is setup.  Also requires `keycloak` class be called with `with_sssd_support` set to `true`.
 
 ```puppet
 keycloak_sssd_user_provider { 'SSSD on test':
   ensure => 'present',
 }
 ```
 
 ### keycloak_client
 
 Register a client.
 
 ```puppet
 keycloak_client { 'www.example.com':
   ensure          => 'present',
   realm           => 'test',
   redirect_uris   => [
     "https://www.example.com/oidc",
     "https://www.example.com",
   ],
   client_template => 'oidc-clients',
   secret          => 'supersecret',
 }
 ```
 
 ### keycloak::client_scope::oidc
 
 Defined type that can be used to define both `keycloak_client_scope` and `keycloak_protocol_mapper` resources for OpenID Connect. 
 
 ```puppet
 keycloak::client_scope::oidc { 'oidc-clients':
   realm => 'test',
 }
 ```
 
 ### keycloak::client_scope::saml
 
 Defined type that can be used to define both `keycloak_client_scope` and `keycloak_protocol_mapper` resources for SAML. 
 
 ```puppet
 keycloak::client_scope::saml { 'saml-clients':
   realm => 'test',
 }
 ```
 
 ### keycloak\_client_scope
 
 Define a Client Scope of `email` for realm `test` in Keycloak:
 
 ```puppet
 keycloak_client_scope { 'email on test':
   protocol => 'openid-connect',
 }
 ```
 
 ### keycloak\_protocol_mapper
 
 Associate a Protocol Mapper to a given Client Scope.  The name in the following example will add the `email` protocol mapper to client scope `oidc-email` in the realm `test`.
 
 ```puppet
 keycloak_protocol_mapper { "email for oidc-email on test":
   claim_name     => 'email',
   user_attribute => 'email',
 }
 ```
 
 ### keycloak\_client\_protocol\_mapper
 
 Add `email` protocol mapper to `test.example.com` client in realm `test`
 
 ```puppet
 keycloak_client_protocol_mapper { "email for test.example.com on test":
   claim_name     => 'email',
   user_attribute => 'email',
 }
 ```
 
 ### keycloak\_identity\_provider
 
 Add `cilogon` identity provider to `test` realm
 
 ```puppet
 keycloak_identity_provider { 'cilogon on test':
   ensure                        => 'present',
   display_name                  => 'CILogon',
   provider_id                   => 'oidc',
   first_broker_login_flow_alias => 'browser',
   client_id                     => 'cilogon:/client_id/foobar',
   client_secret                 => 'supersecret',
   user_info_url                 => 'https://cilogon.org/oauth2/userinfo',
   token_url                     => 'https://cilogon.org/oauth2/token',
   authorization_url             => 'https://cilogon.org/authorize',
 }
 ```
 
 ### keycloak\_api
 
 The keycloak_api type can be used to define how this module's types access the Keycloak API if this module is only used for the types/providers and the module's `kcadm-wrapper.sh` is not installed.
 
  ```puppet
 keycloak_api { 'keycloak'
   install_dir => '/opt/keycloak',
   server     => 'http://localhost:8080/auth',
   realm      => 'master',
   user       => 'admin',
   password   => 'changeme',
 }
 ```
 
 The path for `install_dir` will be joined with `bin/kcadm.sh` to produce the full path to `kcadm.sh`.
 
 ## Reference
 
 [http://treydock.github.io/puppet-module-keycloak/](http://treydock.github.io/puppet-module-keycloak/)
 
 ## Limitations
 
 This module has been tested on:
 
 * CentOS 7 x86_64
 * RedHat 7 x86_64
 * Debian 9 x86_64
 * Ubuntu 18.04 x86_64
diff --git a/manifests/init.pp b/manifests/init.pp
index 188a684..a7f2b70 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,350 +1,350 @@
 # @summary Manage Keycloak
 #
 # @example
 #   include ::keycloak
 #
 # @param manage_install
 #   Install Keycloak from upstream Keycloak tarball.
 #   Set to false to manage installation of Keycloak outside
 #   this module and set $install_dir to match.
 #   Defaults to true.
 # @param version
 #   Version of Keycloak to install and manage.
 # @param package_url
 #   URL of the Keycloak download.
 #   Default is based on version.
 # @param install_dir
 #   The directory of where to install Keycloak.
 #   Default is `/opt/keycloak-${version}`.
 # @param service_name
 #   Keycloak service name.
 #   Default is `keycloak`.
 # @param service_ensure
 #   Keycloak service ensure property.
 #   Default is `running`.
 # @param service_enable
 #   Keycloak service enable property.
 #   Default is `true`.
 # @param service_hasstatus
 #   Keycloak service hasstatus parameter.
 #   Default is `true`.
 # @param service_hasrestart
 #   Keycloak service hasrestart parameter.
 #   Default is `true`.
 # @param service_bind_address
 #   Bind address for Keycloak service.
 #   Default is '0.0.0.0'.
 # @param java_opts
 #   Sets additional options to Java virtual machine environment variable.
 # @param java_opts_append
 #   Determine if $JAVA_OPTS should be appended to when setting `java_opts` parameter
 # @param service_extra_opts
 #   Additional options added to the end of the service command-line.
 # @param manage_user
 #   Defines if the module should manage the Linux user for Keycloak installation
 # @param user
 #   Keycloak user name.
 #   Default is `keycloak`.
 # @param user_shell
 #   Keycloak user shell.
 # @param group
 #   Keycloak user group name.
 #   Default is `keycloak`.
 # @param user_uid
 #   Keycloak user UID.
 #   Default is `undef`.
 # @param group_gid
 #   Keycloak user group GID.
 #   Default is `undef`.
 # @param admin_user
 #   Keycloak administrative username.
 #   Default is `admin`.
 # @param admin_user_password
 #   Keycloak administrative user password.
 #   Default is `changeme`.
 # @param manage_datasource
 #   Boolean that determines if configured datasource will be managed.
 #   Only applies when `datasource_driver` is `mysql`.
 #   Default is `true`.
 # @param datasource_driver
 #   Datasource driver to use for Keycloak.
 #   Valid values are `h2`, `mysql`, 'oracle' and 'postgresql'
 #   Default is `h2`.
 # @param datasource_host
 #   Datasource host.
 #   Only used when datasource_driver is `mysql`, 'oracle' or 'postgresql'
 #   Default is `localhost` for MySQL.
 # @param datasource_port
 #   Datasource port.
 #   Only used when datasource_driver is `mysql`, 'oracle' or 'postgresql'
 #   Default is `3306` for MySQL.
 # @param datasource_url
 #   Datasource url.
 #   Default datasource URLs are defined in init class.
 # @param datasource_dbname
 #   Datasource database name.
 #   Default is `keycloak`.
 # @param datasource_username
 #   Datasource user name.
 #   Default is `sa`.
 # @param datasource_password
 #   Datasource user password.
 #   Default is `sa`.
 # @param datasource_package
 #   Package to add specified datasource support
 # @param datasource_jar_source
 #   Source for datasource JDBC driver - could be puppet link or local file on the node.
 #   Default is dependent on value for `datasource_driver`.
 #   This parameter is required if `datasource_driver` is `oracle`.
 # @param datasource_module_source
 #   Source for datasource module.xml. Default depends on `datasource_driver`.
 # @param datasource_xa_class
 #   MySQL Connector/J JDBC driver xa-datasource class name
 # @param proxy_https
 #   Boolean that sets if HTTPS proxy should be enabled.
 #   Set to `true` if proxying traffic through Apache.
 #   Default is `false`.
 # @param truststore
 #   Boolean that sets if truststore should be used.
 #   Default is `false`.
 # @param truststore_hosts
 #   Hash that is used to define `keycloak::turststore::host` resources.
 #   Default is `{}`.
 # @param truststore_password
 #   Truststore password.
 #   Default is `keycloak`.
 # @param truststore_hostname_verification_policy
 #   Valid values are `WILDCARD`, `STRICT`, and `ANY`.
 #   Default is `WILDCARD`.
 # @param http_port
 #   HTTP port used by Keycloak.
 #   Default is `8080`.
 # @param theme_static_max_age
 #   Max cache age in seconds of static content.
 #   Default is `2592000`.
 # @param theme_cache_themes
 #   Boolean that sets if themes should be cached.
 #   Default is `true`.
 # @param theme_cache_templates
 #   Boolean that sets if templates should be cached.
 #   Default is `true`.
 # @param realms
 #   Hash that is used to define keycloak_realm resources.
 #   Default is `{}`.
 # @param realms_merge
 #   Boolean that sets if `realms` should be merged from Hiera.
 # @param oidc_client_scopes
 #   Hash that is used to define keycloak::client_scope::oidc resources.
 #   Default is `{}`.
 # @param oidc_client_scopes_merge
 #   Boolean that sets if `oidc_client_scopes` should be merged from Hiera.
 # @param saml_client_scopes
 #   Hash that is used to define keycloak::client_scope::saml resources.
 #   Default is `{}`.
 # @param saml_client_scopes_merge
 #   Boolean that sets if `saml_client_scopes` should be merged from Hiera.
 # @param identity_providers
 #   Hash that is used to define keycloak_identity_provider resources.
 # @param identity_providers_merge
 #   Boolean that sets if `identity_providers` should be merged from Hiera.
 # @param client_scopes
 #   Hash that is used to define keycloak_client_scope resources.
 # @param client_scopes_merge
 #   Boolean that sets if `client_scopes` should be merged from Hiera.
 # @param protocol_mappers
 #   Hash that is used to define keycloak_protocol_mapper resources.
 # @param protocol_mappers_merge
 #   Boolean that sets if `protocol_mappers` should be merged from Hiera.
 # @param clients
 #   Hash that is used to define keycloak_client resources.
 # @param clients_merge
 #   Boolean that sets if `clients` should be merged from Hiera.
 # @param with_sssd_support
 #   Boolean that determines if SSSD user provider support should be available
 # @param libunix_dbus_java_source
 #   Source URL of libunix-dbus-java
 # @param install_libunix_dbus_java_build_dependencies
 #   Boolean that determines of libunix-dbus-java build dependencies are managed by this module
 # @param libunix_dbus_java_build_dependencies
 #   Packages needed to build libunix-dbus-java
 # @param libunix_dbus_java_libdir
 #   Path to directory to install libunix-dbus-java libraries
 # @param jna_package_name
 #   Package name for jna
 # @param manage_sssd_config
 #   Boolean that determines if SSSD ifp config for Keycloak is managed
 # @param sssd_ifp_user_attributes
 #   user_attributes to define for SSSD ifp service
 # @param restart_sssd
 #   Boolean that determines if SSSD should be restarted
 # @param service_environment_file
 #   Path to the file with environment variables for the systemd service
 # @param operating_mode
 #   Keycloak operating mode deployment
 # @param tech_preview_features
 #  List of technology Preview features to enable
 #
 class keycloak (
   Boolean $manage_install       = true,
-  String $version               = '6.0.1',
+  String $version               = '8.0.1',
   Optional[Variant[Stdlib::HTTPUrl, Stdlib::HTTPSUrl]]
     $package_url                = undef,
   Optional[Stdlib::Absolutepath] $install_dir = undef,
   String $service_name          = 'keycloak',
   String $service_ensure        = 'running',
   Boolean $service_enable       = true,
   Boolean $service_hasstatus    = true,
   Boolean $service_hasrestart   = true,
   Stdlib::IP::Address $service_bind_address = '0.0.0.0',
   Optional[Variant[String, Array]] $java_opts = undef,
   Boolean $java_opts_append = true,
   Optional[String] $service_extra_opts = undef,
   Boolean $manage_user = true,
   String $user                  = 'keycloak',
   Stdlib::Absolutepath $user_shell = '/sbin/nologin',
   String $group                 = 'keycloak',
   Optional[Integer] $user_uid   = undef,
   Optional[Integer] $group_gid  = undef,
   String $admin_user            = 'admin',
   String $admin_user_password   = 'changeme',
   Boolean $manage_datasource = true,
   Enum['h2', 'mysql', 'oracle', 'postgresql'] $datasource_driver = 'h2',
   Optional[String] $datasource_host = undef,
   Optional[Integer] $datasource_port = undef,
   Optional[String] $datasource_url = undef,
   Optional[String] $datasource_xa_class = undef,
   String $datasource_dbname = 'keycloak',
   String $datasource_username = 'sa',
   String $datasource_password = 'sa',
   Optional[String] $datasource_package = undef,
   Optional[String] $datasource_jar_source = undef,
   Optional[String] $datasource_module_source = undef,
   Boolean $proxy_https = false,
   Boolean $truststore = false,
   Hash $truststore_hosts = {},
   String $truststore_password = 'keycloak',
   Enum['WILDCARD', 'STRICT', 'ANY'] $truststore_hostname_verification_policy = 'WILDCARD',
   Integer $http_port = 8080,
   Integer $theme_static_max_age = 2592000,
   Boolean $theme_cache_themes = true,
   Boolean $theme_cache_templates = true,
   Hash $realms = {},
   Boolean $realms_merge = false,
   Hash $oidc_client_scopes = {},
   Boolean $oidc_client_scopes_merge = false,
   Hash $saml_client_scopes = {},
   Boolean $saml_client_scopes_merge = false,
   Hash $client_scopes = {},
   Boolean $client_scopes_merge = false,
   Hash $protocol_mappers = {},
   Boolean $protocol_mappers_merge = false,
   Hash $identity_providers = {},
   Boolean $identity_providers_merge = false,
   Hash $clients = {},
   Boolean $clients_merge = false,
   Boolean $with_sssd_support = false,
   Variant[Stdlib::HTTPUrl, Stdlib::HTTPSUrl]
     $libunix_dbus_java_source = 'https://github.com/keycloak/libunix-dbus-java/archive/libunix-dbus-java-0.8.0.tar.gz',
   Boolean $install_libunix_dbus_java_build_dependencies = true,
   Array $libunix_dbus_java_build_dependencies = [],
   Stdlib::Absolutepath $libunix_dbus_java_libdir = '/usr/lib64',
   String $jna_package_name = 'jna',
   Boolean $manage_sssd_config = true,
   Array $sssd_ifp_user_attributes = [],
   Boolean $restart_sssd = true,
   Optional[Stdlib::Absolutepath] $service_environment_file = undef,
   Enum['standalone', 'clustered'] $operating_mode = 'standalone',
   Array $tech_preview_features = [],
 ) {
 
   if ! ($facts['os']['family'] in ['RedHat','Debian']) {
     fail("Unsupported osfamily: ${facts['os']['family']}, module ${module_name} only support osfamilies Debian and Redhat")
   }
 
   $download_url = pick($package_url, "https://downloads.jboss.org/keycloak/${version}/keycloak-${version}.tar.gz")
   case $datasource_driver {
     'h2': {
       $datasource_connection_url = pick($datasource_url, "jdbc:h2:\${jboss.server.data.dir}/${datasource_dbname};AUTO_SERVER=TRUE")
       }
     'mysql': {
       $db_host = pick($datasource_host, 'localhost')
       $db_port = pick($datasource_port, 3306)
       $datasource_connection_url = pick($datasource_url, "jdbc:mysql://${db_host}:${db_port}/${datasource_dbname}")
       }
     'oracle': {
       $db_host = pick($datasource_host, 'localhost')
       $db_port = pick($datasource_port, 1521)
       $datasource_connection_url = pick($datasource_url, "jdbc:oracle:thin:@${db_host}:${db_port}:${datasource_dbname}")
       }
     'postgresql': {
       $db_host = pick($datasource_host, 'localhost')
       $db_port = pick($datasource_port, 5432)
       $datasource_connection_url = pick($datasource_url, "jdbc:postgresql://${db_host}:${db_port}/${datasource_dbname}")
       }
     default: {}
   }
 
   if ($datasource_driver == 'oracle') and ($datasource_jar_source == undef) {
     fail('Using Oracle RDBMS requires definition datasource_jar_source for Oracle JDBC driver. Refer to module documentation')
   }
 
   case $facts['os']['family'] {
     'RedHat': {
       if versioncmp($facts['os']['release']['major'], '8') >= 0 {
         $mysql_datasource_class = pick($datasource_xa_class, 'org.mariadb.jdbc.MariaDbDataSource')
         $mysql_jar_source = '/usr/lib/java/mariadb-java-client.jar'
         $postgresql_jar_source = '/usr/share/java/postgresql-jdbc/postgresql.jar'
       } else {
         $mysql_datasource_class = pick($datasource_xa_class, 'com.mysql.jdbc.jdbc2.optional.MysqlXADataSource')
         $mysql_jar_source = '/usr/share/java/mysql-connector-java.jar'
         $postgresql_jar_source = '/usr/share/java/postgresql-jdbc.jar'
       }
     }
     'Debian': {
       if $facts['os']['name'] == 'Debian' and versioncmp($facts['os']['release']['major'], '10') >= 0 {
         $mysql_datasource_class = pick($datasource_xa_class, 'org.mariadb.jdbc.MariaDbDataSource')
         $mysql_jar_source = '/usr/share/java/mariadb-java-client.jar'
       } else {
         $mysql_datasource_class = pick($datasource_xa_class, 'com.mysql.jdbc.jdbc2.optional.MysqlXADataSource')
         $mysql_jar_source = '/usr/share/java/mysql-connector-java.jar'
       }
       $postgresql_jar_source = '/usr/share/java/postgresql.jar'
     }
     default: {
       # do nothing
     }
   }
 
   $install_base = pick($install_dir, "/opt/keycloak-${keycloak::version}")
 
   include ::java
   contain 'keycloak::install'
   contain "keycloak::datasource::${datasource_driver}"
   contain 'keycloak::config'
   contain 'keycloak::service'
 
   Class['::java']
   -> Class['keycloak::install']
   -> Class["keycloak::datasource::${datasource_driver}"]
   -> Class['keycloak::config']
   -> Class['keycloak::service']
 
   Class["keycloak::datasource::${datasource_driver}"]~>Class['keycloak::service']
 
   if $with_sssd_support {
     contain 'keycloak::sssd'
     Class['keycloak::sssd'] ~> Class['keycloak::service']
   }
 
   keycloak_conn_validator { 'keycloak':
     keycloak_server => 'localhost',
     keycloak_port   => $http_port,
     use_ssl         => false,
     timeout         => 60,
     test_url        => '/auth/realms/master/.well-known/openid-configuration',
     require         => Class['keycloak::service'],
   }
 
   include keycloak::resources
 
 }
diff --git a/metadata.json b/metadata.json
index a843367..08fa314 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,85 +1,85 @@
 {
   "name": "treydock-keycloak",
   "version": "5.10.0",
   "author": "treydock",
   "summary": "Keycloak Puppet module",
   "license": "Apache-2.0",
   "source": "https://github.com/treydock/puppet-module-keycloak",
   "project_page": "https://github.com/treydock/puppet-module-keycloak",
   "issues_url": "https://github.com/treydock/puppet-module-keycloak/issues",
   "dependencies": [
     {
       "name": "puppetlabs/stdlib",
       "version_requirement": ">= 4.25.0 <7.0.0"
     },
     {
       "name": "puppetlabs/mysql",
       "version_requirement": ">= 10.2.0 <11.0.0"
     },
     {
       "name": "puppetlabs/postgresql",
       "version_requirement": ">= 6.2.0 <7.0.0"
     },
     {
       "name": "puppetlabs/java",
       "version_requirement": ">= 5.0.0 <7.0.0"
     },
     {
       "name": "puppetlabs/java_ks",
       "version_requirement": ">= 1.0.0 <4.0.0"
     },
     {
       "name": "puppet/archive",
       "version_requirement": ">= 0.5.1 <5.0.0"
     },
     {
       "name": "camptocamp/systemd",
       "version_requirement": ">= 0.4.0 <3.0.0"
     }
   ],
   "operatingsystem_support": [
     {
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
         "7",
         "8"
       ]
     },
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
         "7",
         "8"
       ]
     },
     {
       "operatingsystem": "Scientific",
       "operatingsystemrelease": [
         "7",
         "8"
       ]
     },
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
         "9",
         "10"
       ]
     },
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
         "18.04"
       ]
     }
   ],
   "requirements": [
     {
       "name": "puppet",
       "version_requirement": ">= 5.0.0 < 7.0.0"
     }
   ],
   "pdk-version": "1.14.1",
   "template-url": "https://github.com/treydock/pdk-templates.git#master",
-  "template-ref": "heads/master-0-gf5c98be"
+  "template-ref": "heads/master-0-g64aa7a6"
 }
diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb
index daebe16..e296b9a 100644
--- a/spec/classes/init_spec.rb
+++ b/spec/classes/init_spec.rb
@@ -1,190 +1,191 @@
 require 'spec_helper'
 
 describe 'keycloak' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
         facts.merge(concat_basedir: '/dne')
       end
+      let(:version) { '8.0.1' }
 
       case facts[:osfamily]
       when %r{RedHat}
         shell = '/sbin/nologin'
       when %r{Debian}
         shell = '/usr/sbin/nologin'
       end
 
       it { is_expected.to compile.with_all_deps }
 
       it { is_expected.to create_class('keycloak') }
 
       it { is_expected.to contain_class('keycloak::install').that_comes_before('Class[keycloak::config]') }
       it { is_expected.to contain_class('keycloak::config').that_comes_before('Class[keycloak::service]') }
       it { is_expected.to contain_class('keycloak::service') }
 
       context 'keycloak::install' do
         it do
           is_expected.to contain_user('keycloak').only_with(ensure: 'present',
                                                             name: 'keycloak',
                                                             forcelocal: 'true',
                                                             shell: shell,
                                                             gid: 'keycloak',
                                                             home: '/var/lib/keycloak',
                                                             managehome: 'true')
         end
       end
 
       context 'keycloak::datasource::mysql' do
         let(:pre_condition) { 'include ::mysql::server' }
         let(:params) { { datasource_driver: 'mysql' } }
 
         it { is_expected.to contain_class('keycloak::install').that_comes_before('Class[keycloak::datasource::mysql]') }
         it { is_expected.to contain_class('keycloak::datasource::mysql').that_comes_before('Class[keycloak::config]') }
 
         it do
           is_expected.to contain_mysql__db('keycloak').with(user: 'sa',
                                                             password: 'sa',
                                                             host: 'localhost',
                                                             grant: 'ALL')
         end
 
         context 'manage_datasource => false' do
           let(:params) { { datasource_driver: 'mysql', manage_datasource: false } }
 
           it { is_expected.not_to contain_mysql__db('keycloak') }
         end
       end
 
       context 'keycloak::datasource::postgresql' do
         let(:params) { { datasource_driver: 'postgresql' } }
 
         it { is_expected.to contain_class('keycloak::install').that_comes_before('Class[keycloak::datasource::postgresql]') }
         it { is_expected.to contain_class('keycloak::datasource::postgresql').that_comes_before('Class[keycloak::config]') }
 
         it do
           is_expected.to contain_postgresql__server__db('keycloak').with(user: 'sa',
                                                                          password: %r{.*})
         end
 
         context 'manage_datasource => false' do
           let(:params) { { datasource_driver: 'postgresql', manage_datasource: false } }
 
           it { is_expected.not_to contain_postgresql__server__db('keycloak') }
         end
       end
 
       context 'keycloak::config' do
         it do
           is_expected.to contain_file('kcadm-wrapper.sh').only_with(
             ensure: 'file',
-            path: '/opt/keycloak-6.0.1/bin/kcadm-wrapper.sh',
+            path: "/opt/keycloak-#{version}/bin/kcadm-wrapper.sh",
             owner: 'keycloak',
             group: 'keycloak',
             mode: '0750',
             content: %r{.*},
             show_diff: 'false',
           )
         end
 
         it do
           is_expected.to contain_exec('create-keycloak-admin')
-            .with(command: '/opt/keycloak-6.0.1/bin/add-user-keycloak.sh --user admin --password changeme --realm master && touch /opt/keycloak-6.0.1/.create-keycloak-admin-h2',
-                  creates: '/opt/keycloak-6.0.1/.create-keycloak-admin-h2',
+            .with(command: "/opt/keycloak-#{version}/bin/add-user-keycloak.sh --user admin --password changeme --realm master && touch /opt/keycloak-#{version}/.create-keycloak-admin-h2",
+                  creates: "/opt/keycloak-#{version}/.create-keycloak-admin-h2",
                   notify: 'Class[Keycloak::Service]')
         end
 
         it do
-          is_expected.to contain_file('/opt/keycloak-6.0.1/standalone/configuration').only_with(
+          is_expected.to contain_file("/opt/keycloak-#{version}/standalone/configuration").only_with(
             ensure: 'directory',
             owner: 'keycloak',
             group: 'keycloak',
             mode: '0750',
           )
         end
 
         it do
-          is_expected.to contain_file('/opt/keycloak-6.0.1/standalone/configuration/profile.properties').only_with(
+          is_expected.to contain_file("/opt/keycloak-#{version}/standalone/configuration/profile.properties").only_with(
             ensure: 'file',
             owner: 'keycloak',
             group: 'keycloak',
             mode: '0644',
             content: %r{.*},
             notify: 'Class[Keycloak::Service]',
           )
         end
 
         it do
-          verify_exact_file_contents(catalogue, '/opt/keycloak-6.0.1/standalone/configuration/profile.properties', [])
+          verify_exact_file_contents(catalogue, "/opt/keycloak-#{version}/standalone/configuration/profile.properties", [])
         end
 
         it do
-          is_expected.to contain_file('/opt/keycloak-6.0.1/config.cli').only_with(
+          is_expected.to contain_file("/opt/keycloak-#{version}/config.cli").only_with(
             ensure: 'file',
             owner: 'keycloak',
             group: 'keycloak',
             mode: '0600',
             content: %r{.*},
             notify: 'Exec[jboss-cli.sh --file=config.cli]',
             show_diff: 'false',
           )
         end
 
         it do
           is_expected.to contain_file_line('standalone.conf-JAVA_OPTS').with(
             ensure: 'absent',
-            path: '/opt/keycloak-6.0.1/bin/standalone.conf',
+            path: "/opt/keycloak-#{version}/bin/standalone.conf",
             line: 'JAVA_OPTS="$JAVA_OPTS "',
             match: '^JAVA_OPTS=',
             notify: 'Class[Keycloak::Service]',
           )
         end
 
         context 'when tech_preview_features defined' do
           let(:params) { { tech_preview_features: ['account_api'] } }
 
           it do
-            verify_exact_file_contents(catalogue, '/opt/keycloak-6.0.1/standalone/configuration/profile.properties', ['feature.account_api=enabled'])
+            verify_exact_file_contents(catalogue, "/opt/keycloak-#{version}/standalone/configuration/profile.properties", ['feature.account_api=enabled'])
           end
         end
 
         context 'when java_opts defined' do
           let(:params) { { java_opts: '-Xmx512m -Xms64m' } }
 
           it do
             is_expected.to contain_file_line('standalone.conf-JAVA_OPTS').with(
               ensure: 'present',
-              path: '/opt/keycloak-6.0.1/bin/standalone.conf',
+              path: "/opt/keycloak-#{version}/bin/standalone.conf",
               line: 'JAVA_OPTS="$JAVA_OPTS -Xmx512m -Xms64m"',
               match: '^JAVA_OPTS=',
               notify: 'Class[Keycloak::Service]',
             )
           end
 
           context 'when java_opts_append is false' do
             let(:params) { { java_opts: '-Xmx512m -Xms64m', java_opts_append: false } }
 
             it do
               is_expected.to contain_file_line('standalone.conf-JAVA_OPTS').with(
                 ensure: 'present',
-                path: '/opt/keycloak-6.0.1/bin/standalone.conf',
+                path: "/opt/keycloak-#{version}/bin/standalone.conf",
                 line: 'JAVA_OPTS="-Xmx512m -Xms64m"',
                 match: '^JAVA_OPTS=',
                 notify: 'Class[Keycloak::Service]',
               )
             end
           end
         end
       end
 
       context 'keycloak::service' do
         it do
           is_expected.to contain_service('keycloak').only_with(ensure: 'running',
                                                                enable: 'true',
                                                                name: 'keycloak',
                                                                hasstatus: 'true',
                                                                hasrestart: 'true')
         end
       end
     end # end context
   end # end on_supported_os loop
 end # end describe
diff --git a/spec/spec_helper_acceptance_setup.rb b/spec/spec_helper_acceptance_setup.rb
index 5012afb..e0f7bba 100644
--- a/spec/spec_helper_acceptance_setup.rb
+++ b/spec/spec_helper_acceptance_setup.rb
@@ -1,34 +1,34 @@
 RSpec.configure do |c|
   c.add_setting :keycloak_version
-  c.keycloak_version = (ENV['BEAKER_keycloak_version'] || '6.0.1')
+  c.keycloak_version = (ENV['BEAKER_keycloak_version'] || '8.0.1')
   c.add_setting :keycloak_full
   c.keycloak_full = (ENV['BEAKER_keycloak_full'] == 'true' || ENV['BEAKER_keycloak_full'] == 'yes')
 end
 
 hiera_yaml = <<-EOS
 ---
 version: 5
 defaults:
   datadir: data
   data_hash: yaml_data
 hierarchy:
   - name: 'os family major release'
     path: "os/%{facts.os.family}/%{facts.os.release.major}.yaml"
   - name: "Common"
     path: "common.yaml"
 EOS
 # Hack until released: https://github.com/puppetlabs/puppetlabs-mysql/pull/1264
 debian10_yaml = <<-EOS
 mysql::bindings::java_package_name: libmariadb-java
 EOS
 common_yaml = <<-EOS
 ---
 keycloak::version: '#{RSpec.configuration.keycloak_version}'
 postgresql::globals::service_status: 'service postgresql status'
 EOS
 
 create_remote_file(hosts, '/etc/puppetlabs/puppet/hiera.yaml', hiera_yaml)
 on hosts, 'mkdir -p /etc/puppetlabs/puppet/data'
 create_remote_file(hosts, '/etc/puppetlabs/puppet/data/common.yaml', common_yaml)
 on hosts, 'mkdir -p /etc/puppetlabs/puppet/data/os/Debian'
 create_remote_file(hosts, '/etc/puppetlabs/puppet/data/os/Debian/10.yaml', debian10_yaml)