diff --git a/manifests/api.pp b/manifests/api.pp
index ad3d669..11eb8d5 100644
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -41,14 +41,14 @@
 #   Defaults to $facts['os_service_default'].
 #
 class vitrage::api (
-  Boolean $manage_service       = true,
-  Boolean $enabled              = true,
-  $package_ensure               = 'present',
-  $host                         = '0.0.0.0',
-  $port                         = '8999',
-  $service_name                 = $vitrage::params::api_service_name,
-  $enable_proxy_headers_parsing = $facts['os_service_default'],
-  $max_request_body_size        = $facts['os_service_default'],
+  Boolean $manage_service                 = true,
+  Boolean $enabled                        = true,
+  Stdlib::Ensure::Package $package_ensure = 'present',
+  $host                                   = '0.0.0.0',
+  $port                                   = '8999',
+  $service_name                           = $vitrage::params::api_service_name,
+  $enable_proxy_headers_parsing           = $facts['os_service_default'],
+  $max_request_body_size                  = $facts['os_service_default'],
 ) inherits vitrage::params {
   include vitrage::deps
   include vitrage::policy
diff --git a/manifests/client.pp b/manifests/client.pp
index b5e0d52..817e7d8 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -7,7 +7,7 @@
 #   Defaults to 'present'
 #
 class vitrage::client (
-  $ensure = 'present'
+  Stdlib::Ensure::Package $ensure = 'present',
 ) {
   include vitrage::deps
   include vitrage::params
diff --git a/manifests/graph.pp b/manifests/graph.pp
index 88fed49..bd6d449 100644
--- a/manifests/graph.pp
+++ b/manifests/graph.pp
@@ -14,9 +14,9 @@
 #    Defaults to 'present'
 #
 class vitrage::graph (
-  Boolean $manage_service = true,
-  Boolean $enabled        = true,
-  $package_ensure         = 'present',
+  Boolean $manage_service                 = true,
+  Boolean $enabled                        = true,
+  Stdlib::Ensure::Package $package_ensure = 'present',
 ) {
   include vitrage::deps
   include vitrage::params
diff --git a/manifests/init.pp b/manifests/init.pp
index 87a29db..3f44809 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -167,39 +167,39 @@
 #   Defaults to $facts['os_service_default']
 #
 class vitrage (
-  $package_ensure                     = 'present',
-  $default_transport_url              = $facts['os_service_default'],
-  $rpc_response_timeout               = $facts['os_service_default'],
-  $control_exchange                   = $facts['os_service_default'],
-  $rabbit_use_ssl                     = $facts['os_service_default'],
-  $rabbit_heartbeat_timeout_threshold = $facts['os_service_default'],
-  $rabbit_heartbeat_rate              = $facts['os_service_default'],
-  $rabbit_ha_queues                   = $facts['os_service_default'],
-  $rabbit_quorum_queue                = $facts['os_service_default'],
-  $rabbit_transient_queues_ttl        = $facts['os_service_default'],
-  $rabbit_transient_quorum_queue      = $facts['os_service_default'],
-  $rabbit_quorum_delivery_limit       = $facts['os_service_default'],
-  $rabbit_quorum_max_memory_length    = $facts['os_service_default'],
-  $rabbit_quorum_max_memory_bytes     = $facts['os_service_default'],
-  $rabbit_use_queue_manager           = $facts['os_service_default'],
-  $rabbit_stream_fanout               = $facts['os_service_default'],
-  $rabbit_enable_cancel_on_failover   = $facts['os_service_default'],
-  $kombu_ssl_ca_certs                 = $facts['os_service_default'],
-  $kombu_ssl_certfile                 = $facts['os_service_default'],
-  $kombu_ssl_keyfile                  = $facts['os_service_default'],
-  $kombu_ssl_version                  = $facts['os_service_default'],
-  $kombu_reconnect_delay              = $facts['os_service_default'],
-  $kombu_failover_strategy            = $facts['os_service_default'],
-  $kombu_compression                  = $facts['os_service_default'],
-  $amqp_durable_queues                = $facts['os_service_default'],
-  $amqp_auto_delete                   = $facts['os_service_default'],
-  $notification_transport_url         = $facts['os_service_default'],
-  $notification_driver                = $facts['os_service_default'],
-  $notification_topics                = $facts['os_service_default'],
-  $notification_retry                 = $facts['os_service_default'],
-  Boolean $purge_config               = false,
-  $snapshots_interval                 = $facts['os_service_default'],
-  $types                              = $facts['os_service_default'],
+  Stdlib::Ensure::Package $package_ensure = 'present',
+  $default_transport_url                  = $facts['os_service_default'],
+  $rpc_response_timeout                   = $facts['os_service_default'],
+  $control_exchange                       = $facts['os_service_default'],
+  $rabbit_use_ssl                         = $facts['os_service_default'],
+  $rabbit_heartbeat_timeout_threshold     = $facts['os_service_default'],
+  $rabbit_heartbeat_rate                  = $facts['os_service_default'],
+  $rabbit_ha_queues                       = $facts['os_service_default'],
+  $rabbit_quorum_queue                    = $facts['os_service_default'],
+  $rabbit_transient_queues_ttl            = $facts['os_service_default'],
+  $rabbit_transient_quorum_queue          = $facts['os_service_default'],
+  $rabbit_quorum_delivery_limit           = $facts['os_service_default'],
+  $rabbit_quorum_max_memory_length        = $facts['os_service_default'],
+  $rabbit_quorum_max_memory_bytes         = $facts['os_service_default'],
+  $rabbit_use_queue_manager               = $facts['os_service_default'],
+  $rabbit_stream_fanout                   = $facts['os_service_default'],
+  $rabbit_enable_cancel_on_failover       = $facts['os_service_default'],
+  $kombu_ssl_ca_certs                     = $facts['os_service_default'],
+  $kombu_ssl_certfile                     = $facts['os_service_default'],
+  $kombu_ssl_keyfile                      = $facts['os_service_default'],
+  $kombu_ssl_version                      = $facts['os_service_default'],
+  $kombu_reconnect_delay                  = $facts['os_service_default'],
+  $kombu_failover_strategy                = $facts['os_service_default'],
+  $kombu_compression                      = $facts['os_service_default'],
+  $amqp_durable_queues                    = $facts['os_service_default'],
+  $amqp_auto_delete                       = $facts['os_service_default'],
+  $notification_transport_url             = $facts['os_service_default'],
+  $notification_driver                    = $facts['os_service_default'],
+  $notification_topics                    = $facts['os_service_default'],
+  $notification_retry                     = $facts['os_service_default'],
+  Boolean $purge_config                   = false,
+  $snapshots_interval                     = $facts['os_service_default'],
+  $types                                  = $facts['os_service_default'],
 ) inherits vitrage::params {
   include vitrage::deps
 
diff --git a/manifests/notifier.pp b/manifests/notifier.pp
index c86a4d8..a15be6b 100644
--- a/manifests/notifier.pp
+++ b/manifests/notifier.pp
@@ -18,10 +18,10 @@
 #    Defaults to $facts['os_service_default'].
 #
 class vitrage::notifier (
-  Boolean $manage_service = true,
-  Boolean $enabled        = true,
-  $package_ensure         = 'present',
-  $notifiers              = $facts['os_service_default'],
+  Boolean $manage_service                 = true,
+  Boolean $enabled                        = true,
+  Stdlib::Ensure::Package $package_ensure = 'present',
+  $notifiers                              = $facts['os_service_default'],
 ) {
   include vitrage::deps
   include vitrage::params
diff --git a/manifests/persistor.pp b/manifests/persistor.pp
index 52327a8..d688bc8 100644
--- a/manifests/persistor.pp
+++ b/manifests/persistor.pp
@@ -14,9 +14,9 @@
 #    Defaults to 'present'
 #
 class vitrage::persistor (
-  Boolean $manage_service = true,
-  Boolean $enabled        = true,
-  $package_ensure         = 'present',
+  Boolean $manage_service                 = true,
+  Boolean $enabled                        = true,
+  Stdlib::Ensure::Package $package_ensure = 'present',
 ) {
   include vitrage::deps
   include vitrage::params
diff --git a/metadata.json b/metadata.json
index 9ef4b01..127590c 100644
--- a/metadata.json
+++ b/metadata.json
@@ -47,7 +47,7 @@
         },
         {
             "name": "puppetlabs/stdlib",
-            "version_requirement": ">= 5.0.0 <10.0.0"
+            "version_requirement": ">= 9.0.0 <10.0.0"
         },
         {
             "name": "openstack/openstacklib",