diff --git a/modules/puppet-fm/src/fm/manifests/db/postgresql.pp b/modules/puppet-fm/src/fm/manifests/db/postgresql.pp
index 26c272620..067eeea10 100644
--- a/modules/puppet-fm/src/fm/manifests/db/postgresql.pp
+++ b/modules/puppet-fm/src/fm/manifests/db/postgresql.pp
@@ -42,12 +42,22 @@ class fm::db::postgresql(
 
   include ::fm::deps
 
-  ::openstacklib::db::postgresql { 'fm':
-    password_hash => postgresql_password($user, $password),
-    dbname        => $dbname,
-    user          => $user,
-    encoding      => $encoding,
-    privileges    => $privileges,
+  if $::osfamily == 'Debian' {
+    ::openstacklib::db::postgresql { 'fm':
+      password   => $password,
+      dbname     => $dbname,
+      user       => $user,
+      encoding   => $encoding,
+      privileges => $privileges,
+    }
+  } else {
+    ::openstacklib::db::postgresql { 'fm':
+      password_hash => postgresql_password($user, $password),
+      dbname        => $dbname,
+      user          => $user,
+      encoding      => $encoding,
+      privileges    => $privileges,
+    }
   }
 
   Anchor['fm::db::begin']
diff --git a/modules/puppet-sysinv/src/sysinv/manifests/db/postgresql.pp b/modules/puppet-sysinv/src/sysinv/manifests/db/postgresql.pp
index 8b6685907..f6adf0c35 100644
--- a/modules/puppet-sysinv/src/sysinv/manifests/db/postgresql.pp
+++ b/modules/puppet-sysinv/src/sysinv/manifests/db/postgresql.pp
@@ -46,12 +46,22 @@ class sysinv::db::postgresql(
   $privileges = 'ALL',
 ) {
 
-  ::openstacklib::db::postgresql { 'sysinv':
-    password_hash => postgresql_password($user, $password),
-    dbname        => $dbname,
-    user          => $user,
-    encoding      => $encoding,
-    privileges    => $privileges,
+  if $::osfamily == 'Debian' {
+    ::openstacklib::db::postgresql { 'sysinv':
+      password   => $password,
+      dbname     => $dbname,
+      user       => $user,
+      encoding   => $encoding,
+      privileges => $privileges,
+    }
+  } else {
+    ::openstacklib::db::postgresql { 'sysinv':
+      password_hash => postgresql_password($user, $password),
+      dbname        => $dbname,
+      user          => $user,
+      encoding      => $encoding,
+      privileges    => $privileges,
+    }
   }
 
   ::Openstacklib::Db::Postgresql['sysinv'] ~> Service <| title == 'sysinv-api' |>