--- a/modules/balrog_scriptworker/manifests/init.pp
+++ b/modules/balrog_scriptworker/manifests/init.pp
@@ -99,17 +99,17 @@ class balrog_scriptworker {
             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_type               => $env_config["worker_type"],
 
             task_max_timeout          => $balrog_scriptworker::settings::task_max_timeout,
-            artifact_expiration_hours => $balrog_scriptworker::settings::artifact_expiration_hours,
+            artifact_expiration_hours => $env_config["artifact_expiration_hours"],
 
             cot_job_type              => 'balrog',
 
             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/beetmover_scriptworker/manifests/init.pp
+++ b/modules/beetmover_scriptworker/manifests/init.pp
@@ -74,17 +74,17 @@ class beetmover_scriptworker {
             group                     => $users::builder::group,
 
             taskcluster_client_id     => $env_config["taskcluster_client_id"],
             taskcluster_access_token  => $env_config["taskcluster_access_token"],
             worker_group              => $beetmover_scriptworker::settings::worker_group,
             worker_type               => $env_config["worker_type"],
 
             task_max_timeout          => $beetmover_scriptworker::settings::task_max_timeout,
-            artifact_expiration_hours => $beetmover_scriptworker::settings::artifact_expiration_hours,
+            artifact_expiration_hours => $env_config["artifact_expiration_hours"],
 
             cot_job_type              => 'beetmover',
 
             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           => $beetmover_scriptworker::settings::verbose_logging,

--- a/modules/pushapk_scriptworker/manifests/settings.pp
+++ b/modules/pushapk_scriptworker/manifests/settings.pp
@@ -43,16 +43,18 @@ class pushapk_scriptworker::settings {
     $user = $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                        = $_env_config['worker_group']
     $worker_type                         = $_env_config['worker_type']
 
+    $artifact_expiration_hours           = $_env_config['artifact_expiration_hours']
+
     $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']
 
     $_google_play_all_accounts           = hiera_hash('pushapk_scriptworker_google_play_accounts')
     $_google_play_accounts               = $_google_play_all_accounts[$fqdn]
 
     # TODO: Replace this cumbersome logic by an `each` loop once we switch to Puppet 4

--- a/modules/shipit_scriptworker/manifests/settings.pp
+++ b/modules/shipit_scriptworker/manifests/settings.pp
@@ -65,16 +65,18 @@ class shipit_scriptworker::settings {
     $user                       = $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               = $_env_config['worker_group']
     $worker_type                = $_env_config['worker_type']
 
+    $artifact_expiration_hours  = $_env_config['artifact_expiration_hours']
+
     $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            = $_env_config['verbose_logging']
 
     $script_config              = "${root}/script_config.json"
     $script_config_content      = {

--- a/modules/signing_scriptworker/manifests/init.pp
+++ b/modules/signing_scriptworker/manifests/init.pp
@@ -79,17 +79,17 @@ class signing_scriptworker {
             username                  => $users::signer::username,
             group                     => $users::signer::group,
 
             taskcluster_client_id     => $env_config['taskcluster_client_id'],
             taskcluster_access_token  => $env_config['taskcluster_access_token'],
             worker_group              => $env_config['worker_group'],
             worker_type               => $env_config['worker_type'],
             task_max_timeout          => $signing_scriptworker::settings::task_max_timeout,
-            artifact_expiration_hours => $signing_scriptworker::settings::artifact_expiration_hours,
+            artifact_expiration_hours => $env_config['artifact_expiration_hours'],
 
             cot_job_type              => 'signing',
             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"],
 

--- a/modules/transparency_scriptworker/manifests/init.pp
+++ b/modules/transparency_scriptworker/manifests/init.pp
@@ -68,17 +68,17 @@ class transparency_scriptworker {
 
             taskcluster_client_id     => $env_config["taskcluster_client_id"],
             taskcluster_access_token  => $env_config["taskcluster_access_token"],
             worker_id                 => $env_config["worker_id"],
             worker_group              => $env_config["worker_group"],
             worker_type               => $env_config["worker_type"],
 
             task_max_timeout          => $transparency_scriptworker::settings::task_max_timeout,
-            artifact_expiration_hours => $transparency_scriptworker::settings::artifact_expiration_hours,
+            artifact_expiration_hours => $env_config["artifact_expiration_hours"],
 
             cot_job_type              => 'transparency',
 
             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           => $transparency_scriptworker::settings::verbose_logging,

--- a/modules/tree_scriptworker/manifests/init.pp
+++ b/modules/tree_scriptworker/manifests/init.pp
@@ -69,17 +69,17 @@ class tree_scriptworker {
             group                     => $users::builder::group,
 
             taskcluster_client_id     => $env_config["taskcluster_client_id"],
             taskcluster_access_token  => $env_config["taskcluster_access_token"],
             worker_group              => $tree_scriptworker::settings::worker_group,
             worker_type               => $env_config["worker_type"],
 
             task_max_timeout          => $tree_scriptworker::settings::task_max_timeout,
-            artifact_expiration_hours => $tree_scriptworker::settings::artifact_expiration_hours,
+            artifact_expiration_hours => $env_config["artifact_expiration_hours"],
 
             cot_job_type              => 'scriptworker',
 
             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           => $tree_scriptworker::settings::verbose_logging,