--- a/manifests/moco-nodes.pp
+++ b/manifests/moco-nodes.pp
@@ -930,16 +930,24 @@ node /^balrogworker-\d*\.srv\.releng\..*
 node /^balrogworker-dev\d*\.srv\.releng\..*\.mozilla\.com$/ {
     $aspects          = [ 'maximum-security' ]
     $balrogworker_env = 'dev'
     $timezone         = 'UTC'
     $only_user_ssh    = true
     include toplevel::server::balrogscriptworker
 }
 
+node /^tb-balrogworker-dev\d*\.srv\.releng\..*\.mozilla\.com$/ {
+    $aspects          = [ 'maximum-security' ]
+    $balrogworker_env = 'comm-thunderbird-dev'
+    $timezone         = 'UTC'
+    $only_user_ssh    = true
+    include toplevel::server::balrogscriptworker
+}
+
 # Beetmover scriptworkers
 node /^beetmoverworker-.*\.srv\.releng\..*\.mozilla\.com$/ {
     $aspects             = [ 'maximum-security' ]
     $beetmoverworker_env = 'prod'
     $timezone            = 'UTC'
     $only_user_ssh       = true
     include toplevel::server::beetmoverscriptworker
 }

--- a/modules/balrog_scriptworker/manifests/init.pp
+++ b/modules/balrog_scriptworker/manifests/init.pp
@@ -95,22 +95,23 @@ class balrog_scriptworker {
             task_script              => $balrog_scriptworker::settings::task_script,
             task_script_config       => $balrog_scriptworker::settings::task_script_config,
 
             username                 => $users::builder::username,
             group                    => $users::builder::group,
 
             taskcluster_client_id    => $env_config["taskcluster_client_id"],
             taskcluster_access_token => $env_config["taskcluster_access_token"],
-            worker_group             => $balrog_scriptworker::settings::worker_group,
+            worker_group             => $env_config['worker_group'],
             worker_type              => $env_config["worker_type"],
 
             task_max_timeout         => $balrog_scriptworker::settings::task_max_timeout,
 
             cot_job_type             => 'balrog',
+            cot_product              => $env_config['cot_product'],
 
             sign_chain_of_trust      => $env_config["sign_chain_of_trust"],
             verify_chain_of_trust    => $env_config["verify_chain_of_trust"],
             verify_cot_signature     => $env_config["verify_cot_signature"],
 
             verbose_logging          => $balrog_scriptworker::settings::verbose_logging,
     }
 

--- a/modules/balrog_scriptworker/manifests/settings.pp
+++ b/modules/balrog_scriptworker/manifests/settings.pp
@@ -4,42 +4,64 @@
 
 class balrog_scriptworker::settings {
     $root                     = '/builds/scriptworker'
     $task_script_executable   = "${root}/py27venv/bin/python"
     $task_script              = "${root}/py27venv/bin/balrogscript"
     $task_script_config       = "${root}/script_config.json"
     $task_max_timeout         = 1800
     $tools_branch             = 'default'
-    $worker_group             = 'balrogworker-v1'
     $verbose_logging          = true
 
     $env_config = {
         'dev' => {
             balrog_username => 'balrog-stage-ffxbld',
             balrog_password => secret('balrog-stage-ffxbld_ldap_password'),
             balrog_api_root => 'https://balrog-admin.stage.mozaws.net/api',
 
             dummy => false,
             tools_repo => 'https://hg.mozilla.org/build/tools',
             taskcluster_client_id => 'project/releng/scriptworker/balrogworker-dev',
             taskcluster_access_token => secret('balrogworker_dev_taskcluster_access_token'),
+            taskcluster_scope_prefix => 'project:releng:balrog:',
+            cot_product => 'firefox',
             worker_type => 'balrog-dev',
+            worker_group => 'balrogworker-v1',
             sign_chain_of_trust => false,
             verify_chain_of_trust => true,
             verify_cot_signature => false,
         },
         'prod' => {
             balrog_username => 'balrog-ffxbld',
             balrog_password => secret('balrog-ffxbld_ldap_password'),
             balrog_api_root => 'https://aus4-admin.mozilla.org/api',
 
             dummy => false,
             tools_repo => 'https://hg.mozilla.org/build/tools',
             taskcluster_client_id => 'project/releng/scriptworker/balrogworker',
             taskcluster_access_token => secret('balrogworker_prod_taskcluster_access_token'),
+            taskcluster_scope_prefix => 'project:releng:balrog:',
+            cot_product => 'firefox',
             worker_type => 'balrogworker-v1',
+            worker_group => 'balrogworker-v1',
             sign_chain_of_trust => true,
             verify_chain_of_trust => true,
             verify_cot_signature => true,
-        }
+        },
+        'comm-thunderbird-dev' => {
+            balrog_username => 'balrog-stage-tbirdbld',
+            balrog_password => '',
+            balrog_api_root => 'https://balrog-admin.stage.mozaws.net/api',
+
+            dummy => false,
+            tools_repo => 'https://hg.mozilla.org/build/tools',
+            taskcluster_client_id => 'mozilla-auth0/ad|Mozilla-LDAP|tprince/tb-balrog',
+            taskcluster_access_token => secret('comm_thunderbird_balrogworker_dev_taskcluster_access_token'),
+            taskcluster_scope_prefix => 'project:comm:thunderbird:releng:balrog:',
+            cot_product => 'thunderbird',
+            worker_type => 'tb-balrog-dev',
+            worker_group => 'tb-balrogworker-v1',
+            sign_chain_of_trust => false,
+            verify_chain_of_trust => true,
+            verify_cot_signature => false,
+        },
     }
 }

--- a/modules/balrog_scriptworker/templates/script_config.json.erb
+++ b/modules/balrog_scriptworker/templates/script_config.json.erb
@@ -6,16 +6,17 @@
         "submit-locale": "<%= scope.lookupvar("balrog_scriptworker::settings::root") %>/py27venv/lib/python2.7/site-packages/balrogscript/data/balrog_submit-locale_schema.json",
         "submit-toplevel": "<%= scope.lookupvar("balrog_scriptworker::settings::root") %>/py27venv/lib/python2.7/site-packages/balrogscript/data/balrog_submit-toplevel_schema.json",
         "schedule": "<%= scope.lookupvar("balrog_scriptworker::settings::root") %>/py27venv/lib/python2.7/site-packages/balrogscript/data/balrog_schedule_schema.json"
     },
 
     "verbose": <%= scope.lookupvar("balrog_scriptworker::settings::verbose_logging") %>,
     "dummy": <%= @env_config["dummy"] %>,
     "disable_certs": false,
+    "taskcluster_scope_prefix": "<%= @env_config['taskcluster_scope_prefix'] %>",
 
     "server_config": {
         "nightly": {
             "api_root": "<%= @env_config["balrog_api_root"] %>",
             "balrog_username": "<%= @env_config["balrog_username"] %>",
             "balrog_password": "<%= @env_config["balrog_password"] %>",
             "allowed_channels": ["nightly"]
         },