diff --git a/misc/deploy/puppet/init.pp b/misc/deploy/puppet/init.pp
index af4368dee65babc392969d9708cc5b059187df15..778e18676a2217ca85daebb7f03b64505ccc3a8f 100644
--- a/misc/deploy/puppet/init.pp
+++ b/misc/deploy/puppet/init.pp
@@ -19,8 +19,6 @@ package {
         ensure => latest;
     'wget':
         ensure => latest;
-    'python-software-properties':
-        ensure => installed;
 }
 
 include git
diff --git a/misc/deploy/puppet/nodes.pp b/misc/deploy/puppet/nodes.pp
index dd67de272f26f1837a81543b307c34a8c9f329a5..0f97bf569f08d16c37afe3db6e9f405a6733a472 100644
--- a/misc/deploy/puppet/nodes.pp
+++ b/misc/deploy/puppet/nodes.pp
@@ -1,12 +1,14 @@
-host {
-    "piwik.local":
-        ip      => "127.0.0.1";
-} 
 
-$piwik_domain = 'piwik.local'
+$piwik_domain = 'nginx.piwik'
 $piwik_path   = '/var/www/piwik'
+$piwik_port   = 80
 $socket_path  = "${piwik_path}/tmp/fpm.socket"
 
+host {
+    "${piwik_domain}":
+        ip      => "127.0.0.1";
+} 
+
 user { $piwik_domain:
   ensure  => present,
   comment => $piwik_domain,
@@ -40,7 +42,7 @@ node default {
   nginx::resource::vhost { "${piwik_domain}":
     ensure   => present,
     www_root => $piwik_path,
-    listen_port => 8001,
+    listen_port => 8080,
     locations => $php_locations
   }
 }
diff --git a/misc/deploy/puppet/php-piwik.pp b/misc/deploy/puppet/php-piwik.pp
index 924274cefbddf7e7c1ce0eaa68ee98a964a7327b..f69247dfbaa38a17d1d242541cda07ce024b4d7b 100644
--- a/misc/deploy/puppet/php-piwik.pp
+++ b/misc/deploy/puppet/php-piwik.pp
@@ -1,4 +1,34 @@
 include php
 
 php::module { ['snmp', 'xdebug', 'mysql', 'gd', 'sqlite', 'memcache', 'mcrypt', 'imagick', 'geoip', 'uuid', 'recode', 'cgi']:
-}
\ No newline at end of file
+  notify => Class['php::fpm::service'],
+}
+
+file { "/etc/php5/conf.d/pdo.ini":
+  content => "extension=pdo.so",
+  notify => Class['php::fpm::service'],
+}
+
+file { "/etc/php5/conf.d/pdo_mysql.ini":
+  content => "extension=pdo_mysql.so",
+  notify => Class['php::fpm::service'],
+}
+
+file { "/etc/php5/conf.d/mysqli.ini":
+  content => "extension=mysqli.so",
+  notify => Class['php::fpm::service'],
+}
+
+# TODO replace above files with php::conf
+# php::conf { [ 'pdo' ]:
+#   content => 'extension=pdo.so',
+#   notify => Class['php::fpm::service'],
+# }
+# php::conf { [ 'pdo_mysql' ]:
+#   content => 'extension=pdo_mysql.so',
+#   notify => Class['php::fpm::service'],
+# }
+# php::conf { [ 'mysqli' ]:
+#   content => 'extension=mysqli.so',
+#   notify => Class['php::fpm::service'],
+# }
\ No newline at end of file
diff --git a/misc/deploy/vagrant/precise64/Vagrantfile b/misc/deploy/vagrant/precise64/Vagrantfile
index 9bc08576fdc602d43a50dce00ac361339c48383a..c3c37ac03d7b8dfaf402e59446cea106d87d6448 100644
--- a/misc/deploy/vagrant/precise64/Vagrantfile
+++ b/misc/deploy/vagrant/precise64/Vagrantfile
@@ -31,8 +31,6 @@ Vagrant::Config.run do |config|
   # Forward a port from the guest to the host, which allows for outside
   # computers to access the VM, whereas host only networking does not.
   # config.vm.forward_port 80, 8080
-  config.vm.forward_port 80, 8080
-  config.vm.forward_port 8000, 8001
 
   # Share an additional folder to the guest VM. The first argument is
   # an identifier, the second is the path on the guest to mount the