diff --git a/manifests/controller.pp b/manifests/controller.pp
index 0a993d0..1c20776 100644
--- a/manifests/controller.pp
+++ b/manifests/controller.pp
@@ -151,7 +151,7 @@ class ovn::controller (
   String[1] $opts_envvar_name,
   String $ovn_remote,
   Variant[Stdlib::IP::Address, Array[Stdlib::IP::Address]] $ovn_encap_ip,
-  String $package_ensure                                            = 'present',
+  Stdlib::Ensure::Package $package_ensure                           = present,
   Variant[Ovn::EncapType, Array[Ovn::EncapType]] $ovn_encap_type    = 'geneve',
   Optional[Stdlib::IP::Address] $ovn_encap_ip_default               = undef,
   Optional[Variant[String, Integer]] $ovn_encap_tos                 = undef,
diff --git a/manifests/northd.pp b/manifests/northd.pp
index 0cafd83..6f2d78c 100644
--- a/manifests/northd.pp
+++ b/manifests/northd.pp
@@ -92,24 +92,24 @@ class ovn::northd (
   String[1] $service_name,
   Stdlib::Absolutepath $environment_file_path,
   String[1] $opts_envvar_name,
-  String $package_ensure = 'present',
-  String $dbs_listen_ip = '0.0.0.0',
-  Optional[String] $dbs_cluster_local_addr = undef,
-  Optional[String] $dbs_cluster_remote_addr = undef,
+  Stdlib::Ensure::Package $package_ensure                    = present,
+  String $dbs_listen_ip                                      = '0.0.0.0',
+  Optional[String] $dbs_cluster_local_addr                   = undef,
+  Optional[String] $dbs_cluster_remote_addr                  = undef,
   Optional[Variant[String, Array[String]]] $ovn_northd_nb_db = undef,
   Optional[Variant[String, Array[String]]] $ovn_northd_sb_db = undef,
-  Optional[Stdlib::Absolutepath] $ovn_northd_ssl_key = undef,
-  Optional[Stdlib::Absolutepath] $ovn_northd_ssl_cert = undef,
-  Optional[Stdlib::Absolutepath] $ovn_northd_ssl_ca_cert = undef,
-  Optional[Stdlib::Absolutepath] $ovn_nb_db_ssl_key = undef,
-  Optional[Stdlib::Absolutepath] $ovn_nb_db_ssl_cert = undef,
-  Optional[Stdlib::Absolutepath] $ovn_nb_db_ssl_ca_cert = undef,
-  Optional[Stdlib::Absolutepath] $ovn_sb_db_ssl_key = undef,
-  Optional[Stdlib::Absolutepath] $ovn_sb_db_ssl_cert = undef,
-  Optional[Stdlib::Absolutepath] $ovn_sb_db_ssl_ca_cert = undef,
-  Optional[Integer[0]] $ovn_nb_db_inactivity_probe = undef,
-  Optional[Integer[0]] $ovn_sb_db_inactivity_probe = undef,
-  Array[String] $ovn_northd_extra_opts = [],
+  Optional[Stdlib::Absolutepath] $ovn_northd_ssl_key         = undef,
+  Optional[Stdlib::Absolutepath] $ovn_northd_ssl_cert        = undef,
+  Optional[Stdlib::Absolutepath] $ovn_northd_ssl_ca_cert     = undef,
+  Optional[Stdlib::Absolutepath] $ovn_nb_db_ssl_key          = undef,
+  Optional[Stdlib::Absolutepath] $ovn_nb_db_ssl_cert         = undef,
+  Optional[Stdlib::Absolutepath] $ovn_nb_db_ssl_ca_cert      = undef,
+  Optional[Stdlib::Absolutepath] $ovn_sb_db_ssl_key          = undef,
+  Optional[Stdlib::Absolutepath] $ovn_sb_db_ssl_cert         = undef,
+  Optional[Stdlib::Absolutepath] $ovn_sb_db_ssl_ca_cert      = undef,
+  Optional[Integer[0]] $ovn_nb_db_inactivity_probe           = undef,
+  Optional[Integer[0]] $ovn_sb_db_inactivity_probe           = undef,
+  Array[String] $ovn_northd_extra_opts                       = [],
 ) {
   include vswitch::ovs