diff --git a/modules/openstack_project/manifests/website.pp b/modules/openstack_project/manifests/website.pp
index eae4467b95..12a0b16f3f 100644
--- a/modules/openstack_project/manifests/website.pp
+++ b/modules/openstack_project/manifests/website.pp
@@ -44,7 +44,7 @@ define openstack_project::website (
     port          => 443, # Is required despite not being used.
     docroot       => $docroot_,
     priority      => '50',
-    template      => $template,
+    content       => template($template)
   }
 
   if ($ssl_cert != undef) {
diff --git a/modules/openstack_project/templates/website.vhost.erb b/modules/openstack_project/templates/website.vhost.erb
index 62306406b8..de94c696a6 100644
--- a/modules/openstack_project/templates/website.vhost.erb
+++ b/modules/openstack_project/templates/website.vhost.erb
@@ -3,15 +3,15 @@
 # ************************************
 
 <VirtualHost *:80>
-    ServerName <%= @srvname %>
-    <% if @serveraliases.is_a? Array -%>
-      <% @serveraliases.each do |name| -%><%= "  ServerAlias #{name}\n" %><% end -%>
-    <% elsif @serveraliases != nil -%>
-      <%= "  ServerAlias #{@serveraliases}" -%>
+    ServerName <%= @name %>
+    <% if @aliases.is_a? Array -%>
+      <% @aliases.each do |alias_name| -%><%= "  ServerAlias #{alias_name}\n" %><% end -%>
+    <% elsif @aliases != nil -%>
+      <%= "  ServerAlias #{@aliases}" -%>
     <% end -%>
 
     RewriteEngine on
-    RewriteRule ^/(.*) https://<%= @srvname %>/$1 [last,redirect=permanent]
+    RewriteRule ^/(.*) https://<%= @name %>/$1 [last,redirect=permanent]
 
     ErrorLog /var/log/<%= scope.lookupvar("httpd::params::apache_name") %>/<%= @name %>_error.log
     LogLevel warn
@@ -21,11 +21,11 @@
 
 <IfModule mod_ssl.c>
 <VirtualHost *:443>
-    ServerName <%= @srvname %>
-    <% if @serveraliases.is_a? Array -%>
-      <% @serveraliases.each do |name| -%><%= "  ServerAlias #{name}\n" %><% end -%>
-    <% elsif @serveraliases != nil -%>
-      <%= "  ServerAlias #{@serveraliases}" -%>
+    ServerName <%= @name %>
+    <% if @aliases.is_a? Array -%>
+      <% @aliases.each do |alias_name| -%><%= "  ServerAlias #{alias_name}\n" %><% end -%>
+    <% elsif @aliases != nil -%>
+      <%= "  ServerAlias #{@aliases}" -%>
     <% end -%>
 
     RewriteEngine on
@@ -41,8 +41,8 @@
     SSLCertificateKeyFile <%= @ssl_key_file_ %>
     SSLCertificateChainFile <%= @ssl_chain_file_ %>
 
-    DocumentRoot <%= @docroot %>
-    <Directory <%= @docroot %>>
+    DocumentRoot <%= @docroot_ %>
+    <Directory <%= @docroot_ %>>
         Options Indexes FollowSymLinks MultiViews
         Satisfy any
         Require all granted