diff --git a/ansible/group_vars/boot.yml b/ansible/group_vars/boot.yml
index 5c76a66..6ed2598 100644
--- a/ansible/group_vars/boot.yml
+++ b/ansible/group_vars/boot.yml
@@ -12,7 +12,7 @@ nim_waku_log_level: 'debug'
 nim_waku_protocols_enabled: ['relay', 'filter', 'lightpush', 'peer-exchange']
 nim_waku_disc_v5_enabled: true
 nim_waku_dns4_domain_name: '{{ dns_entry }}'
-nim_waku_node_key: '{{lookup("bitwarden", "fleets/shards/"+stage+"/nodekeys", field=hostname)}}'
+#nim_waku_node_key: '{{lookup("bitwarden", "fleets/shards/"+stage+"/nodekeys", field=hostname)}}'
 
 # Topic configuration
 nim_waku_cluster_id: 16
@@ -44,7 +44,8 @@ nim_waku_store_message_retention_policy: 'time:2592000' # 30 days
 # DNS Discovery
 nim_waku_dns_disc_enabled: true
 nim_waku_dns_disc_url_map:
-  test: 'enrtree://AMOJVZX4V6EXP7NTJPMAYJYST2QP6AJXYW76IU6VGJS7UVSNDYZG4@boot.test.shards.nodes.status.im'
+  test:    'enrtree://AMOJVZX4V6EXP7NTJPMAYJYST2QP6AJXYW76IU6VGJS7UVSNDYZG4@boot.test.shards.nodes.status.im'
+  staging: 'enrtree://AI4W5N5IFEUIHF5LESUAOSMV6TKWF2MB6GU2YK7PU4TYUGUNOCEPW@boot.staging.shards.nodes.status.im'
 nim_waku_dns_disc_url: '{{ nim_waku_dns_disc_url_map[stage] }}'
 
 # Websockets
@@ -65,10 +66,16 @@ certbot_docker_enabled: true
 certbot_admin_email: 'devops@status.im'
 certbot_services_to_stop: ['nginx']
 certbot_containers_to_stop: ['{{ nim_waku_cont_name }}']
-certbot_certs:
-  - domains:
-      - '{{ nim_waku_websocket_domain }}'
-      - '{{ nim_waku_websocket_domain | replace("status.im", "statusim.net") }}' # Legacy Domain
+certbot_certs: '{{ certbot_certs_map[stage] }}'
+# FIXME: Remove once ENR records are updated without the domain.
+certbot_certs_map:
+  test:
+    - domains:
+        - '{{ nim_waku_websocket_domain }}'
+        - '{{ nim_waku_websocket_domain | replace("status.im", "statusim.net") }}' # Legacy Domain
+  staging:
+    - domains:
+        - '{{ nim_waku_websocket_domain }}'
 
 # Open LibP2P Ports
 open_ports_default_comment: '{{ nim_waku_cont_name }}'
diff --git a/ansible/group_vars/store.yml b/ansible/group_vars/store.yml
index 5bf64d5..a9db215 100644
--- a/ansible/group_vars/store.yml
+++ b/ansible/group_vars/store.yml
@@ -12,7 +12,7 @@ nim_waku_log_level: 'debug'
 nim_waku_protocols_enabled: ['relay', 'store']
 nim_waku_disc_v5_enabled: true
 nim_waku_dns4_domain_name: '{{ dns_entry }}'
-nim_waku_node_key: '{{lookup("bitwarden", "fleets/shards/"+stage+"/nodekeys", field=hostname)}}'
+#nim_waku_node_key: '{{lookup("bitwarden", "fleets/shards/"+stage+"/nodekeys", field=hostname)}}'
 
 # Topic configuration
 nim_waku_cluster_id: 16
@@ -49,7 +49,8 @@ nim_waku_store_message_retention_policy: 'time:2592000' # 30 days
 # DNS Discovery
 nim_waku_dns_disc_enabled: true
 nim_waku_dns_disc_url_map:
