diff --git a/site-cookbooks/kosmos-ejabberd/recipes/default.rb b/site-cookbooks/kosmos-ejabberd/recipes/default.rb
index 45a3e99..b3070ba 100644
--- a/site-cookbooks/kosmos-ejabberd/recipes/default.rb
+++ b/site-cookbooks/kosmos-ejabberd/recipes/default.rb
@@ -47,25 +47,17 @@ dpkg_package "ejabberd" do
   notifies :create, "file[/lib/systemd/system/ejabberd.service]", :immediately
 end
 
-postgresql_connection_info = {
-    host:     '127.0.0.1',
-    port:     5432,
-    username: 'postgres',
-    password: node['postgresql']['password']['postgres']
-}
+postgresql_data_bag_item = data_bag_item('credentials', 'postgresql')
 
-postgresql_database 'ejabberd' do
-  connection postgresql_connection_info
+postgresql_user 'ejabberd' do
   action :create
-  notifies :run, "execute[create db schema]", :delayed
+  password postgresql_data_bag_item['ejabberd_user_password']
 end
 
-postgresql_database_user 'ejabberd' do
-  connection postgresql_connection_info
-  password   'super_secret'
-  database_name 'ejabberd'
-  privileges    [:all]
-  action     [:create, :grant]
+postgresql_database 'ejabberd' do
+  owner 'ejabberd'
+  action :create
+  notifies :run, "execute[create db schema]", :delayed
 end
 
 execute "create db schema" do
@@ -78,7 +70,7 @@ template "/opt/ejabberd/conf/ejabberd.yml" do
   source    "ejabberd.yml.erb"
   mode      0640
   sensitive true
-  variables pgsql_password: "super_secret"
+  variables pgsql_password: postgresql_data_bag_item['ejabberd_user_password']
   notifies :run, "execute[ejabberdctl reload_config]", :delayed
 end