diff --git a/manifests/certbot/config.pp b/manifests/certbot/config.pp
index 3027474..568bcdb 100644
--- a/manifests/certbot/config.pp
+++ b/manifests/certbot/config.pp
@@ -37,6 +37,12 @@ class cd_nagios::certbot::config (
           creates   =>  '/etc/httpd/conf.d/.cert_created',
         }
 
+        exec { 'remove_nagios_conf':
+          command   =>  "rm -Rf ${ng_nagios_conf}",
+          creates   =>  '/etc/httpd/conf.d/.cert_created',
+          require   =>  Exec['remove_forward_vhost'],
+        }
+
         # create temp vhost file
 
         exec { 'create_temp_vhost':
@@ -46,7 +52,7 @@ class cd_nagios::certbot::config (
           provider  =>  'shell',
           creates   =>  '/etc/httpd/conf.d/.created',
           notify    =>  Service['httpd'],
-          require   =>  Exec['remove_forward_vhost'],
+          require   =>  Exec['remove_nagios_conf'],
         }
 
         # create cert
diff --git a/manifests/server/files.pp b/manifests/server/files.pp
index 42de5e0..22cbd91 100644
--- a/manifests/server/files.pp
+++ b/manifests/server/files.pp
@@ -25,49 +25,36 @@ class cd_nagios::server::files (
 ) inherits cd_nagios::params {
 
   if $::fqdn == $ng_nagios_server {
-    if $ng_enable_certbot == true {
-      require cd_nagios::certbot::config
-      require cd_nagios::main::dirs
+    if $ng_use_https == true {
+      if $ng_enable_certbot == true {
 
-      # manage nagios.cfg
+        require cd_nagios::certbot::config
+        require cd_nagios::main::dirs
+
+        # manage nagios.cfg
 
 
-      # manage cgi.cfg
+        # manage cgi.cfg
 
-      file { $ng_cgi_cfg_file:
-        ensure    =>  file,
-        path      =>  $ng_cgi_cfg_file,
-        owner     =>  'root',
-        group     =>  'root',
-        mode      =>  '0644',
-        selrange  =>  s0,
-        selrole   =>  object_r,
-        seltype   =>  nagios_etc_t,
-        seluser   =>  system_u,
-        content   =>  template($ng_cgi_cfg_erb),
-        notify    =>  Service[$ng_service],
-      }
-
-      # manage nagios.conf for httpd
-
-      file { $ng_nagios_conf:
-        ensure    =>  file,
-        path      =>  $ng_nagios_conf,
-        owner     =>  'root',
-        group     =>  'root',
-        mode      =>  '0644',
-        selrange  =>  s0,
-        selrole   =>  object_r,
-        seltype   =>  httpd_config_t,
-        seluser   =>  system_u,
-        content   =>  template($ng_nagios_conf_erb),
-        notify    =>  Service[$ae_service],
-      }
-
-      if $ng_http_https_fw == true {
-        file { $ng_forward_conf:
+        file { $ng_cgi_cfg_file:
           ensure    =>  file,
-          path      =>  $ng_forward_conf,
+          path      =>  $ng_cgi_cfg_file,
+          owner     =>  'root',
+          group     =>  'root',
+          mode      =>  '0644',
+          selrange  =>  s0,
+          selrole   =>  object_r,
+          seltype   =>  nagios_etc_t,
+          seluser   =>  system_u,
+          content   =>  template($ng_cgi_cfg_erb),
+          notify    =>  Service[$ng_service],
+        }
+
+        # manage nagios.conf for httpd
+
+        file { $ng_nagios_conf:
+          ensure    =>  file,
+          path      =>  $ng_nagios_conf,
           owner     =>  'root',
           group     =>  'root',
           mode      =>  '0644',
@@ -75,26 +62,42 @@ class cd_nagios::server::files (
           selrole   =>  object_r,
           seltype   =>  httpd_config_t,
           seluser   =>  system_u,
-          content   =>  template($ng_forward_conf_erb),
+          content   =>  template($ng_nagios_conf_erb),
           notify    =>  Service[$ae_service],
         }
-      }
 
-      # manage welcome.conf for nagios web server
+        if $ng_http_https_fw == true {
+          file { $ng_forward_conf:
+            ensure    =>  file,
+            path      =>  $ng_forward_conf,
+            owner     =>  'root',
+            group     =>  'root',
+            mode      =>  '0644',
+            selrange  =>  s0,
+            selrole   =>  object_r,
+            seltype   =>  httpd_config_t,
+            seluser   =>  system_u,
+            content   =>  template($ng_forward_conf_erb),
+            notify    =>  Service[$ae_service],
+          }
+        }
 
-      if $ng_disable_welcome == true {
-        file { $ng_welcome_conf:
-          ensure    =>  file,
-          path      =>  $ng_welcome_conf,
-          owner     =>  'root',
-          group     =>  'root',
-          mode      =>  '0644',
-          selrange  =>  s0,
-          selrole   =>  object_r,
-          seltype   =>  httpd_config_t,
-          seluser   =>  system_u,
-          content   =>  template($ng_welcome_conf_erb),
-          notify    =>  Service[$ae_service],
+        # manage welcome.conf for nagios web server
+
+        if $ng_disable_welcome == true {
+          file { $ng_welcome_conf:
+            ensure    =>  file,
+            path      =>  $ng_welcome_conf,
+            owner     =>  'root',
+            group     =>  'root',
+            mode      =>  '0644',
+            selrange  =>  s0,
+            selrole   =>  object_r,
+            seltype   =>  httpd_config_t,
+            seluser   =>  system_u,
+            content   =>  template($ng_welcome_conf_erb),
+            notify    =>  Service[$ae_service],
+          }
         }
       }
     }