diff --git a/manifests/main/files.pp b/manifests/main/files.pp
index bc277d5..be14880 100644
--- a/manifests/main/files.pp
+++ b/manifests/main/files.pp
@@ -7,6 +7,7 @@ class postgresql_cd::main::files (
 
 ) inherits postgresql_cd::params {
   if $fqdn == $pl_server_fqdn {
+    require postgresql_cd::server::initdb
     require postgresql_cd::main::dirs
 
     file { '/var/lib/pgsql/data/pg_hba.conf':
diff --git a/manifests/server/initdb.pp b/manifests/server/initdb.pp
index e255518..9820605 100644
--- a/manifests/server/initdb.pp
+++ b/manifests/server/initdb.pp
@@ -13,4 +13,6 @@ class postgresql_cd::server::initdb (
       path    => ['/sbin','/usr/bin'],
     }
   }
+
+  include postgresql_cd::main::files
 }
diff --git a/manifests/server/service.pp b/manifests/server/service.pp
index 1301977..41e425a 100644
--- a/manifests/server/service.pp
+++ b/manifests/server/service.pp
@@ -7,7 +7,6 @@ class postgresql_cd::server::service (
 
 ) inherits postgresql_cd::params {
   if $fqdn == $pl_server_fqdn {
-    include postgresql_cd::main::files
     require postgresql_cd::firewall::iptables
     require postgresql_cd::server::initdb