diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp
index 993829ff..516f9754 100644
--- a/manifests/db/mysql.pp
+++ b/manifests/db/mysql.pp
@@ -49,7 +49,7 @@ class barbican::db::mysql(
 
   openstacklib::db::mysql { 'barbican':
     user          => $user,
-    password_hash => mysql::password($password),
+    password      => $password,
     dbname        => $dbname,
     host          => $host,
     charset       => $charset,
diff --git a/manifests/db/postgresql.pp b/manifests/db/postgresql.pp
index ecf694ef..c961511f 100644
--- a/manifests/db/postgresql.pp
+++ b/manifests/db/postgresql.pp
@@ -35,11 +35,11 @@ class barbican::db::postgresql(
   include barbican::deps
 
   openstacklib::db::postgresql { 'barbican':
-    password_hash => postgresql_password($user, $password),
-    dbname        => $dbname,
-    user          => $user,
-    encoding      => $encoding,
-    privileges    => $privileges,
+    password   => $password,
+    dbname     => $dbname,
+    user       => $user,
+    encoding   => $encoding,
+    privileges => $privileges,
   }
 
   Anchor['barbican::db::begin']
diff --git a/metadata.json b/metadata.json
index 454e0f8a..e17f0a51 100644
--- a/metadata.json
+++ b/metadata.json
@@ -13,10 +13,6 @@
             "name": "puppet/rabbitmq",
             "version_requirement": ">=8.4.0 <11.0.0"
         },
-        {
-            "name": "puppetlabs/mysql",
-            "version_requirement": ">=6.0.0 <11.0.0"
-        },
         {
             "name": "openstack/keystone",
             "version_requirement": ">=16.3.0 <17.0.0"
diff --git a/spec/classes/barbican_db_mysql_spec.rb b/spec/classes/barbican_db_mysql_spec.rb
index 8506a0ae..dcb17a0c 100644
--- a/spec/classes/barbican_db_mysql_spec.rb
+++ b/spec/classes/barbican_db_mysql_spec.rb
@@ -31,18 +31,18 @@ describe 'barbican::db::mysql' do
 
     let :params do
       {
-        'password'      => 'fooboozoo_default_password',
+        'password' => 'barbicanpass',
       }
     end
 
     describe 'with only required params' do
       it { is_expected.to contain_openstacklib__db__mysql('barbican').with(
-        'user'          => 'barbican',
-        'password_hash' => '*3DDF34A86854A312A8E2C65B506E21C91800D206',
-        'dbname'        => 'barbican',
-        'host'          => '127.0.0.1',
-        'charset'       => 'utf8',
-        :collate        => 'utf8_general_ci',
+        'user'     => 'barbican',
+        'password' => 'barbicanpass',
+        'dbname'   => 'barbican',
+        'host'     => '127.0.0.1',
+        'charset'  => 'utf8',
+        :collate   => 'utf8_general_ci',
       )}
     end
 
@@ -53,8 +53,8 @@ describe 'barbican::db::mysql' do
           :allowed_hosts  => ['127.0.0.1','%']
         }
       end
-
     end
+
     describe "overriding allowed_hosts param to string" do
       let :params do
         {
@@ -62,7 +62,6 @@ describe 'barbican::db::mysql' do
 	  :allowed_hosts  => '192.168.1.1'
         }
       end
-
     end
 
     describe "overriding allowed_hosts param equals to host param " do
@@ -72,7 +71,6 @@ describe 'barbican::db::mysql' do
            :allowed_hosts  => '127.0.0.1'
         }
       end
-
     end
   end
 
diff --git a/spec/classes/barbican_db_postgresql_spec.rb b/spec/classes/barbican_db_postgresql_spec.rb
index 444a4be1..62d71399 100644
--- a/spec/classes/barbican_db_postgresql_spec.rb
+++ b/spec/classes/barbican_db_postgresql_spec.rb
@@ -23,7 +23,7 @@ describe 'barbican::db::postgresql' do
 
   shared_examples_for 'barbican::db::postgresql' do
     let :req_params do
-      { :password => 'pw' }
+      { :password => 'barbicanpass' }
     end
 
     let :pre_condition do
@@ -35,9 +35,12 @@ describe 'barbican::db::postgresql' do
         req_params
       end
 
-      it { is_expected.to contain_postgresql__server__db('barbican').with(
-        :user     => 'barbican',
-        :password => 'md5699e09b3c7579f59869b882716fd7299'
+      it { is_expected.to contain_openstacklib__db__postgresql('barbican').with(
+        :user       => 'barbican',
+        :password   => 'barbicanpass',
+        :dbname     => 'barbican',
+        :encoding   => nil,
+        :privileges => 'ALL',
       )}
     end