diff --git a/defaults/main.yml b/defaults/main.yml
index e78d9ee..80280f8 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,10 +1,4 @@
 ---
-### TODO: REMEMBER TO CONVERT TO DEFAULS ###
-## Checks to-do:
-## Check HTTPS services
-## Check IMAP
-## Check SMTP
-## 
 nagios4_config:
   admin_email: 'monitor-admin@example.org'
   admin_pager: 'monitor-admin-pager@example.com'
@@ -147,10 +141,11 @@ cgi_config:
 
 nagios_user: nagios
 nagios_group: nagios
+auth_user_file: /etc/nagios/nagios.httpwd
 monitored_hosts:
   - host_name: localhost
     use: linux-server
-    alias: Server-1
+    alias: Server0
     address: 127.0.0.1
     services:
       - use: local-service
@@ -204,48 +199,9 @@ templates: []
 timeperiods: []
 
 vhosts:
-  - vhostname: nagios4.example.org
-    web_port: 80
-    ssl_port: 443
-    ssl: yes
-    #docroot: /var/www/host.example.org
+  - vhost_name: nagios4.example.org
     serveradmin: webmaster@example.org
-    #server_aliases: []
-    #root_options:
-    #  - '-Indexes'
-    #  - '-FollowSymLinks'
-    aliases:
-      - dest: nagios4
-        src: /usr/share/nagios4/htdocs
-    # directories:
-    #   - path: /var/www/host.example.org/custom_dir
-    #     options:
-    #       - '-Indexes'
-    #       - '-FollowSymLinks'
-    #     allow_override: None
-    #     require: 'all granted'
-    #     custom_code: ""
-    custom_code: "<DirectoryMatch (/usr/share/nagios4/htdocs|/usr/lib/cgi-bin/nagios4|/etc/nagios4/stylesheets)>
-    Options FollowSymLinks
-    DirectoryIndex index.php index.html
-    AllowOverride AuthConfig
-    #Require ip  ::1/128 fc00::/7 fe80::/10 10.0.0.0/8 127.0.0.0/8 169.254.0.0/16 172.16.0.0/12 192.168.0.0/16
-    <Files \"cmd.cgi\">
-        AuthDigestDomain \"Nagios4\"
-        AuthDigestProvider file
-        AuthUserFile    \"/etc/nagios4/htdigest.users\"
-        AuthGroupFile   \"/etc/group\"
-        AuthName        \"Nagios4\"
-        AuthType        Digest
-        Require all     granted
-        #Require        valid-user
-    </Files>
-</DirectoryMatch>
-
-<Directory /usr/share/nagios4/htdocs>
-    Options     +ExecCGI
-</Directory>"
-    # ldap:
-    #   url: ldap://ldap.example.org/ou=People,ou=Users,dc=example,dc=org?uid
-    #   require: valid-user
-    #reverse_proxy: http://127.0.0.1:8080/
+    vhost_aliases: nagios.example.org
+    ssl_certificate_file: "/etc/letsencrypt/live/nagios4.example.org/fullchain.pem"
+    ssl_certificate_key_file: "/etc/letsencrypt/live/nagios4.example.org/privkey.pem"
+    #ssl_certificate_chain_file: "/usr/local/apache2/conf/ssl/ca_bundle.crt"
\ No newline at end of file