diff --git a/manifests/puppetclient/db_credentials.pp b/manifests/puppetclient/db_credentials.pp
index f287c097f24aa4f02661cb02985103ac8f192ca6..eaed446e170c29f8c31b3cff16a0f9aa53f74902 100644
--- a/manifests/puppetclient/db_credentials.pp
+++ b/manifests/puppetclient/db_credentials.pp
@@ -14,10 +14,10 @@ class base::puppetclient::db_credentials {
   # This is where we put the db credentials.
   $puppet_db_ini_file = '/etc/puppet/puppet-db.ini'
 
-  if ($::hostname =~ /^(frankoz|jimhenson)-dev/) {
+  if ($::hostname =~ /^jimhenson-dev/) {
     $credentials_wallet_name = 'idg-puppet-dev-db-isat'
   }
-  elsif ($::hostname =~ /^frankoz1-test/) {
+  elsif ($::hostname =~ /^frankoz[12]-dev/) {
     $credentials_wallet_name = 'idg-puppet-dev-db-isat'
   }
   elsif ($::hostname =~ /^frankoz[12]/) {