diff --git a/templates/puppetclient/puppet.conf.template.erb b/templates/puppetclient/puppet.conf.template.erb
index 86ab34191bd977ac3503b7316600dcf7d50f626c..39ada931ac47c704802d95b14e2826ad609989a6 100644
--- a/templates/puppetclient/puppet.conf.template.erb
+++ b/templates/puppetclient/puppet.conf.template.erb
@@ -138,7 +138,7 @@ manifestdir = /srv/puppet/$environment/manifests
 
 # Location of the ActiveMQ server
 <% if (hostname =~ /jimhenson-dev/) then -%>
-queue_source = stomp://frankoz-dev.stanford.edu:61613/
+queue_source = stomp://frankoz1-dev.stanford.edu:61613/
 <% else -%>
 queue_source = stomp://frankoz1.stanford.edu:61613/
 <% end -%>
@@ -153,7 +153,7 @@ dbname       = %%PUPPET_MYSQL_DATABASE%%
 dbuser       = %%PUPPET_MYSQL_USERNAME%%
 dbpassword   = %%PUPPET_MYSQL_PASSWORD%%
 <% if (hostname =~ /jimhenson-dev/) then -%>
-dbserver     = frankoz-dev.stanford.edu
+dbserver     = frankoz2-dev.stanford.edu
 <% else -%>
 dbserver     = frankoz2.stanford.edu
 <% end -%>