diff --git a/templates/apache2-vhost.conf.j2 b/templates/apache2-vhost.conf.j2
index bdb698f..991a3f4 100644
--- a/templates/apache2-vhost.conf.j2
+++ b/templates/apache2-vhost.conf.j2
@@ -1,22 +1,21 @@
-<IfModule mod_ssl.c>
-        <VirtualHost _default_:443>
-                ServerAdmin webmaster@localhost
+{{ ansible_managed | comment }}
 
-                DocumentRoot /var/www/html
+<VirtualHost *:443>
+  ServerName {{postfixadmin_server_name}}
 
-                ErrorLog ${APACHE_LOG_DIR}/error.log
-                CustomLog ${APACHE_LOG_DIR}/access.log combined
+  ErrorLog ${APACHE_LOG_DIR}/error.log
+  CustomLog ${APACHE_LOG_DIR}/access.log combined
 
-                SSLEngine on
-                SSLCertificateFile "{{postfixadmin_certificate_fullchain_file}}"
-                SSLCertificateKeyFile "{{postfixadmin_certificate_private_key_file}}"
+  SSLEngine on
+  SSLCertificateFile "{{postfixadmin_certificate_fullchain_file}}"
+  SSLCertificateKeyFile "{{postfixadmin_certificate_private_key_file}}"
 
-                <FilesMatch "\.(cgi|shtml|phtml|php)$">
-                                SSLOptions +StdEnvVars
-                </FilesMatch>
-                <Directory /usr/lib/cgi-bin>
-                                SSLOptions +StdEnvVars
-                </Directory>
+  DocumentRoot /var/www/default/
+  <Directory "/var/www/default/">
+    Options -Indexes
+  </Directory>
 
-        </VirtualHost>
-</IfModule>
+  Alias /postfixadmin /usr/share/postfixadmin/public
+  Redirect /postfixadmin/public /postfixadmin
+
+</VirtualHost>