--- a/modules/beetmover_scriptworker/manifests/settings.pp
+++ b/modules/beetmover_scriptworker/manifests/settings.pp
@@ -10,17 +10,17 @@ class beetmover_scriptworker::settings {
 
     $verbose_logging          = true
 
     $env_config = {
         'dev' => {
             dep_beetmover_aws_access_key_id         => secret('stage-beetmover-aws_access_key_id'),
             dep_beetmover_aws_secret_access_key     => secret('stage-beetmover-aws_secret_access_key'),
             dep_buckets => {
-                devedition  => 'net-mozaws-stage-delivery-firefox',
+                devedition  => 'net-mozaws-stage-delivery-archive',
                 firefox     => 'net-mozaws-stage-delivery-firefox',
                 fennec      => 'net-mozaws-stage-delivery-archive',
                 mobile      => 'net-mozaws-stage-delivery-archive',
             },
 
             dep_partner_beetmover_aws_access_key_id => secret('dep_partner_beetmover_aws_access_key_id'),
             dep_partner_beetmover_aws_secret_access_key => secret('dep_partner_beetmover_aws_secret_access_key'),
             dep_partner_buckets => {
@@ -37,41 +37,41 @@ class beetmover_scriptworker::settings {
             verify_chain_of_trust                   => true,
             verify_cot_signature                    => false,
             cot_product                             => 'firefox',
         },
         'prod' => {
             nightly_beetmover_aws_access_key_id     => secret('nightly-beetmover-aws_access_key_id'),
             nightly_beetmover_aws_secret_access_key => secret('nightly-beetmover-aws_secret_access_key'),
             nightly_buckets => {
-                devedition => 'net-mozaws-prod-delivery-firefox',
+                devedition => 'net-mozaws-prod-delivery-archive',
                 firefox    => 'net-mozaws-prod-delivery-firefox',
                 fennec     => 'net-mozaws-prod-delivery-archive',
                 mobile     => 'net-mozaws-prod-delivery-archive',
             },
 
             release_beetmover_aws_access_key_id     => secret('beetmover-aws_access_key_id'),
             release_beetmover_aws_secret_access_key => secret('beetmover-aws_secret_access_key'),
             release_buckets => {
-                devedition  => 'net-mozaws-prod-delivery-firefox',
+                devedition  => 'net-mozaws-prod-delivery-archive',
                 firefox     => 'net-mozaws-prod-delivery-firefox',
                 fennec      => 'net-mozaws-prod-delivery-archive',
                 mobile      => 'net-mozaws-prod-delivery-archive',
             },
 
             partner_beetmover_aws_access_key_id => secret('partner_beetmover_aws_access_key_id'),
             partner_beetmover_aws_secret_access_key => secret('partner_beetmover_aws_secret_access_key'),
             partner_buckets => {
                 firefox     => 'fxpartners-distros',
             },
 
             dep_beetmover_aws_access_key_id         => secret('stage-beetmover-aws_access_key_id'),
             dep_beetmover_aws_secret_access_key     => secret('stage-beetmover-aws_secret_access_key'),
             dep_buckets => {
-                devedition  => 'net-mozaws-stage-delivery-firefox',
+                devedition  => 'net-mozaws-stage-delivery-archive',
                 firefox     => 'net-mozaws-stage-delivery-firefox',
                 fennec      => 'net-mozaws-stage-delivery-archive',
                 mobile      => 'net-mozaws-stage-delivery-archive',
             },
 
             dep_partner_beetmover_aws_access_key_id => secret('dep_partner_beetmover_aws_access_key_id'),
             dep_partner_beetmover_aws_secret_access_key => secret('dep_partner_beetmover_aws_secret_access_key'),
             dep_partner_buckets => {