--- a/manifests/moco-nodes.pp
+++ b/manifests/moco-nodes.pp
@@ -417,26 +417,24 @@ node "buildbot-master69.bb.releng.use1.m
             basedir => "tests1-windows";
     }
     include toplevel::server::buildmaster::mozilla
 }
 
 node "buildbot-master70.bb.releng.use1.mozilla.com" {
     $aspects = [ 'high-security' ]
     $only_user_ssh = true
-    $buildbot_bridge_env = "prod"
     buildmaster::buildbot_master::mozilla {
         "bm70-build1":
             http_port => 8001,
             master_type => "build",
             basedir => "build1";
     }
     include toplevel::server::buildmaster::mozilla
     include toplevel::mixin::selfserve_agent
-    include toplevel::mixin::buildbot_bridge
 }
 
 node "buildbot-master71.bb.releng.use1.mozilla.com" {
     $aspects = [ 'high-security' ]
     $only_user_ssh = true
     buildmaster::buildbot_master::mozilla {
         "bm71-build1":
             http_port => 8001,
@@ -624,25 +622,27 @@ node "buildbot-master85.bb.releng.scl3.m
     }
     include toplevel::server::buildmaster::mozilla
     include toplevel::mixin::releaserunner
 }
 
 node "buildbot-master86.bb.releng.scl3.mozilla.com" {
     $aspects = [ 'high-security' ]
     $only_user_ssh = true
+    $buildbot_bridge_env = "prod"
     buildmaster::buildbot_master::mozilla {
         "bm86-build1":
             http_port => 8001,
             master_type => "build",
             basedir => "build1";
     }
     $l10n_bumper_env = "mozilla-aurora"
     include toplevel::server::buildmaster::mozilla
     include toplevel::mixin::l10n_bumper
+    include toplevel::mixin::buildbot_bridge
 }
 
 node "buildbot-master87.bb.releng.scl3.mozilla.com" {
     $aspects = [ 'high-security' ]
     $only_user_ssh = true
     buildmaster::buildbot_master::mozilla {
         "bm87-try1":
             http_port => 8101,