diff --git a/ansible/inventory/test b/ansible/inventory/test
index bb69c0d..505b3e8 100644
--- a/ansible/inventory/test
+++ b/ansible/inventory/test
@@ -7,6 +7,7 @@ devel-small-01.aws-eu-central-1a.nimbus.pyrmont hostname=devel-small-01.aws-eu-c
 devel-small-02.aws-eu-central-1a.nimbus.pyrmont hostname=devel-small-02.aws-eu-central-1a.nimbus.pyrmont ansible_host=18.198.163.2 env=nimbus stage=pyrmont data_center=aws-eu-central-1a region=eu-central-1a dns_entry=devel-small-02.aws-eu-central-1a.nimbus.pyrmont.statusim.net
 devel-small-03.aws-eu-central-1a.nimbus.pyrmont hostname=devel-small-03.aws-eu-central-1a.nimbus.pyrmont ansible_host=18.198.65.195 env=nimbus stage=pyrmont data_center=aws-eu-central-1a region=eu-central-1a dns_entry=devel-small-03.aws-eu-central-1a.nimbus.pyrmont.statusim.net
 devel-small-04.aws-eu-central-1a.nimbus.pyrmont hostname=devel-small-04.aws-eu-central-1a.nimbus.pyrmont ansible_host=52.58.71.58 env=nimbus stage=pyrmont data_center=aws-eu-central-1a region=eu-central-1a dns_entry=devel-small-04.aws-eu-central-1a.nimbus.pyrmont.statusim.net
+goerli-01.aws-eu-central-1a.nimbus.geth hostname=goerli-01.aws-eu-central-1a.nimbus.geth ansible_host=18.194.109.141 env=nimbus stage=geth data_center=aws-eu-central-1a region=eu-central-1a dns_entry=goerli-01.aws-eu-central-1a.nimbus.geth.statusim.net
 libp2p-small-01.aws-eu-central-1a.nimbus.pyrmont hostname=libp2p-small-01.aws-eu-central-1a.nimbus.pyrmont ansible_host=18.158.168.125 env=nimbus stage=pyrmont data_center=aws-eu-central-1a region=eu-central-1a dns_entry=libp2p-small-01.aws-eu-central-1a.nimbus.pyrmont.statusim.net
 libp2p-small-02.aws-eu-central-1a.nimbus.pyrmont hostname=libp2p-small-02.aws-eu-central-1a.nimbus.pyrmont ansible_host=18.193.16.58 env=nimbus stage=pyrmont data_center=aws-eu-central-1a region=eu-central-1a dns_entry=libp2p-small-02.aws-eu-central-1a.nimbus.pyrmont.statusim.net
 master-large-01.aws-eu-central-1a.nimbus.pyrmont hostname=master-large-01.aws-eu-central-1a.nimbus.pyrmont ansible_host=3.127.208.1 env=nimbus stage=pyrmont data_center=aws-eu-central-1a region=eu-central-1a dns_entry=master-large-01.aws-eu-central-1a.nimbus.pyrmont.statusim.net
@@ -25,6 +26,7 @@ devel-small-01.aws-eu-central-1a.nimbus.pyrmont
 devel-small-02.aws-eu-central-1a.nimbus.pyrmont
 devel-small-03.aws-eu-central-1a.nimbus.pyrmont
 devel-small-04.aws-eu-central-1a.nimbus.pyrmont
+goerli-01.aws-eu-central-1a.nimbus.geth
 libp2p-small-01.aws-eu-central-1a.nimbus.pyrmont
 libp2p-small-02.aws-eu-central-1a.nimbus.pyrmont
 master-large-01.aws-eu-central-1a.nimbus.pyrmont
@@ -36,6 +38,9 @@ master-small-04.aws-eu-central-1a.nimbus.pyrmont
 toledo-01.aws-eu-central-1a.nimbus.test
 toledo-02.aws-eu-central-1a.nimbus.test
 
+[nimbus-geth-goerli]
+goerli-01.aws-eu-central-1a.nimbus.geth
+
 [nimbus-pyrmont-devel]
 devel-large-01.aws-eu-central-1a.nimbus.pyrmont
 devel-large-02.aws-eu-central-1a.nimbus.pyrmont
@@ -60,6 +65,9 @@ master-small-04.aws-eu-central-1a.nimbus.pyrmont
 toledo-01.aws-eu-central-1a.nimbus.test
 toledo-02.aws-eu-central-1a.nimbus.test
 
+[nimbus.geth]
+goerli-01.aws-eu-central-1a.nimbus.geth
+
 [nimbus.pyrmont]
 devel-large-01.aws-eu-central-1a.nimbus.pyrmont
 devel-large-02.aws-eu-central-1a.nimbus.pyrmont
diff --git a/geth.tf b/geth.tf
new file mode 100644
index 0000000..899e8ab
--- /dev/null
+++ b/geth.tf
@@ -0,0 +1,25 @@
+module "nimbus_geth_goerli" {
+  source = "github.com/status-im/infra-tf-amazon-web-services"
+
+  name   = "goerli"
+  env    = "nimbus"
+  stage  = "geth"
+  group  = "nimbus-geth-goerli"
+  domain = var.domain
+
+  /* Scaling */
+  instance_type = "t3a.medium"
+  root_vol_size = 10
+  data_vol_size = 50
+  data_vol_type = "gp2"
+  host_count    = 1
+
+  /* Firewall */
+  open_tcp_ports = [ 30303 ]
+
+  /* Plumbing */
+  vpc_id       = module.nimbus_network.vpc.id
+  subnet_id    = module.nimbus_network.subnets[0].id
+  secgroup_id  = module.nimbus_network.secgroup.id
+  keypair_name = aws_key_pair.jakubgs.key_name
+}