diff --git a/manifests/init.pp b/manifests/init.pp
index 641f9fa..836c853 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -151,7 +151,7 @@ class dashboard (
 
   file { '/etc/logrotate.d/puppet-dashboard':
     ensure  => present,
-    content => template('dashboard/puppet-dashboard.logrotate.erb'),
+    content => template('dashboard/logrotate.erb'),
     owner   => '0',
     group   => '0',
     mode    => '0644',
diff --git a/manifests/passenger.pp b/manifests/passenger.pp
index 9dee4b5..cb40de9 100644
--- a/manifests/passenger.pp
+++ b/manifests/passenger.pp
@@ -15,15 +15,12 @@
 class dashboard::passenger (
   $dashboard_site,
   $dashboard_port,
-  $dashboard_config = $dashboard::params::dashboard_config
+  $dashboard_config = $dashboard::params::dashboard_config,
+  $dashboard_root   = $dashboard::params::dashboard_root,
 ) inherits dashboard {
 
-  Class ['::passenger']
-  -> Apache::Vhost[$dashboard_site]
-
-  class { '::passenger':
-    port    => $dashboard_port,
-  }
+  include apache
+  include passenger
 
   file { '/etc/init.d/puppet-dashboard':
     ensure => absent,
@@ -35,10 +32,10 @@ class dashboard::passenger (
   }
 
   apache::vhost { $dashboard_site:
-    port     => '8080',
+    port     => $dashboard_port,
     priority => '50',
-    docroot  => '/usr/share/puppet-dashboard/public',
-    template => 'dashboard/puppet-dashboard-passenger-vhost.erb',
+    docroot  => "${dashboard_root}/public",
+    template => 'dashboard/passenger-vhost.erb',
   }
 
 }
diff --git a/templates/puppet-dashboard.logrotate.erb b/templates/logrotate.erb
similarity index 100%
rename from templates/puppet-dashboard.logrotate.erb
rename to templates/logrotate.erb
diff --git a/templates/passenger-vhost.erb b/templates/passenger-vhost.erb
new file mode 100644
index 0000000..a2f6d16
--- /dev/null
+++ b/templates/passenger-vhost.erb
@@ -0,0 +1,18 @@
+Listen <%= scope.lookupvar("dashboard::params::dashboard_port") %>
+
+<VirtualHost *:<%= scope.lookupvar("dashboard::params::dashboard_port") %>>
+  ServerName <%= name %>
+  DocumentRoot <%= docroot %>
+  RailsBaseURI <%= rails_base_uri %>
+  <Directory <%= docroot %>>
+    Options None
+    AllowOverride AuthConfig
+    Order allow,deny
+    allow from all
+  </Directory>
+  ErrorLog /var/log/<%= scope.lookupvar("apache::params::apache_name") %>/<%= name %>_error.log
+  LogLevel warn
+  CustomLog /var/log/<%= scope.lookupvar("apache::params::apache_name") %>/<%= name %>_access.log combined
+  ServerSignature On
+</VirtualHost>
+
diff --git a/templates/puppet-dashboard-passenger-vhost.erb b/templates/puppet-dashboard-passenger-vhost.erb
deleted file mode 100644
index 6ec0c89..0000000
--- a/templates/puppet-dashboard-passenger-vhost.erb
+++ /dev/null
@@ -1,34 +0,0 @@
-Listen <%= 8080 %>
-
-<VirtualHost *:<%= dashboard_port %>>
-  ServerName <%= name %>
-  DocumentRoot <%= docroot %>
-  RailsBaseURI <%= rails_base_uri %>
-  <Directory <%= docroot %>>
-    Options None
-    AllowOverride AuthConfig
-    Order allow,deny
-    allow from all
-  </Directory>
-#  <Location "/">
-#    Order allow,deny
-#    Allow from <%= ipaddress %>
-#    Satisfy any
-#    AuthName "Puppet Dashboard"
-#    AuthType Basic
-#    AuthUserFile /etc/apache2/htpasswd
-#    require valid-user
-#    AllowOverride AuthConfig
-#  </Location>
-  <% case operatingsystem
-			when 'Debian', 'Ubuntu'
-				apachename = 'apache2'
-			else
-				apachename = 'httpd'
-			end -%>
-  ErrorLog /var/log/<%= apachename %>/<%= name %>_error.log
-  LogLevel warn
-  CustomLog /var/log/<%= apachename %>/<%= name %>_access.log combined
-  ServerSignature On
-</VirtualHost>
-
diff --git a/tests/init.pp b/tests/init.pp
index cc6b565..b582333 100644
--- a/tests/init.pp
+++ b/tests/init.pp
@@ -7,12 +7,10 @@ node default {
     dashboard_password        => 'changeme',
     dashboard_db              => 'dashboard_prod',
     dashboard_charset         => 'utf8',
-    dashboard_site            => $fqdn,
-    dashboard_port            => '8080',
+    dashboard_site            => $::fqdn,
+    dashboard_port            => '8081',
     mysql_root_pw             => 'changemetoo',
     passenger                 => true,
-    mysql_package_provider    => 'yum',
-    ruby_mysql_package        => 'ruby-mysql',
   }
 
 }