-  test: 'enrtree://AMOJVZX4V6EXP7NTJPMAYJYST2QP6AJXYW76IU6VGJS7UVSNDYZG4@boot.test.shards.nodes.status.im'
+  test:    'enrtree://AMOJVZX4V6EXP7NTJPMAYJYST2QP6AJXYW76IU6VGJS7UVSNDYZG4@boot.test.shards.nodes.status.im'
+  staging: 'enrtree://AI4W5N5IFEUIHF5LESUAOSMV6TKWF2MB6GU2YK7PU4TYUGUNOCEPW@boot.staging.shards.nodes.status.im'
 nim_waku_dns_disc_url: '{{ nim_waku_dns_disc_url_map[stage] }}'
 
 # Websockets
@@ -70,10 +71,16 @@ certbot_docker_enabled: true
 certbot_admin_email: 'devops@status.im'
 certbot_services_to_stop: ['nginx']
 certbot_containers_to_stop: ['{{ nim_waku_cont_name }}']
-certbot_certs:
-  - domains:
-      - '{{ nim_waku_websocket_domain }}'
-      - '{{ nim_waku_websocket_domain | replace("status.im", "statusim.net") }}' # Legacy Domain
+certbot_certs: '{{ certbot_certs_map[stage] }}'
+# FIXME: Remove once ENR records are updated without the domain.
+certbot_certs_map:
+  test:
+    - domains:
+        - '{{ nim_waku_websocket_domain }}'
+        - '{{ nim_waku_websocket_domain | replace("status.im", "statusim.net") }}' # Legacy Domain
+  staging:
+    - domains:
+        - '{{ nim_waku_websocket_domain }}'
 
 # Open LibP2P Ports
 open_ports_default_comment: '{{ nim_waku_cont_name }}'
