diff --git a/ansible/group_vars/boot.yml b/ansible/group_vars/boot.yml
index 71d59bc..27bf2fa 100644
--- a/ansible/group_vars/boot.yml
+++ b/ansible/group_vars/boot.yml
@@ -13,12 +13,12 @@ nim_waku_dns4_domain_name: '{{ dns_entry }}'
 nim_waku_node_key: '{{lookup("bitwarden", "fleets/shards/"+stage+"/nodekeys", field=hostname)}}'
 
 # Topic configuration
+nim_waku_cluster_id: 16
 nim_waku_pubsub_topics:
   - '/waku/2/rs/16/32'
   - '/waku/2/rs/16/64'
   - '/waku/2/rs/16/128'
   - '/waku/2/rs/16/256'
-
 nim_waku_protected_topics:
   - '/waku/2/rs/16/128:045ced3b90fabf7673c5165f9cc3a038fd2cfeb96946538089c310b5eaa3a611094b27d8216d9ec8110bd0e0e9fa7a7b5a66e86a27954c9d88ebd41d0ab6cfbb91'
   - '/waku/2/rs/16/256:049022b33f7583f34463f5b7622e5da29f99f993e6858a478465c68ee114ccf142204eff285ed922349c4b71b178a2e1a2154b99bcc2d8e91b3994626ffa9f1a6c'
diff --git a/ansible/group_vars/store.yml b/ansible/group_vars/store.yml
index cfddc36..b9d050f 100644
--- a/ansible/group_vars/store.yml
+++ b/ansible/group_vars/store.yml
@@ -13,12 +13,12 @@ nim_waku_dns4_domain_name: '{{ dns_entry }}'
 nim_waku_node_key: '{{lookup("bitwarden", "fleets/shards/"+stage+"/nodekeys", field=hostname)}}'
 
 # Topic configuration
+nim_waku_cluster_id: 16
 nim_waku_pubsub_topics:
   - '/waku/2/rs/16/32'
   - '/waku/2/rs/16/64'
   - '/waku/2/rs/16/128'
   - '/waku/2/rs/16/256'
-
 nim_waku_protected_topics:
   - '/waku/2/rs/16/128:045ced3b90fabf7673c5165f9cc3a038fd2cfeb96946538089c310b5eaa3a611094b27d8216d9ec8110bd0e0e9fa7a7b5a66e86a27954c9d88ebd41d0ab6cfbb91'
   - '/waku/2/rs/16/256:049022b33f7583f34463f5b7622e5da29f99f993e6858a478465c68ee114ccf142204eff285ed922349c4b71b178a2e1a2154b99bcc2d8e91b3994626ffa9f1a6c'