diff --git a/ansible/group_vars/bridge-status-test.yml b/ansible/group_vars/bridge.yml
similarity index 100%
rename from ansible/group_vars/bridge-status-test.yml
rename to ansible/group_vars/bridge.yml
diff --git a/ansible/group_vars/status-test.yml b/ansible/group_vars/status-test.yml
deleted file mode 100644
index 02792a5..0000000
--- a/ansible/group_vars/status-test.yml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-nim_waku_cont_tag: 'deploy-status-{{ stage }}'
-nim_waku_cont_name: 'nim-waku'
-nim_waku_dns4_domain_name: '{{ dns_entry }}'
-
-# Protocols
-nim_waku_protocols_enabled: ['relay', 'filter', 'lightpush', 'store']
-
-# Ports
-nim_waku_p2p_tcp_port: 30303
-nim_waku_p2p_udp_port: 30303
-nim_waku_metrics_port: 8008
-nim_waku_rpc_tcp_port: 8545
-nim_waku_rpc_tcp_addr: 0.0.0.0
-
-# Limits
-nim_waku_p2p_max_connections: 150
-nim_waku_store_capacity: 10000
-
-# Open LibP2P Ports
-open_ports_default_comment: '{{ nim_waku_cont_name }}'
-open_ports_default_protocol: 'tcp'
-open_ports_default_chain: 'SERVICES'
-open_ports_list:
-  - { port: '{{ nim_waku_p2p_tcp_port }}' }
-  - { port: '{{ nim_waku_p2p_udp_port }}', protocol: 'udp' }
-  - { port: '{{ nim_waku_metrics_port }}', chain: 'VPN', ipset: 'metrics.hq' }
-  - { port: '{{ nim_waku_rpc_tcp_port }}', chain: 'VPN', ipset: '{{ env }}.{{ stage }}' }
-
diff --git a/ansible/group_vars/status-prod.yml b/ansible/group_vars/status.yml
similarity index 100%
rename from ansible/group_vars/status-prod.yml
rename to ansible/group_vars/status.yml
diff --git a/ansible/inventory/prod b/ansible/inventory/prod
index 2da6761..ea67a71 100644
--- a/ansible/inventory/prod
+++ b/ansible/inventory/prod
@@ -13,7 +13,7 @@ node-02.gc-us-central1-a.status.prod hostname=node-02.gc-us-central1-a.status.pr
 node-01.ac-cn-hongkong-c.status.prod
 node-02.ac-cn-hongkong-c.status.prod
 
-[bridge-status-prod]
+[bridge]
 bridge-01.do-ams3.status.prod
 
 [do-ams3]
@@ -25,7 +25,7 @@ node-02.do-ams3.status.prod
 node-01.gc-us-central1-a.status.prod
 node-02.gc-us-central1-a.status.prod
 
-[status-prod]
+[status]
 node-01.ac-cn-hongkong-c.status.prod
 node-01.do-ams3.status.prod
 node-01.gc-us-central1-a.status.prod
diff --git a/ansible/inventory/test b/ansible/inventory/test
index ad79ad0..22cb428 100644
--- a/ansible/inventory/test
+++ b/ansible/inventory/test
@@ -9,7 +9,7 @@ node-01.gc-us-central1-a.status.test hostname=node-01.gc-us-central1-a.status.te
 [ac-cn-hongkong-c]
 node-01.ac-cn-hongkong-c.status.test
 
-[bridge-status-test]
+[bridge]
 bridge-01.do-ams3.status.test
 
 [do-ams3]
@@ -19,7 +19,7 @@ node-01.do-ams3.status.test
 [gc-us-central1-a]
 node-01.gc-us-central1-a.status.test
 
-[status-test]
+[status]
 node-01.ac-cn-hongkong-c.status.test
 node-01.do-ams3.status.test
 node-01.gc-us-central1-a.status.test
diff --git a/ansible/main.yml b/ansible/main.yml
index 4c303c7..5e9136c 100644
--- a/ansible/main.yml
+++ b/ansible/main.yml
@@ -10,19 +10,15 @@
       changed_when: false
 
 - name: Configure Waku Nodes
-  hosts:
-    - status-test
-    - status-prod
+  hosts: status
   roles:
-    - { role: open-ports,      tags: open-ports      }
-    - { role: swap-file,       tags: swap-file       }
-    - { role: nim-waku,        tags: nim-waku        }
+    - { role: open-ports,      tags: open-ports       }
+    - { role: swap-file,       tags: swap-file        }
+    - { role: nim-waku,        tags: nim-waku         }
 
 - name: Configure Waku V1-V2 bridge
-  hosts:
-    - bridge-status-test
-    - bridge-status-prod
+  hosts: bridge
   roles:
-    - { role: open-ports,      tags: open-ports      }
-    - { role: swap-file,       tags: swap-file       }
-    - { role: nim-waku-bridge, tags: nim-waku-bridge }
+    - { role: open-ports,      tags: open-ports       }
+    - { role: swap-file,       tags: swap-file        }
+    - { role: nim-waku-bridge, tags: nim-waku-bridge  }
diff --git a/bridge.tf b/bridge.tf
index f7a445f..218d4a8 100644
--- a/bridge.tf
+++ b/bridge.tf
@@ -3,9 +3,9 @@ module "bridge" {
 
   /* node type */
   name   = "bridge"
+  group  = "bridge"
   env    = local.ws.env
   stage  = local.ws.stage
-  group  = "bridge-${local.ws.env}-${local.ws.stage}"
   domain = var.domain
 
   /* scaling */
diff --git a/nodes.tf b/nodes.tf
index e5e26b2..1cbac2c 100644
--- a/nodes.tf
+++ b/nodes.tf
@@ -2,9 +2,9 @@ module "hosts" {
   source = "github.com/status-im/infra-tf-multi-provider"
 
   /* node type */
+  group  = "status"
   env    = local.ws.env
   stage  = local.ws.stage
-  group  = "${local.ws.env}-${local.ws.stage}"
   domain = var.domain
 
   /* scaling */