diff --git a/manifests/files.pp b/manifests/files.pp
index dc33f970fe0a588198917fd5ce88de39de8fc3b8..1679c86f9694875c4d6a24e58055c0e8aa65357a 100644
--- a/manifests/files.pp
+++ b/manifests/files.pp
@@ -16,14 +16,14 @@ class postfix::files {
   $use_sympa           = $postfix::use_sympa
 
   file { '/etc/mailname':
-    ensure  => present,
+    ensure  => 'file',
     content => "${::fqdn}\n",
     seltype => $postfix::params::seltype,
   }
 
   # Aliases
   file { '/etc/aliases':
-    ensure  => present,
+    ensure  => 'file',
     content => "# file managed by puppet\n",
     notify  => Exec['newaliases'],
     replace => false,
@@ -48,7 +48,7 @@ class postfix::files {
   }
 
   file { '/etc/postfix/master.cf':
-    ensure  => present,
+    ensure  => 'file',
     content => $mastercf_content,
     group   => 'root',
     mode    => '0644',
@@ -59,7 +59,7 @@ class postfix::files {
 
   # Config files
   file { '/etc/postfix/main.cf':
-    ensure  => present,
+    ensure  => 'file',
     group   => 'root',
     mode    => '0644',
     owner   => 'root',
diff --git a/manifests/ldap.pp b/manifests/ldap.pp
index 30ab30c33ae89685b961471a888631cbf6c47203..d6c40be165d68a8511d18d7cba9495df534256a9 100644
--- a/manifests/ldap.pp
+++ b/manifests/ldap.pp
@@ -32,9 +32,9 @@ class postfix::ldap {
   }
 
   file {'/etc/postfix/ldap-aliases.cf':
-    ensure  => present,
-    owner   => root,
-    group   => postfix,
+    ensure  => 'file',
+    owner   => 'root',
+    group   => 'postfix',
     content => template('postfix/postfix-ldap-aliases.cf.erb'),
     require => Package['postfix-ldap'],
   }
diff --git a/manifests/mailman.pp b/manifests/mailman.pp
index 6d5e0d21987a9008f3da3fb3cdc553d3b0518e31..5d3f2dd633648be4b356058ff8f9bedc13a4b1a7 100644
--- a/manifests/mailman.pp
+++ b/manifests/mailman.pp
@@ -23,11 +23,11 @@ class postfix::mailman {
   }
 
   postfix::hash { '/etc/postfix/virtual':
-    ensure => present,
+    ensure => 'present',
   }
 
   postfix::hash { '/etc/postfix/transport':
-    ensure => present,
+    ensure => 'present',
   }
 
 }
diff --git a/manifests/mta.pp b/manifests/mta.pp
index 0d838c1a6b47e65ab2872479627fafcae20f49c9..6a75d3ab4805e2b7d46a3eb0089f16fec37c8421 100644
--- a/manifests/mta.pp
+++ b/manifests/mta.pp
@@ -45,11 +45,11 @@ class postfix::mta (
   }
 
   postfix::hash { '/etc/postfix/virtual':
-    ensure => present,
+    ensure => 'present',
   }
 
   postfix::hash { '/etc/postfix/transport':
-    ensure => present,
+    ensure => 'present',
   }
 
 }
diff --git a/manifests/satellite.pp b/manifests/satellite.pp
index 46589c06fd541e7b49eaa4c6c9582a04cf36f870..92c68832d1247d1b09ed3d1a50f200d61ca689fa 100644
--- a/manifests/satellite.pp
+++ b/manifests/satellite.pp
@@ -37,7 +37,7 @@ class postfix::satellite (
   }
 
   postfix::virtual { "@${postfix::myorigin}":
-    ensure      => present,
+    ensure      => 'present',
     destination => 'root',
   }
 }