diff --git a/manifests/globals.pp b/manifests/globals.pp
index 371e30cca3..ddd9353a73 100644
--- a/manifests/globals.pp
+++ b/manifests/globals.pp
@@ -133,11 +133,11 @@
 
   Optional[Boolean] $pg_hba_conf_defaults          = undef,
 
-  Optional[String[1]] $datadir                     = undef,
-  Optional[String[1]] $confdir                     = undef,
-  Optional[String[1]] $bindir                      = undef,
-  Optional[String[1]] $xlogdir                     = undef,
-  Optional[String[1]] $logdir                      = undef,
+  Optional[Stdlib::Absolutepath] $datadir          = undef,
+  Optional[Stdlib::Absolutepath] $confdir          = undef,
+  Optional[Stdlib::Absolutepath] $bindir           = undef,
+  Optional[Stdlib::Absolutepath] $xlogdir          = undef,
+  Optional[Stdlib::Absolutepath] $logdir           = undef,
   Optional[String[1]] $log_line_prefix             = undef,
   Optional[Boolean] $manage_datadir                = undef,
   Optional[Boolean] $manage_logdir                 = undef,
@@ -167,7 +167,7 @@
 
   Optional[Boolean] $manage_package_repo           = undef,
   Boolean $manage_dnf_module                       = false,
