diff --git a/README.md b/README.md
index e1c7210..fe16561 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ Manage [Open OnDemand](http://openondemand.org/) installation and configuration.
 
 The following are the versions of this module and the supported versions of Open OnDemand:
 
-* Module 5.x supports Open OnDemand 3.1 and 3.0
+* Module 5.x and 6.x supports Open OnDemand 3.1 and 3.0
 * Module 3.x and 4.x supports Open OnDemand 3.0
 * Module 2.x supports Open OnDemand 2.x
 * Module 1.x supports Open OnDemand 1.18.x
diff --git a/manifests/cluster.pp b/manifests/cluster.pp
index de21489..ffea831 100644
--- a/manifests/cluster.pp
+++ b/manifests/cluster.pp
@@ -330,7 +330,7 @@
   if $source {
     $content = undef
   } else {
-    $content = to_yaml($config)
+    $content = stdlib::to_yaml($config)
   }
 
   file { "/etc/ood/config/clusters.d/${name}.yml":
diff --git a/manifests/conf.pp b/manifests/conf.pp
index 0cdf874..5c4d707 100644
--- a/manifests/conf.pp
+++ b/manifests/conf.pp
@@ -36,7 +36,7 @@
   if $data {
     $_content = join([
         '# File managed by Puppet - DO NOT EDIT',
-        to_yaml($data, { 'line_width' => -1 }),
+        stdlib::to_yaml($data, { 'line_width' => -1 }),
         '',
     ], "\n")
   } elsif $content_template {
diff --git a/manifests/init.pp b/manifests/init.pp
index 39af7cb..5d08504 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -582,7 +582,7 @@
     'dex_uri'                          => $dex_uri,
     'dex'                              => $_dex_config,
   }.filter |$key, $value| { $value =~ NotUndef }
-  $ood_portal_yaml = to_yaml($ood_portal_config)
+  $ood_portal_yaml = stdlib::to_yaml($ood_portal_config)
   $base_apps = {
     'dashboard' => { 'package' => 'ondemand', 'manage_package' => false },
     'shell' => { 'package' => 'ondemand', 'manage_package' => false },
diff --git a/metadata.json b/metadata.json
index 614d6a8..229bda1 100644
--- a/metadata.json
+++ b/metadata.json
@@ -10,7 +10,7 @@
   "dependencies": [
     {
       "name": "puppetlabs/stdlib",
-      "version_requirement": ">= 4.25.0 < 10.0.0"
+      "version_requirement": ">= 9.0.0 < 10.0.0"
     },
     {
       "name": "puppetlabs/apt",
@@ -38,7 +38,7 @@
     },
     {
       "name": "puppet/systemd",
-      "version_requirement": ">= 0.4.0 <7.0.0"
+      "version_requirement": ">= 0.4.0 <8.0.0"
     },
     {
       "name": "puppet/epel",