diff --git a/ansible/group_vars/store.yml b/ansible/group_vars/store.yml
index 29d8b7c..fcf43dd 100644
--- a/ansible/group_vars/store.yml
+++ b/ansible/group_vars/store.yml
@@ -47,7 +47,10 @@ nim_waku_store_message_db_name: 'nim-waku'
 nim_waku_store_message_db_user: 'nim-waku'
 nim_waku_store_message_db_pass: '{{lookup("bitwarden", "fleets/status/"+stage+"/db/nim-waku")}}'
 nim_waku_store_message_db_url: 'postgres://{{ nim_waku_store_message_db_user}}:{{ nim_waku_store_message_db_pass }}@store-db-01.{{ ansible_domain }}.wg:5432/{{nim_waku_store_message_db_name}}'
-nim_waku_store_message_retention_policy: 'time:2592000' # 30 days
+nim_waku_store_message_retention_policy_map:
+  test:    'size:250GB'
+  staging: 'size:80GB'
+nim_waku_store_message_retention_policy: '{{ nim_waku_store_message_retention_policy_map[stage] }}'
 
 # DNS Discovery
 nim_waku_dns_disc_enabled: true