--- a/manifests/moco-nodes.pp
+++ b/manifests/moco-nodes.pp
@@ -505,26 +505,24 @@ node "buildbot-master71.bb.releng.use1.m
             basedir => "build1";
     }
     include toplevel::server::buildmaster::mozilla
     include toplevel::mixin::selfserve_agent
 }
 
 node "buildbot-master72.bb.releng.usw2.mozilla.com" {
     $aspects = [ 'high-security' ]
-    $buildbot_bridge_env = "prod"
     buildmaster::buildbot_master::mozilla {
         "bm72-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-master73.bb.releng.usw2.mozilla.com" {
     $aspects = [ 'high-security' ]
     buildmaster::buildbot_master::mozilla {
         "bm73-build1":
             http_port => 8001,
             master_type => "build",
@@ -617,25 +615,23 @@ node "buildbot-master81.bb.releng.scl3.m
     include toplevel::mixin::selfserve_agent
     include toplevel::mixin::releaserunner
     include toplevel::mixin::buildmaster_db_maintenance
     include toplevel::mixin::bouncer_check
 }
 
 node "buildbot-master82.bb.releng.scl3.mozilla.com" {
     $aspects = [ 'high-security' ]
-    $buildbot_bridge_env = "prod"
     buildmaster::buildbot_master::mozilla {
         "bm82-build1":
             http_port => 8001,
             master_type => "build",
             basedir => "build1";
     }
     include toplevel::server::buildmaster::mozilla
-    include toplevel::mixin::buildbot_bridge
 }
 
 node "buildbot-master83.bb.releng.scl3.mozilla.com" {
     $aspects = [ 'high-security' ]
     $releaserunner_env = "dev"
     buildmaster::buildbot_master::mozilla {
         "bm83-try1":
             http_port => 8101,