diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000000000000000000000000000000000000..2c179eb44baa690449648ba61fdaecba146b9d2b
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,8 @@
+# How to contribute
+
+Please report bugs and feature request using [GitHub issue
+tracker](https://github.com/camptocamp/puppet-postfix/issues).
+
+For pull requests, it is very much appreciated to check your Puppet manifest
+with [puppet-lint](https://github.com/rodjek/puppet-lint) to follow the recommended Puppet style guidelines from the
+[Puppet Labs style guide](http://docs.puppetlabs.com/guides/style_guide.html).
diff --git a/README.md b/README.md
index 3672aaf3c4952af8249e8eb5eb139c7e45b06086..e4242839f15ceab5399f73a9c725c0b13e47e301 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,7 @@
-# Postfix module for Puppet
+# Postfix Puppet Module
 
 [![Puppet Forge](http://img.shields.io/puppetforge/v/camptocamp/postfix.svg)](https://forge.puppetlabs.com/camptocamp/postfix)
-[![Build Status](https://travis-ci.org/camptocamp/puppet-postfix.png?branch=master)](https://travis-ci.org/camptocamp/puppet-postfix)
-
-**Manages Postfix configuration.**
-
-This module is provided by [Camptocamp](http://www.camptocamp.com/)
+[![Build Status](https://img.shields.io/travis/camptocamp/puppet-postfix/master.svg)](https://travis-ci.org/camptocamp/puppet-postfix)
 
 This module requires Augeas.
 
@@ -54,29 +50,4 @@ Manages content in the transport map.
 
 Manages content in the virtual map.
 
-## Contributing
-
-Please report bugs and feature request using [GitHub issue
-tracker](https://github.com/camptocamp/puppet-postfix/issues).
-
-For pull requests, it is very much appreciated to check your Puppet manifest
-with [puppet-lint](https://github.com/camptocamp/puppet-postfix/issues) to follow the recommended Puppet style guidelines from the
-[Puppet Labs style guide](http://docs.puppetlabs.com/guides/style_guide.html).
-
-## License
-
-Copyright (c) 2013 <mailto:puppet@camptocamp.com> All rights reserved.
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-    
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-    
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
diff --git a/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml b/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml
index 6f02769089f34e08450fb5a682bb1c9e808cb39c..fe0f83b84c07db5009b5374f8e3c8bc8bdedbcce 100644
--- a/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml
+++ b/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml
@@ -4,7 +4,7 @@ HOSTS:
       strict_variables:
     platform: el-7-x86_64
     hypervisor : vagrant
-    box : camptocamp/centos-7-x86_64
+    box : puppetlabs/centos-7.0-64-nocm
 CONFIG:
   type: foss
   log_level: debug
diff --git a/spec/acceptance/nodesets/debian-6-x86_64-vagrant.yml b/spec/acceptance/nodesets/debian-6-x86_64-vagrant.yml
index 71e8194af47b5e5d9c426dbc5e5d9cbff4031aed..23dae1b0d374b93f42ec9ac905485efdc70ccf3d 100644
--- a/spec/acceptance/nodesets/debian-6-x86_64-vagrant.yml
+++ b/spec/acceptance/nodesets/debian-6-x86_64-vagrant.yml
@@ -4,7 +4,7 @@ HOSTS:
       strict_variables:
     platform: debian-6-amd64
     hypervisor : vagrant
-    box : puppetlabs/debian-6.0.9-64-nocm
+    box : puppetlabs/debian-6.0.10-64-nocm
 CONFIG:
   type: foss
   log_level: debug
diff --git a/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml b/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml
index 97099de3c2e8ec5b39cc36e54cea6b8840a42576..86c2165d0bf17bd145e4f35d89250fdddc52b0cb 100644
--- a/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml
+++ b/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml
@@ -4,8 +4,7 @@ HOSTS:
       strict_variables:
     platform: debian-7-amd64
     hypervisor : vagrant
-    box : debian-73-x64-virtualbox-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/debian-73-x64-virtualbox-nocm.box
+    box : puppetlabs/debian-7.8-64-nocm
 CONFIG:
   type: foss
   log_level: debug
diff --git a/spec/acceptance/nodesets/ubuntu-14.04-x86_64-vagrant.yml b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-vagrant.yml
new file mode 100644
index 0000000000000000000000000000000000000000..a3edb70f36a86549c1a03fc77d87aa009f0c256f
--- /dev/null
+++ b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-vagrant.yml
@@ -0,0 +1,10 @@
+HOSTS:
+  ubuntu-14.04-x64:
+    default_apply_opts:
+      strict_variables:
+    platform: ubuntu-14.04-amd64
+    hypervisor : vagrant
+    box : puppetlabs/ubuntu-14.04-64-nocm
+CONFIG:
+  type: foss
+  log_level: debug