diff --git a/ansible/group_vars/goerli-les.yml b/ansible/group_vars/goerli-les.yml
new file mode 100644
index 0000000..5b4c9c6
--- /dev/null
+++ b/ansible/group_vars/goerli-les.yml
@@ -0,0 +1,13 @@
+---
+# Run les-goerli.misc fleet on Ropsten
+geth_network_name: goerli
+geth_cont_name: les-geth-full
+geth_sync_mode: full
+geth_data_path: /data
+geth_cont_image: 'ethereum/client-go:v1.8.27'
+geth_log_level_name: info
+
+# geth metrics
+geth_source_cont_name: '{{ geth_cont_name }}'
+geth_expo_cont_name: '{{ geth_cont_name }}-metrics'
+geth_expo_cont_image: 'statusteam/geth_exporter:sync-metrics'
diff --git a/ansible/inventory/les b/ansible/inventory/les
index e54162e..ecaa0cf 100644
--- a/ansible/inventory/les
+++ b/ansible/inventory/les
@@ -3,8 +3,11 @@
 [all]
 node-03.do-ams3.main.les hostname=node-03.do-ams3.main.les ansible_host=167.99.17.35 env=main stage=les data_center=do-ams3 region=ams3 dns_entry=node-03.do-ams3.main.les.statusim.net
 node-03.do-ams3.rops.les hostname=node-03.do-ams3.rops.les ansible_host=206.189.243.9 env=rops stage=les data_center=do-ams3 region=ams3 dns_entry=node-03.do-ams3.rops.les.statusim.net
+node-03.do-ams3.goerli.les hostname=node-03.do-ams3.goerli.les ansible_host=167.99.19.25 env=goerli stage=les data_center=do-ams3 region=ams3 dns_entry=node-03.do-ams3.goerli.les.statusim.net
 node-02.do-ams3.main.les hostname=node-02.do-ams3.main.les ansible_host=206.189.243.2 env=main stage=les data_center=do-ams3 region=ams3 dns_entry=node-02.do-ams3.main.les.statusim.net
+node-01.do-ams3.goerli.les hostname=node-01.do-ams3.goerli.les ansible_host=167.99.19.32 env=goerli stage=les data_center=do-ams3 region=ams3 dns_entry=node-01.do-ams3.goerli.les.statusim.net
 node-01.do-ams3.rops.les hostname=node-01.do-ams3.rops.les ansible_host=206.189.243.32 env=rops stage=les data_center=do-ams3 region=ams3 dns_entry=node-01.do-ams3.rops.les.statusim.net
+node-02.do-ams3.goerli.les hostname=node-02.do-ams3.goerli.les ansible_host=167.99.16.213 env=goerli stage=les data_center=do-ams3 region=ams3 dns_entry=node-02.do-ams3.goerli.les.statusim.net
 node-01.do-ams3.main.les hostname=node-01.do-ams3.main.les ansible_host=206.189.240.221 env=main stage=les data_center=do-ams3 region=ams3 dns_entry=node-01.do-ams3.main.les.statusim.net
 node-02.do-ams3.rops.les hostname=node-02.do-ams3.rops.les ansible_host=206.189.243.18 env=rops stage=les data_center=do-ams3 region=ams3 dns_entry=node-02.do-ams3.rops.les.statusim.net
 
@@ -13,7 +16,15 @@ node-03.do-ams3.main.les
 node-01.do-ams3.main.les
 node-02.do-ams3.main.les
 
+[goerli-les]
+node-03.do-ams3.goerli.les
+node-01.do-ams3.goerli.les
+node-02.do-ams3.goerli.les
+
 [do-ams3]
+node-03.do-ams3.goerli.les
+node-01.do-ams3.goerli.les
+node-02.do-ams3.goerli.les
 node-03.do-ams3.main.les
 node-01.do-ams3.main.les
 node-02.do-ams3.main.les
diff --git a/ansible/main.yml b/ansible/main.yml
index 34b2b7d..f6be258 100644
--- a/ansible/main.yml
+++ b/ansible/main.yml
@@ -3,6 +3,7 @@
   hosts:
     - main-les
     - rops-les
+    - goerli-les
   roles:
     - infra-role-geth
     - infra-role-geth-exporter
diff --git a/main.tf b/main.tf
index 99b542d..fdf4c71 100644
--- a/main.tf
+++ b/main.tf
@@ -46,3 +46,14 @@ module "les-rops" {
   domain   = "${var.domain}"
   open_ports = [ "30303-30303" ]
 }
+
+module "les-goerli" {
+  source   = "github.com/status-im/infra-tf-digital-ocean"
+  count    = 3
+  env      = "goerli"
+  group    = "goerli-les"
+  size     = "s-2vcpu-4gb"
+  vol_size = 100
+  domain   = "${var.domain}"
+  open_ports = [ "30303-30303" ]
+}