diff --git a/.travis.yml b/.travis.yml
index 04d35a3..fbda6a5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ cache: bundler
 before_install:
   - bundle -v
   - rm Gemfile.lock || true
-  - gem update --system
+  - gem install "rubygems-update:<3.0.0" --no-document
   - gem update bundler
   - gem --version
   - bundle -v
diff --git a/README.md b/README.md
index e73da5a..059b78a 100644
--- a/README.md
+++ b/README.md
@@ -424,7 +424,7 @@ The following defines are typically called from an instance.
 
 ## Limitations
 
-This module is currently tested and working on RedHat and CentOS 6, and 7, Debian 8, and 9, Ubuntu 14.04, and 16.04 systems.
+This module is currently tested and working on RedHat and CentOS 6, and 7, Debian 8, and 9, Ubuntu 14.04, 16.04, and 18.04 systems.
 
 ## Development
 
diff --git a/manifests/params.pp b/manifests/params.pp
index 7bf83c1..2781230 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -13,7 +13,7 @@
       $cacert_rehash = 'c_rehash'
       $limits_config_dir = '/etc/default'
       case $::operatingsystemmajrelease {
-        '8', '9', '16.04': {
+        '8', '9', '16.04', '18.04': {
           $service_type = 'systemd'
           $ssl_version_min_support = true
         }
diff --git a/metadata.json b/metadata.json
index 1f76b8d..cfc761c 100644
--- a/metadata.json
+++ b/metadata.json
@@ -46,6 +46,7 @@
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
+        "18.04",
         "16.04",
         "14.04"
       ]
diff --git a/spec/classes/ds389_spec.rb b/spec/classes/ds389_spec.rb
index 2cd1025..dee2800 100644
--- a/spec/classes/ds389_spec.rb
+++ b/spec/classes/ds389_spec.rb
@@ -56,7 +56,7 @@
           }
 
           case os_facts[:operatingsystemmajrelease]
-          when '8', '9', '16.04'
+          when '8', '9', '16.04', '18.04'
             it {
               is_expected.to contain_ini_setting('dirsrv ulimit').with(
                 ensure: 'present',
diff --git a/spec/defines/instance_spec.rb b/spec/defines/instance_spec.rb
index 231f360..f795bc0 100644
--- a/spec/defines/instance_spec.rb
+++ b/spec/defines/instance_spec.rb
@@ -59,7 +59,7 @@
           }
 
           case os_facts[:operatingsystemmajrelease]
-          when '8', '9', '16.04'
+          when '8', '9', '16.04', '18.04'
             it {
               is_expected.to contain_exec('stop specdirectory to create new token').with(
                 command: '/bin/systemctl stop dirsrv@specdirectory ; sleep 2',
@@ -758,7 +758,7 @@
           }
 
           case os_facts[:operatingsystemmajrelease]
-          when '8', '9', '16.04'
+          when '8', '9', '16.04', '18.04'
             it {
               is_expected.to contain_exec('stop ldap01 to create new token').with(
                 command: '/bin/systemctl stop dirsrv@ldap01 ; sleep 2',
diff --git a/spec/defines/service_spec.rb b/spec/defines/service_spec.rb
index bd6d18f..4135a57 100644
--- a/spec/defines/service_spec.rb
+++ b/spec/defines/service_spec.rb
@@ -86,7 +86,7 @@
         case os_facts[:osfamily]
         when 'Debian'
           case os_facts[:operatingsystemmajrelease]
-          when '8', '9', '16.04'
+          when '8', '9', '16.04', '18.04'
             it {
               is_expected.to contain_service('dirsrv@specdirectory').with(
                 ensure: 'running',
@@ -161,7 +161,7 @@
         case os_facts[:osfamily]
         when 'Debian'
           case os_facts[:operatingsystemmajrelease]
-          when '8', '9', '16.04'
+          when '8', '9', '16.04', '18.04'
             it {
               is_expected.to contain_service('dirsrv@ldap01').with(
                 ensure: 'stopped',
diff --git a/spec/defines/ssl_spec.rb b/spec/defines/ssl_spec.rb
index abb74f5..fbb7bf5 100644
--- a/spec/defines/ssl_spec.rb
+++ b/spec/defines/ssl_spec.rb
@@ -178,7 +178,7 @@
         case os_facts[:osfamily]
         when 'Debian'
           case os_facts[:operatingsystemmajrelease]
-          when '8', '9', '16.04'
+          when '8', '9', '16.04', '18.04'
             it {
               is_expected.to contain_file('/etc/dirsrv/slapd-specdirectory/ssl.ldif').with(
                 ensure: 'file',
@@ -290,7 +290,7 @@
         case os_facts[:osfamily]
         when 'Debian'
           case os_facts[:operatingsystemmajrelease]
-          when '8', '9', '16.04'
+          when '8', '9', '16.04', '18.04'
             it {
               is_expected.to contain_file('/etc/dirsrv/slapd-ldap01/ssl.ldif').with(
                 ensure: 'file',