diff --git a/ansible/inventory/staging b/ansible/inventory/staging
new file mode 100644
index 0000000..78f444f
--- /dev/null
+++ b/ansible/inventory/staging
@@ -0,0 +1,66 @@
+# NOTE: This file is generated by terraform.py
+# For emergency use when Consul fails
+[all]
+boot-01.ac-cn-hongkong-c.shards.staging hostname=boot-01.ac-cn-hongkong-c.shards.staging ansible_host=47.76.168.186 env=shards stage=staging data_center=ac-cn-hongkong-c region=cn-hongkong-c dns_entry=boot-01.ac-cn-hongkong-c.shards.staging.status.im
+boot-01.do-ams3.shards.staging hostname=boot-01.do-ams3.shards.staging ansible_host=143.198.250.233 env=shards stage=staging data_center=do-ams3 region=ams3 dns_entry=boot-01.do-ams3.shards.staging.status.im
+boot-01.gc-us-central1-a.shards.staging hostname=boot-01.gc-us-central1-a.shards.staging ansible_host=104.197.5.96 env=shards stage=staging data_center=gc-us-central1-a region=us-central1-a dns_entry=boot-01.gc-us-central1-a.shards.staging.status.im
+store-01.ac-cn-hongkong-c.shards.staging hostname=store-01.ac-cn-hongkong-c.shards.staging ansible_host=8.218.206.134 env=shards stage=staging data_center=ac-cn-hongkong-c region=cn-hongkong-c dns_entry=store-01.ac-cn-hongkong-c.shards.staging.status.im
+store-01.do-ams3.shards.staging hostname=store-01.do-ams3.shards.staging ansible_host=24.144.78.119 env=shards stage=staging data_center=do-ams3 region=ams3 dns_entry=store-01.do-ams3.shards.staging.status.im
+store-01.gc-us-central1-a.shards.staging hostname=store-01.gc-us-central1-a.shards.staging ansible_host=35.224.231.209 env=shards stage=staging data_center=gc-us-central1-a region=us-central1-a dns_entry=store-01.gc-us-central1-a.shards.staging.status.im
+store-02.ac-cn-hongkong-c.shards.staging hostname=store-02.ac-cn-hongkong-c.shards.staging ansible_host=47.76.178.164 env=shards stage=staging data_center=ac-cn-hongkong-c region=cn-hongkong-c dns_entry=store-02.ac-cn-hongkong-c.shards.staging.status.im
+store-02.do-ams3.shards.staging hostname=store-02.do-ams3.shards.staging ansible_host=24.144.78.120 env=shards stage=staging data_center=do-ams3 region=ams3 dns_entry=store-02.do-ams3.shards.staging.status.im
+store-02.gc-us-central1-a.shards.staging hostname=store-02.gc-us-central1-a.shards.staging ansible_host=34.72.140.183 env=shards stage=staging data_center=gc-us-central1-a region=us-central1-a dns_entry=store-02.gc-us-central1-a.shards.staging.status.im
+store-db-01.ac-cn-hongkong-c.shards.staging hostname=store-db-01.ac-cn-hongkong-c.shards.staging ansible_host=47.76.183.131 env=shards stage=staging data_center=ac-cn-hongkong-c region=cn-hongkong-c dns_entry=store-db-01.ac-cn-hongkong-c.shards.staging.status.im
+store-db-01.do-ams3.shards.staging hostname=store-db-01.do-ams3.shards.staging ansible_host=24.144.78.121 env=shards stage=staging data_center=do-ams3 region=ams3 dns_entry=store-db-01.do-ams3.shards.staging.status.im
+store-db-01.gc-us-central1-a.shards.staging hostname=store-db-01.gc-us-central1-a.shards.staging ansible_host=34.173.29.3 env=shards stage=staging data_center=gc-us-central1-a region=us-central1-a dns_entry=store-db-01.gc-us-central1-a.shards.staging.status.im
+
+[ac-cn-hongkong-c]
+boot-01.ac-cn-hongkong-c.shards.staging
+store-01.ac-cn-hongkong-c.shards.staging
+store-02.ac-cn-hongkong-c.shards.staging
+store-db-01.ac-cn-hongkong-c.shards.staging
+
+[boot]
+boot-01.ac-cn-hongkong-c.shards.staging
+boot-01.do-ams3.shards.staging
+boot-01.gc-us-central1-a.shards.staging
+
+[do-ams3]
+boot-01.do-ams3.shards.staging
+store-01.do-ams3.shards.staging
+store-02.do-ams3.shards.staging
+store-db-01.do-ams3.shards.staging
+
+[gc-us-central1-a]
+boot-01.gc-us-central1-a.shards.staging
+store-01.gc-us-central1-a.shards.staging
+store-02.gc-us-central1-a.shards.staging
+store-db-01.gc-us-central1-a.shards.staging
+
+[shards.staging]
+boot-01.ac-cn-hongkong-c.shards.staging
+boot-01.do-ams3.shards.staging
+boot-01.gc-us-central1-a.shards.staging
+store-01.ac-cn-hongkong-c.shards.staging
+store-01.do-ams3.shards.staging
+store-01.gc-us-central1-a.shards.staging
+store-02.ac-cn-hongkong-c.shards.staging
+store-02.do-ams3.shards.staging
+store-02.gc-us-central1-a.shards.staging
+store-db-01.ac-cn-hongkong-c.shards.staging
+store-db-01.do-ams3.shards.staging
+store-db-01.gc-us-central1-a.shards.staging
+
+[store]
+store-01.ac-cn-hongkong-c.shards.staging
+store-01.do-ams3.shards.staging
+store-01.gc-us-central1-a.shards.staging
+store-02.ac-cn-hongkong-c.shards.staging
+store-02.do-ams3.shards.staging
+store-02.gc-us-central1-a.shards.staging
+
+[store-db]
+store-db-01.ac-cn-hongkong-c.shards.staging
+store-db-01.do-ams3.shards.staging
+store-db-01.gc-us-central1-a.shards.staging
+
diff --git a/workspaces.tf b/workspaces.tf
index 57c907b..ad8cd99 100644
--- a/workspaces.tf
+++ b/workspaces.tf
@@ -24,6 +24,9 @@ locals {
     test = {
       /* Settings specific to the test fleet/workspace. */
     }
+    staging = {
+      /* Settings specific to the test fleet/workspace. */
+    }
   }
 }