diff --git a/ansible/group_vars/boot.yml b/ansible/group_vars/boot.yml
index 27bf2fa..649d94f 100644
--- a/ansible/group_vars/boot.yml
+++ b/ansible/group_vars/boot.yml
@@ -4,7 +4,8 @@ bootstrap__active_extra_users:
   - { name: ivan,    uid: 8000, groups: ['docker', 'dockremap'], key: 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJBdm8y1PfWjT1pioaWJSZ2ETrUySb+dS/ifDg+VIpLY ivansete@status.im' }
 
 # Tag dependent on fleet: test
-nim_waku_cont_tag: 'deploy-shards-{{ stage }}'
+#nim_waku_cont_tag: 'deploy-shards-{{ stage }}'
+nim_waku_cont_tag: 'v0.24.0'
 nim_waku_cont_name: 'nim-waku-boot'
 nim_waku_log_level: 'debug'
 nim_waku_protocols_enabled: ['relay', 'filter', 'lightpush', 'peer-exchange']
diff --git a/ansible/group_vars/store.yml b/ansible/group_vars/store.yml
index b9d050f..ec6536c 100644
--- a/ansible/group_vars/store.yml
+++ b/ansible/group_vars/store.yml
@@ -4,7 +4,8 @@ bootstrap__active_extra_users:
   - { name: ivan,    uid: 8000, groups: ['docker', 'dockremap'], key: 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJBdm8y1PfWjT1pioaWJSZ2ETrUySb+dS/ifDg+VIpLY ivansete@status.im' }
 
 # Tag dependent on fleet: test
-nim_waku_cont_tag: 'deploy-shards-{{ stage }}'
+#nim_waku_cont_tag: 'deploy-shards-{{ stage }}'
+nim_waku_cont_tag: 'v0.24.0'
 nim_waku_cont_name: 'nim-waku-store'
 nim_waku_log_level: 'debug'
 nim_waku_protocols_enabled: ['relay', 'store']
diff --git a/ansible/host_vars/store-02.gc-us-central1-a.shards.test.yml b/ansible/host_vars/store-02.gc-us-central1-a.shards.test.yml
new file mode 100644
index 0000000..58f286d
--- /dev/null
+++ b/ansible/host_vars/store-02.gc-us-central1-a.shards.test.yml
@@ -0,0 +1,3 @@
+---
+# Allow Waku team debug connection issues with 0.25.0.
+nim_waku_cont_tag: 'v0.25.0'