diff --git a/ansible/group_vars/wakuv2.yml b/ansible/group_vars/wakuv2.yml
new file mode 100644
index 0000000..ffd0858
--- /dev/null
+++ b/ansible/group_vars/wakuv2.yml
@@ -0,0 +1,12 @@
+---
+# Tag dependent on fleet: test, prod
+nim_waku_cont_tag: 'wakunode2'
+
+nim_waku_p2p_tcp_port: 60000
+nim_waku_p2p_udp_port: 60000
+
+# Open Nginx Ports
+open_ports_comment: 'Nim-Waku-V2'
+open_ports_list:
+  - { port: '{{ nim_waku_p2p_tcp_port }}', protocol: 'tcp' }
+  - { port: '{{ nim_waku_p2p_udp_port }}', protocol: 'udp' }
diff --git a/ansible/inventory/test b/ansible/inventory/test
index 2ea885e..75602c0 100644
--- a/ansible/inventory/test
+++ b/ansible/inventory/test
@@ -3,6 +3,7 @@
 [all]
 node-01.ac-cn-hongkong-c.waku.test hostname=node-01.ac-cn-hongkong-c.waku.test ansible_host=47.244.118.89 env=waku stage=test data_center=ac-cn-hongkong-c region=cn-hongkong-c dns_entry=node-01.ac-cn-hongkong-c.waku.test.statusim.net
 node-01.do-ams3.waku.test hostname=node-01.do-ams3.waku.test ansible_host=64.225.83.94 env=waku stage=test data_center=do-ams3 region=ams3 dns_entry=node-01.do-ams3.waku.test.statusim.net
+node-01.do-ams3.wakuv2.test hostname=node-01.do-ams3.wakuv2.test ansible_host=134.209.139.210 env=wakuv2 stage=test data_center=do-ams3 region=ams3 dns_entry=node-01.do-ams3.wakuv2.test.statusim.net
 node-01.gc-us-central1-a.waku.test hostname=node-01.gc-us-central1-a.waku.test ansible_host=35.238.12.196 env=waku stage=test data_center=gc-us-central1-a region=us-central1-a dns_entry=node-01.gc-us-central1-a.waku.test.statusim.net
 
 [ac-cn-hongkong-c]
@@ -10,6 +11,7 @@ node-01.ac-cn-hongkong-c.waku.test
 
 [do-ams3]
 node-01.do-ams3.waku.test
+node-01.do-ams3.wakuv2.test
 
 [gc-us-central1-a]
 node-01.gc-us-central1-a.waku.test
@@ -19,3 +21,6 @@ node-01.ac-cn-hongkong-c.waku.test
 node-01.do-ams3.waku.test
 node-01.gc-us-central1-a.waku.test
 
+[wakuv2]
+node-01.do-ams3.wakuv2.test
+
diff --git a/ansible/main.yml b/ansible/main.yml
index 10980a8..8abcdb3 100644
--- a/ansible/main.yml
+++ b/ansible/main.yml
@@ -1,6 +1,12 @@
 ---
-- name: Configure Nimbus master
+- name: Configure Waku Nodes
   hosts: waku
   roles:
     - { role: open-ports, tags: open-ports }
     - { role: nim-waku,   tags: nim-waku }
+
+- name: Configure Waku v2 Nodes
+  hosts: wakuv2
+  roles:
+    - { role: open-ports, tags: open-ports }
+    - { role: nim-waku,   tags: nim-waku }
diff --git a/fleet.tf b/fleet.tf
index 57c682e..aee6c3c 100644
--- a/fleet.tf
+++ b/fleet.tf
@@ -17,3 +17,18 @@ module "nim_waku" {
   /* firewall */
   open_tcp_ports = [ "443" /* p2p */ ]
 }
+
+module "nim_waku_v2" {
+  source = "github.com/status-im/infra-tf-digital-ocean"
+
+  /* node type */
+  env    = "wakuv2"
+  group  = "wakuv2"
+  domain = var.domain
+
+  /* instance sizes */
+  size = "s-1vcpu-1gb"
+
+  /* firewall */
+  open_tcp_ports = [ "60000" /* p2p */ ]
+}