-  Optional[String[1]] $module_workdir              = undef,
+  Optional[Stdlib::Absolutepath] $module_workdir   = undef,
 ) {
   # We are determining this here, because it is needed by the package repo
   # class.
diff --git a/manifests/server.pp b/manifests/server.pp
index 4cf601cbda..fcd31bfce7 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -146,9 +146,9 @@
   Optional[Stdlib::Filemode]                         $postgresql_conf_mode         = $postgresql::params::postgresql_conf_mode,
   Stdlib::Absolutepath                               $recovery_conf_path           = $postgresql::params::recovery_conf_path,
 
-  String[1]                                          $datadir                      = $postgresql::params::datadir,
-  Optional[String[1]]                                $xlogdir                      = $postgresql::params::xlogdir,
-  Optional[String[1]]                                $logdir                       = $postgresql::params::logdir,
+  Stdlib::Absolutepath                               $datadir                      = $postgresql::params::datadir,
+  Optional[Stdlib::Absolutepath]                     $xlogdir                      = $postgresql::params::xlogdir,
+  Optional[Stdlib::Absolutepath]                     $logdir                       = $postgresql::params::logdir,
 
   Optional[String[1]]                                $log_line_prefix              = $postgresql::params::log_line_prefix,
 
@@ -173,7 +173,7 @@
   Boolean                                            $manage_recovery_conf         = $postgresql::params::manage_recovery_conf,
   Boolean                                            $manage_postgresql_conf_perms = $postgresql::params::manage_postgresql_conf_perms,
   Boolean                                            $manage_selinux               = $postgresql::params::manage_selinux,
-  String[1]                                          $module_workdir               = $postgresql::params::module_workdir,
+  Stdlib::Absolutepath                               $module_workdir               = $postgresql::params::module_workdir,
 
   Boolean                                            $manage_datadir               = $postgresql::params::manage_datadir,
   Boolean                                            $manage_logdir                = $postgresql::params::manage_logdir,
diff --git a/manifests/server/instance/config.pp b/manifests/server/instance/config.pp
index 3c05c03e9f..4b049a8a00 100644
--- a/manifests/server/instance/config.pp
+++ b/manifests/server/instance/config.pp
@@ -64,8 +64,8 @@
   Boolean                                        $manage_pg_ident_conf         = $postgresql::server::manage_pg_ident_conf,
   Boolean                                        $manage_recovery_conf         = $postgresql::server::manage_recovery_conf,
   Boolean                                        $manage_postgresql_conf_perms = $postgresql::server::manage_postgresql_conf_perms,
-  String[1]                                      $datadir                      = $postgresql::server::datadir,
-  Optional[String[1]]                            $logdir                       = $postgresql::server::logdir,
+  Stdlib::Absolutepath                           $datadir                      = $postgresql::server::datadir,
+  Optional[Stdlib::Absolutepath]                 $logdir                       = $postgresql::server::logdir,
   String[1]                                      $service_name                 = $postgresql::server::service_name,
   Boolean                                        $service_enable               = $postgresql::server::service_enable,
   Optional[String[1]]                            $log_line_prefix              = $postgresql::server::log_line_prefix,
diff --git a/manifests/server/instance/initdb.pp b/manifests/server/instance/initdb.pp
index 397a10c20c..87ee475c63 100644
--- a/manifests/server/instance/initdb.pp
+++ b/manifests/server/instance/initdb.pp
@@ -29,21 +29,21 @@
   Optional[String[1]]                      $auth_host      = $postgresql::server::auth_host,
   Optional[String[1]]                      $auth_local     = $postgresql::server::auth_local,
   Optional[Boolean]                        $data_checksums = $postgresql::server::data_checksums,
-  String[1]                                $datadir        = $postgresql::server::datadir,
+  Stdlib::Absolutepath                     $datadir        = $postgresql::server::datadir,
   Optional[String[1]]                      $encoding       = $postgresql::server::encoding,
   String[1]                                $group          = $postgresql::server::group,
   Stdlib::Absolutepath                     $initdb_path    = $postgresql::server::initdb_path,
   Optional[String[1]]                      $lc_messages    = $postgresql::server::lc_messages,
   Optional[String[1]]                      $locale         = $postgresql::server::locale,
-  Optional[String[1]]                      $logdir         = $postgresql::server::logdir,
+  Optional[Stdlib::Absolutepath]           $logdir         = $postgresql::server::logdir,
   Boolean                                  $manage_datadir = $postgresql::server::manage_datadir,
   Boolean                                  $manage_logdir  = $postgresql::server::manage_logdir,
   Boolean                                  $manage_xlogdir = $postgresql::server::manage_xlogdir,
-  String[1]                                $module_workdir = $postgresql::server::module_workdir,
+  Stdlib::Absolutepath                     $module_workdir = $postgresql::server::module_workdir,
   Boolean                                  $needs_initdb   = $postgresql::server::needs_initdb,
   String[1]                                $user           = $postgresql::server::user,
   Optional[String[1]]                      $username       = $postgresql::server::username,
-  Optional[String[1]]                      $xlogdir        = $postgresql::server::xlogdir,
+  Optional[Stdlib::Absolutepath]           $xlogdir        = $postgresql::server::xlogdir,
 ) {
   if $facts['os']['family'] == 'RedHat' and $facts['os']['selinux']['enabled'] == true {
     $seltype = 'postgresql_db_t'
diff --git a/manifests/server/instance/late_initdb.pp b/manifests/server/instance/late_initdb.pp
index d864ff9065..05a93f81a6 100644
--- a/manifests/server/instance/late_initdb.pp
+++ b/manifests/server/instance/late_initdb.pp
@@ -17,7 +17,7 @@
   String[1]                                 $group          = $postgresql::server::group,
   Stdlib::Absolutepath                      $psql_path      = $postgresql::server::psql_path,
   Stdlib::Port                              $port           = $postgresql::server::port,
-  String[1]                                 $module_workdir = $postgresql::server::module_workdir,
+  Stdlib::Absolutepath                      $module_workdir = $postgresql::server::module_workdir,
 ) {
   # Set the defaults for the postgresql_psql resource
   Postgresql_psql {
diff --git a/manifests/server/instance/passwd.pp b/manifests/server/instance/passwd.pp
index 4c4c22f926..e539b7a69c 100644
--- a/manifests/server/instance/passwd.pp
+++ b/manifests/server/instance/passwd.pp
@@ -19,7 +19,7 @@
   Stdlib::Absolutepath                                        $psql_path         = $postgresql::server::psql_path,
   Stdlib::Port                                                $port              = $postgresql::server::port,
   String[1]                                                   $database          = $postgresql::server::default_database,
-  String[1]                                                   $module_workdir    = $postgresql::server::module_workdir,
+  Stdlib::Absolutepath                                        $module_workdir    = $postgresql::server::module_workdir,
   Optional[Variant[String[1], Sensitive[String[1]], Integer]] $postgres_password = $postgresql::server::postgres_password,
 ) {
   $real_postgres_password = if $postgres_password =~ Sensitive {