diff --git a/templates/puppet.conf.erb b/templates/puppet.conf.erb
index 9cf79ba..850a738 100644
--- a/templates/puppet.conf.erb
+++ b/templates/puppet.conf.erb
@@ -16,7 +16,7 @@
   privatekeydir           = <%= @pt_privatekeydir %> { group = service }
   reports                 = <%= @pt_reports %>
   rundir                  = <%= @pt_rundir %>
-  server                  = <%= @pt_puppet_server %>
+  server                  = <%= @pt_pm_fqdn %>
   show_diff               = <%= @pt_show_diff %>
   ssldir                  = <%= @pt_ssldir %>
   vardir                  = <%= @pt_vardir %>
@@ -55,6 +55,7 @@
 <% end end -%>
 <% if @fqdn != @pt_pm_fqdn  -%>
 [agent]
+    server                  = <%= @pt_pm_fqdn %>
     classfile               = $statedir/classes.txt
     default_schedules       = <%= @pt_default_schedules %>
     environment             = <%= @pt_environment %>