--- a/manifests/moco-config.pp
+++ b/manifests/moco-config.pp
@@ -229,17 +229,17 @@ class config inherits config::base {
     $distinguished_aws_manager = "aws-manager2.srv.releng.scl3.mozilla.com"
     $aws_manager_mail_to = "release+aws-manager@mozilla.com"
     $cloudtrail_s3_bucket = "mozilla-releng-aws-logs"
     $cloudtrail_s3_base_prefix = "AWSLogs/314336048151/CloudTrail"
     # this is the dev instance at least until bug 929584 is fixed
     $slaverebooter_slaveapi = "http://slaveapi1.srv.releng.scl3.mozilla.com:8080"
     $slaverebooter_mail_to = "release@mozilla.com"
 
-    $buildmaster_ssh_keys = [ 'b2gbld_dsa', 'b2gtry_dsa', 'ffxbld_rsa', 'tbirdbld_dsa', 'trybld_dsa', 'xrbld_dsa' ]
+    $buildmaster_ssh_keys = [ 'b2gbld_dsa', 'b2gtry_dsa', 'ffxbld_rsa', 'tbirdbld_dsa', 'trybld_dsa' ]
 
     $collectd_write = {
         graphite_nodes => {
             'graphite-relay.private.scl3.mozilla.com' => {
                 'port' => '2003', 'prefix' => 'hosts.',
             },
         },
     }

--- a/modules/slave_secrets/manifests/ssh_keys.pp
+++ b/modules/slave_secrets/manifests/ssh_keys.pp
@@ -8,27 +8,25 @@ class slave_secrets::ssh_keys($slave_typ
     # calculate the desired keyset based on organization
     case $config::org {
         moco: {
             # a table of keysets by environment (from slavealloc) and $slave_trustlevel
             $staging_keyset = {
                 'trybld_dsa' => 'builder_ssh_key_staging_trybld_dsa',
                 'b2gtry_dsa' => 'builder_ssh_key_staging_b2gbld_dsa',
                 'ffxbld_rsa' => 'builder_ssh_key_staging_ffxbld_rsa',
-                'xrbld_dsa' => 'builder_ssh_key_staging_xrbld_dsa',
                 'tbirdbld_dsa' => 'builder_ssh_key_staging_tbirdbld_dsa',
                 'b2gbld_dsa' => 'builder_ssh_key_staging_b2gbld_dsa',
             }
             $prod_try_keyset = {
                 'trybld_dsa' => 'builder_ssh_key_try_trybld_dsa',
                 'b2gtry_dsa' => 'builder_ssh_key_try_b2gtry_dsa',
             }
             $prod_core_keyset = {
                 'ffxbld_rsa' => 'builder_ssh_key_prod_ffxbld_rsa',
-                'xrbld_dsa' => 'builder_ssh_key_prod_xrbld_dsa',
                 'tbirdbld_dsa' => 'builder_ssh_key_prod_tbirdbld_dsa',
                 'b2gbld_dsa' => 'builder_ssh_key_prod_b2gbld_dsa',
             }
             $environment = slavealloc_environment($clientcert)
             case $slave_type {
                 test: {
                     # no keys for test slaves
                     $keyset = {}