diff --git a/.fixtures.yml b/.fixtures.yml
index 2b3abe6..d94a4d6 100644
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@ -1,32 +1,32 @@
 fixtures:
   repositories:
     stdlib:
       repo: https://github.com/puppetlabs/puppetlabs-stdlib.git
       ref: 4.25.0
     mysql:
       repo: https://github.com/puppetlabs/puppetlabs-mysql.git
       ref: v10.2.0
     postgresql:
       repo: https://github.com/puppetlabs/puppetlabs-postgresql.git
-      ref: v6.2.0
+      ref: v6.4.0
     java:
       repo: https://github.com/puppetlabs/puppetlabs-java.git
       ref: v5.0.0
     java_ks:
       repo: https://github.com/puppetlabs/puppetlabs-java_ks.git
       ref: 1.4.1
     archive:
       repo: https://github.com/voxpupuli/puppet-archive.git
       ref: v0.5.1
     systemd:
       repo: https://github.com/camptocamp/puppet-systemd.git
       ref: 0.4.0
     yumrepo_core:
       repo: https://github.com/puppetlabs/puppetlabs-yumrepo_core.git
       puppet_version: ">= 6.0.0"
     apt:
       repo: https://github.com/puppetlabs/puppetlabs-apt.git
     concat:
       repo: https://github.com/puppetlabs/puppetlabs-concat.git
   symlinks:
     keycloak: "#{source_dir}"
diff --git a/manifests/datasource/postgresql.pp b/manifests/datasource/postgresql.pp
index ac3fd18..ae19fbc 100644
--- a/manifests/datasource/postgresql.pp
+++ b/manifests/datasource/postgresql.pp
@@ -1,50 +1,50 @@
 # @summary Manage postgresql datasource
 #
 # @api private
 class keycloak::datasource::postgresql {
   assert_private()
 
   $jar_source = pick($keycloak::datasource_jar_source, $keycloak::postgresql_jar_source)
   $module_source = pick($keycloak::datasource_module_source, 'puppet:///modules/keycloak/database/postgresql/module.xml')
   $module_dir = "${keycloak::install_base}/modules/system/layers/keycloak/org/postgresql/main"
 
   include ::postgresql::lib::java
 
   exec { "mkdir -p ${module_dir}":
     path    => '/usr/bin:/bin',
     creates => $module_dir,
     user    => $keycloak::user,
     group   => $keycloak::group,
   }
   -> file { $module_dir:
     ensure => 'directory',
     owner  => $keycloak::user,
     group  => $keycloak::group,
     mode   => '0755',
   }
 
   file { "${module_dir}/postgresql-jdbc.jar":
     ensure  => 'file',
     source  => $jar_source,
     owner   => $keycloak::user,
     group   => $keycloak::group,
     mode    => '0644',
     require => Class['postgresql::lib::java'],
   }
 
   file { "${$module_dir}/module.xml":
     ensure => 'file',
     source => $module_source,
     owner  => $keycloak::user,
     group  => $keycloak::group,
     mode   => '0644',
   }
 
   if $keycloak::manage_datasource {
     include ::postgresql::server
     postgresql::server::db { $keycloak::datasource_dbname:
       user     => $keycloak::datasource_username,
-      password => postgresql_password($keycloak::datasource_username, $keycloak::datasource_password),
+      password => postgresql::postgresql_password($keycloak::datasource_username, $keycloak::datasource_password),
     }
   }
 }
diff --git a/metadata.json b/metadata.json
index 8b0d012..c1a6231 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,85 +1,85 @@
 {
   "name": "treydock-keycloak",
   "version": "6.12.0",
   "author": "treydock",
   "summary": "Keycloak Puppet module",
   "license": "Apache-2.0",
   "source": "https://github.com/treydock/puppet-module-keycloak",
   "project_page": "https://github.com/treydock/puppet-module-keycloak",
   "issues_url": "https://github.com/treydock/puppet-module-keycloak/issues",
   "dependencies": [
     {
       "name": "puppetlabs/stdlib",
       "version_requirement": ">= 4.25.0 <7.0.0"
     },
     {
       "name": "puppetlabs/mysql",
       "version_requirement": ">= 10.2.0 <11.0.0"
     },
     {
       "name": "puppetlabs/postgresql",
-      "version_requirement": ">= 6.2.0 <7.0.0"
+      "version_requirement": ">= 6.4.0 <7.0.0"
     },
     {
       "name": "puppetlabs/java",
       "version_requirement": ">= 5.0.0 <7.0.0"
     },
     {
       "name": "puppetlabs/java_ks",
       "version_requirement": ">= 1.0.0 <4.0.0"
     },
     {
       "name": "puppet/archive",
       "version_requirement": ">= 0.5.1 <5.0.0"
     },
     {
       "name": "camptocamp/systemd",
       "version_requirement": ">= 0.4.0 <3.0.0"
     }
   ],
   "operatingsystem_support": [
     {
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
         "7",
         "8"
       ]
     },
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
         "7",
         "8"
       ]
     },
     {
       "operatingsystem": "Scientific",
       "operatingsystemrelease": [
         "7",
         "8"
       ]
     },
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
         "9",
         "10"
       ]
     },
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
         "18.04"
       ]
     }
   ],
   "requirements": [
     {
       "name": "puppet",
       "version_requirement": ">= 5.0.0 < 7.0.0"
     }
   ],
   "pdk-version": "1.17.0",
   "template-url": "https://github.com/treydock/pdk-templates.git#master",
   "template-ref": "heads/master-0-g58023b5"
 }