diff --git a/templates/server/puppet.conf.erb b/templates/server/puppet.conf.erb
index 4003055..a2f0702 100644
--- a/templates/server/puppet.conf.erb
+++ b/templates/server/puppet.conf.erb
@@ -4,7 +4,7 @@
   vardir      = <%= scope.lookupvar('puppet::data_dir') %>
   logdir      = <%= scope.lookupvar('puppet::log_dir') %>
   rundir      = <%= scope.lookupvar('puppet::run_dir') %>
-  templatedir = <%= scope.lookupvar('puppet::template_dir') %>
+  #templatedir = <%= scope.lookupvar('puppet::template_dir') %>
   ssldir      = <%= scope.lookupvar('puppet::ssl_dir') %>
   usecacheonfailure = true
   user = <%= scope.lookupvar('puppet::process_user_server') %>
@@ -78,8 +78,8 @@
 <% end -%>
 
   environment = <%= scope.lookupvar('puppet::environment') %>
-  manifest    = <%= scope.lookupvar('puppet::manifest_path') %>
-  modulepath  = <%= scope.lookupvar('puppet::module_path') %>
+  #manifest    = <%= scope.lookupvar('puppet::manifest_path') %>
+  #modulepath  = <%= scope.lookupvar('puppet::module_path') %>
 
 <% if scope.lookupvar('puppet::dns_alt_names') != '' -%>
   dns_alt_names = <%= scope.lookupvar('puppet::dns_alt_names') %>