diff --git a/deployment/puppet/cinder/manifests/db/postgresql.pp b/deployment/puppet/cinder/manifests/db/postgresql.pp
index 52aa15bb7e..1609fc4356 100644
--- a/deployment/puppet/cinder/manifests/db/postgresql.pp
+++ b/deployment/puppet/cinder/manifests/db/postgresql.pp
@@ -10,10 +10,10 @@ class cinder::db::postgresql(
 
   require postgresql::python
 
-  Postgresql::Db[$dbname]    ~> Exec<| title == 'cinder-manage db_sync' |>
+  Postgresql::Server::Db[$dbname]    ~> Exec<| title == 'cinder-manage db_sync' |>
   Package['python-psycopg2'] -> Exec<| title == 'cinder-manage db_sync' |>
 
-  postgresql::db { $dbname:
+  postgresql::server::db { $dbname:
     user      =>  $user,
     password  =>  $password,
   }
diff --git a/deployment/puppet/glance/manifests/db/postgresql.pp b/deployment/puppet/glance/manifests/db/postgresql.pp
index a1eb54c63b..d063f234aa 100644
--- a/deployment/puppet/glance/manifests/db/postgresql.pp
+++ b/deployment/puppet/glance/manifests/db/postgresql.pp
@@ -10,10 +10,10 @@ class glance::db::postgresql(
 
   require postgresql::python
 
-  Postgresql::Db[$dbname] ~> Exec<| title == 'glance-manage db_sync' |>
+  Postgresql::Server::Db[$dbname] ~> Exec<| title == 'glance-manage db_sync' |>
   Package['python-psycopg2'] -> Exec<| title == 'glance-manage db_sync' |>
 
-  postgresql::db { $dbname:
+  postgresql::server::db { $dbname:
     user      =>  $user,
     password  =>  $password,
   }
diff --git a/deployment/puppet/keystone/manifests/db/postgresql.pp b/deployment/puppet/keystone/manifests/db/postgresql.pp
index 5444cde514..a59e51eac7 100644
--- a/deployment/puppet/keystone/manifests/db/postgresql.pp
+++ b/deployment/puppet/keystone/manifests/db/postgresql.pp
@@ -42,11 +42,11 @@ class keystone::db::postgresql(
   Class['keystone::db::postgresql'] -> Exec<| title == 'keystone-manage db_sync' |>
   #require 'postgresql::python'
 
-   postgresql::db { "${dbname}":
+   postgresql::server::db { "${dbname}":
       user     =>  "${user}",
       password  =>  "${password}",
    }
 
-  Postgresql::Db[$dbname] ~> Exec<| title == 'keystone-manage db_sync' |>
+  Postgresql::Server::Db[$dbname] ~> Exec<| title == 'keystone-manage db_sync' |>
 
 }
diff --git a/deployment/puppet/nailgun/examples/astute-only.pp b/deployment/puppet/nailgun/examples/astute-only.pp
index 1c73e766c9..d7fa9c3925 100644
--- a/deployment/puppet/nailgun/examples/astute-only.pp
+++ b/deployment/puppet/nailgun/examples/astute-only.pp
@@ -18,7 +18,7 @@ if $production == 'prod'{
 }
 
 # this replaces removed postgresql version fact
-$postgres_default_version = '8.4'
+$postgres_default_version = '9.3'
 
 $mco_host = $::fuel_settings['ADMIN_NETWORK']['ipaddress']
 $mco_pskey = "unset"
diff --git a/deployment/puppet/nailgun/examples/cobbler-only.pp b/deployment/puppet/nailgun/examples/cobbler-only.pp
index b301b5321d..0a5709f8d1 100644
--- a/deployment/puppet/nailgun/examples/cobbler-only.pp
+++ b/deployment/puppet/nailgun/examples/cobbler-only.pp
@@ -11,7 +11,7 @@ if $production {
 }
 
 # this replaces removed postgresql version fact
-$postgres_default_version = '8.4'
+$postgres_default_version = '9.3'
 
 node default {
 
diff --git a/deployment/puppet/nailgun/examples/nginx-only.pp b/deployment/puppet/nailgun/examples/nginx-only.pp
index b612b068de..fb6882edf3 100644
--- a/deployment/puppet/nailgun/examples/nginx-only.pp
+++ b/deployment/puppet/nailgun/examples/nginx-only.pp
@@ -13,7 +13,7 @@ $env_path = "/usr"
 $staticdir = "/usr/share/nailgun/static"
 
 # this replaces removed postgresql version fact
-$postgres_default_version = '8.4'
+$postgres_default_version = '9.3'
 
 $centos_repos =
 [
diff --git a/deployment/puppet/nailgun/examples/ostf-only.pp b/deployment/puppet/nailgun/examples/ostf-only.pp
index 84a597a3e0..0bef680e05 100644
--- a/deployment/puppet/nailgun/examples/ostf-only.pp
+++ b/deployment/puppet/nailgun/examples/ostf-only.pp
@@ -18,7 +18,7 @@ if $production == 'prod'{
 }
 
 # this replaces removed postgresql version fact
-$postgres_default_version = '8.4'
+$postgres_default_version = '9.3'
 
 
 node default {
diff --git a/deployment/puppet/nailgun/examples/postgres-only.pp b/deployment/puppet/nailgun/examples/postgres-only.pp
index 808d965c4f..65087f27b7 100644
--- a/deployment/puppet/nailgun/examples/postgres-only.pp
+++ b/deployment/puppet/nailgun/examples/postgres-only.pp
@@ -1,13 +1,17 @@
 $fuel_settings = parseyaml($astute_settings_yaml)
 
-$postgres_default_version = '8.4'
+$postgres_default_version = '9.3'
 
 # install and configure postgresql server
+class { 'postgresql::globals':
+  version             => $postgres_default_version,
+  bindir              => "/usr/pgsql-${postgres_default_version}/bin",
+  server_package_name => "postgresql-server",
+  client_package_name => "postgresql",
+}
 class { 'postgresql::server':
-  config_hash => {
-    'ip_mask_allow_all_users' => '0.0.0.0/0',
-    'listen_addresses'        => '0.0.0.0',
-  },
+  listen_addresses        => '0.0.0.0',
+  ip_mask_allow_all_users => '0.0.0.0/0',
 }
 
 # nailgun db and grants
@@ -30,7 +34,7 @@ $keystone_dbname   = $::fuel_settings['postgres']['keystone_dbname']
 $keystone_dbuser   = $::fuel_settings['postgres']['keystone_user']
 $keystone_dbpass   = $::fuel_settings['postgres']['keystone_password']
 
-postgresql::db { $keystone_dbname:
+postgresql::server::db { $keystone_dbname:
   user     => $keystone_dbuser,
   password => $keystone_dbpass,
   grant    => 'all',
@@ -42,10 +46,9 @@ $ostf_dbname   = $::fuel_settings['postgres']['ostf_dbname']
 $ostf_dbuser   = $::fuel_settings['postgres']['ostf_user']
 $ostf_dbpass   = $::fuel_settings['postgres']['ostf_password']
 
-postgresql::db { $ostf_dbname:
+postgresql::server::db { $ostf_dbname:
   user     => $ostf_dbuser,
   password => $ostf_dbpass,
   grant    => 'all',
   require => Class['::postgresql::server'],
 }
-
diff --git a/deployment/puppet/nailgun/examples/puppetsync-only.pp b/deployment/puppet/nailgun/examples/puppetsync-only.pp
index bd63e85524..642b151725 100644
--- a/deployment/puppet/nailgun/examples/puppetsync-only.pp
+++ b/deployment/puppet/nailgun/examples/puppetsync-only.pp
@@ -18,7 +18,7 @@ if $production == 'prod'{
 }
 
 # this replaces removed postgresql version fact
-$postgres_default_version = '8.4'
+$postgres_default_version = '9.3'
 
 
 node default {
diff --git a/deployment/puppet/nailgun/examples/site.pp b/deployment/puppet/nailgun/examples/site.pp
index 6c4ba612e9..dcf6b67b12 100644
--- a/deployment/puppet/nailgun/examples/site.pp
+++ b/deployment/puppet/nailgun/examples/site.pp
@@ -12,7 +12,7 @@ $env_path = "/usr"
 $staticdir = "/usr/share/nailgun/static"
 
 # this replaces removed postgresql version fact
-$postgres_default_version = '8.4'
+$postgres_default_version = '9.3'
 
 node default {
 
diff --git a/deployment/puppet/nailgun/manifests/database.pp b/deployment/puppet/nailgun/manifests/database.pp
index e3429a8166..202e2842f2 100644
--- a/deployment/puppet/nailgun/manifests/database.pp
+++ b/deployment/puppet/nailgun/manifests/database.pp
@@ -3,7 +3,7 @@ class nailgun::database(
   $password,
   $dbname,
   ){
-  postgresql::db{ $dbname:
+  postgresql::server::db{ $dbname:
     user     => $user,
     password => $password,
     grant    => 'all',
diff --git a/deployment/puppet/nailgun/manifests/ostf.pp b/deployment/puppet/nailgun/manifests/ostf.pp
index aa4a9e7d91..a1ee05be03 100644
--- a/deployment/puppet/nailgun/manifests/ostf.pp
+++ b/deployment/puppet/nailgun/manifests/ostf.pp
@@ -21,7 +21,7 @@ class nailgun::ostf(
   package{'libevent-devel':}
   package{'openssl-devel':}
   if $production !~ /docker/ {
-    postgresql::db{ $dbname:
+    postgresql::server::db{ $dbname:
       user     => $dbuser,
       password => $dbpass,
       grant    => 'all',
@@ -38,7 +38,7 @@ class nailgun::ostf(
         tries     => 50,
         try_sleep => 5,
       }
-      Postgresql::Db<| title == $dbname|> ->
+      Postgresql::Server::Db<| title == $dbname|> ->
       Exec['ostf-init'] -> Class['nailgun::supervisor']
       Package["fuel-ostf"] -> Exec['ostf-init']
       File["/etc/ostf/ostf.conf"] -> Exec['ostf-init']
diff --git a/deployment/puppet/nova/manifests/db/postgresql.pp b/deployment/puppet/nova/manifests/db/postgresql.pp
index e6b7a49c9a..cc8d08421b 100644
--- a/deployment/puppet/nova/manifests/db/postgresql.pp
+++ b/deployment/puppet/nova/manifests/db/postgresql.pp
@@ -24,11 +24,11 @@ class nova::db::postgresql(
 
   require 'postgresql::python'
 
-  Postgresql::Db[$dbname] -> Anchor<| title == 'nova-start' |>
-  Postgresql::Db[$dbname] ~> Exec<| title == 'nova-db-sync' |>
+  Postgresql::Server::Db[$dbname] -> Anchor<| title == 'nova-start' |>
+  Postgresql::Server::Db[$dbname] ~> Exec<| title == 'nova-db-sync' |>
   Package['python-psycopg2'] -> Exec<| title == 'nova-db-sync' |>
 
-  postgresql::db { $dbname:
+  postgresql::server::db { $dbname:
     user     => $user,
     password => $password,
   }