--- a/manifests/moco-nodes.pp
+++ b/manifests/moco-nodes.pp
@@ -1166,25 +1166,25 @@ node /signing-linux-.*\.srv\.releng\..*\
     $aspects = [ 'maximum-security' ]
     $timezone = "UTC"
     include toplevel::server::signingscriptworker
 }
 
 # Balrog scriptworkers
 node /balrogworker-.*\.srv\.releng\..*\.mozilla\.com/ {
     $aspects = [ 'maximum-security' ]
-    $balrogworker_env = "dev"
+    $balrogworker_env = "prod"
     $timezone = "UTC"
     include toplevel::server::balrogscriptworker
 }
 
 # Beetmover scriptworkers
 node /beetmoverworker-.*\.srv\.releng\..*\.mozilla\.com/ {
     $aspects = [ 'maximum-security' ]
-    $beetmoverworker_env = "dev"
+    $beetmoverworker_env = "prod"
     $timezone = "UTC"
     include toplevel::server::beetmoverscriptworker
 }
 
 # Pushapk scriptworkers
 node /pushapkworker-.*\.srv\.releng\..*\.mozilla\.com/ {
     $aspects = [ 'maximum-security' ]
     $pushapkworker_env = 'prod'

--- a/modules/balrog_scriptworker/manifests/settings.pp
+++ b/modules/balrog_scriptworker/manifests/settings.pp
@@ -9,14 +9,19 @@ class balrog_scriptworker::settings {
     $worker_group = "balrogworker-v1"
     $worker_type = "balrogworker-v1"
     $taskcluster_client_id = secret("balrogworker_dev_taskcluster_client_id")
     $taskcluster_access_token = secret("balrogworker_dev_taskcluster_access_token")
     $verbose_logging = true
 
     $env_config = {
         "dev" => {
+            balrog_username => "stage-ffxbld",
+            balrog_password => secret("stage-ffxbld_ldap_password"),
+            balrog_api_root => "https://balrog-admin.stage.mozaws.net/api",
+        },
+        "prod" => {
             balrog_username => "ffxbld",
             balrog_password => secret("ffxbld_ldap_password"),
-            balrog_api_root => "https://aus4-admin.mozilla.org/api"
+            balrog_api_root => "https://aus4-admin.mozilla.org/api",
         }
     }
 }

--- a/modules/beetmover_scriptworker/manifests/settings.pp
+++ b/modules/beetmover_scriptworker/manifests/settings.pp
@@ -8,15 +8,18 @@ class beetmover_scriptworker::settings {
     $worker_group = "beetmoverworker-v1"
     $worker_type = "beetmoverworker-v1"
     $taskcluster_client_id = secret("beetmoverworker_dev_taskcluster_client_id")
     $taskcluster_access_token = secret("beetmoverworker_dev_taskcluster_access_token")
     $verbose_logging = true
 
     $env_config = {
         "dev" => {
+
+        },
+        "prod" => {
             beetmover_aws_access_key_id => secret("nightly-beetmover-aws_access_key_id"),
             beetmover_aws_secret_access_key => secret("nightly-beetmover-aws_secret_access_key"),
             beetmover_aws_s3_firefox_bucket => "net-mozaws-prod-delivery-firefox",
             beetmover_aws_s3_fennec_bucket => "net-mozaws-prod-delivery-archive",
         }
     }
 }