diff --git a/roles/fedimg/templates/fedimg-conf.toml b/roles/fedimg/templates/fedimg-conf.toml
index 4a30b662da..0cda9831f5 100644
--- a/roles/fedimg/templates/fedimg-conf.toml
+++ b/roles/fedimg/templates/fedimg-conf.toml
@@ -13,6 +13,11 @@ secret_key = '{{fedimg_aws_stg_secret_key}}'
 access_id = '{{fedimg_aws_prod_access_id}}'
 secret_key = '{{fedimg_aws_prod_secret_key}}'
 {% endif %}
+{% if env == 'staging' %}
+bucket_name = 'fedora-s3-bucket-fedimg-test'
+{% else %}
+bucket_name = 'fedora-s3-bucket-fedimg'
+{% endif %}
 base_region = 'us-east-1'
 regions = ['ap-northeast-2', 'us-east-2', 'ap-southeast-1', 'ap-southeast-2',
            'ap-south-1', 'eu-west-1', 'sa-east-1', 'us-east-1', 'us-west-2',