diff --git a/ansible/roles/faucet/defaults/main.yml b/ansible/roles/faucet/defaults/main.yml
index 3578387..1c990db 100644
--- a/ansible/roles/faucet/defaults/main.yml
+++ b/ansible/roles/faucet/defaults/main.yml
@@ -1,17 +1,9 @@
 ---
-# map of network IDs
-miner_network_ids:
-  frontier: 1
-  morden: 2
-  ropsten: 3
-  rinkeby: 4
-
 faucet_account_pass: ~
 faucet_account_addr: ~
 faucet_account_json: ~
 faucet_domain: ~
 faucet_network: ~
-faucet_network_id: '{{ miner_network_ids[faucet_network] | mandatory }}'
 
 faucet_cont_tag: 'fixed'
 faucet_cont_image: 'statusteam/faucet:{{ faucet_cont_tag }}'
diff --git a/ansible/roles/faucet/tasks/config.yml b/ansible/roles/faucet/tasks/config.yml
index 37d98b7..76e19e8 100644
--- a/ansible/roles/faucet/tasks/config.yml
+++ b/ansible/roles/faucet/tasks/config.yml
@@ -25,6 +25,3 @@
     mode: 0640
     owner: dockremap
     group: docker
-
-- name: Load config based on network
-  include_vars: '{{ faucet_network }}.yml'
diff --git a/ansible/roles/faucet/tasks/firewall.yml b/ansible/roles/faucet/tasks/firewall.yml
index 260e6d1..a78f755 100644
--- a/ansible/roles/faucet/tasks/firewall.yml
+++ b/ansible/roles/faucet/tasks/firewall.yml
@@ -1,13 +1,16 @@
 ---
 - name: Enable geth port
   iptables:
-    comment: 'Enable geth'
+    comment: 'Enable geth {{ item }}'
     action: insert
     chain: DOCKER-USER
     jump: ACCEPT
     source: '0.0.0.0/0'
-    protocol: tcp
+    protocol: '{{ item }}'
     destination_port: '{{ faucet_geth_main_port }}'
+  with_items:
+    - tcp
+    - udp
   notify:
     - Save iptables rules
 
diff --git a/ansible/roles/faucet/tasks/geth.yml b/ansible/roles/faucet/tasks/geth.yml
index aff9b1b..54c788b 100644
--- a/ansible/roles/faucet/tasks/geth.yml
+++ b/ansible/roles/faucet/tasks/geth.yml
@@ -10,20 +10,22 @@
     recreate: '{{ cont_recreate }}'
     restart: '{{ cont_restart }}'
     command: |
-      --datadir=/data
-      --networkid={{ faucet_network_id | mandatory }}
-      --password=/data/keystore/wallet.pass
+      {% if faucet_network == "rinkeby" %}
+      --rinkeby
+      {% elif faucet_network == "ropsten" %}
+      --testnet
+      {% endif %}
+      --port={{ faucet_geth_main_port }}
       --unlock={{ faucet_account_addr }}
+      --datadir=/data
+      --password=/data/keystore/wallet.pass
       --syncmode=light
       --rpc
-      --rpcapi={{ faucet_geth_rcp_api }}
-      --rpcvhosts={{ faucet_geth_alias }},localhost
       --rpcaddr=0.0.0.0
+      --rpcapi={{ faucet_geth_rcp_api }}
       --rpcport={{ faucet_geth_rpc_port }}
+      --rpcvhosts={{ faucet_geth_alias }},localhost
       --v5disc
-      {% if faucet_geth_bootnodes | length %}
-      --bootnodes={{ faucet_geth_bootnodes | join(",") }}
-      {% endif %}
     ports:
       - '127.0.0.1:{{ faucet_geth_rpc_port }}:{{ faucet_geth_rpc_port }}'
       - '{{ faucet_geth_main_port }}:{{ faucet_geth_main_port }}'
diff --git a/ansible/roles/faucet/vars/rinkeby.yml b/ansible/roles/faucet/vars/rinkeby.yml
deleted file mode 100644
index 4130038..0000000
--- a/ansible/roles/faucet/vars/rinkeby.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-faucet_geth_bootnodes:
-  - 'enode://a24ac7c5484ef4ed0c5eb2d36620ba4e4aa13b8c84684e1b4aab0cebea2ae45cb4d375b77eab56516d34bfbd3c1a833fc51296ff084b770b94fb9028c4d25ccf@52.169.42.101:30303'
-  - 'enode://343149e4feefa15d882d9fe4ac7d88f885bd05ebb735e547f12e12080a9fa07c8014ca6fd7f373123488102fe5e34111f8509cf0b7de3f5b44339c9f25e87cb8@52.3.158.184:30303'
-  - 'enode://b6b28890b006743680c52e64e0d16db57f28124885595fa03a562be1d2bf0f3a1da297d56b13da25fb992888fd556d4c1a27b1f39d531bde7de1921c90061cc6@159.89.28.211:30303'
diff --git a/ansible/roles/faucet/vars/ropsten.yml b/ansible/roles/faucet/vars/ropsten.yml
deleted file mode 100644
index b22badd..0000000
--- a/ansible/roles/faucet/vars/ropsten.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-faucet_geth_bootnodes:
-  - 'enode://30b7ab30a01c124a6cceca36863ece12c4f5fa68e3ba9b0b51407ccc002eeed3b3102d20a88f1c1d3c3154e2449317b8ef95090e77b312d5cc39354f86d5d606@52.176.7.10:30303'
-  - 'enode://865a63255b3bb68023b6bffd5095118fcc13e79dcf014fe4e47e065c350c7cc72af2e53eff895f11ba1bbb6a2b33271c1116ee870f266618eadfc2e78aa7349c@52.176.100.77:30303'
-  - 'enode://6332792c4a00e3e4ee0926ed89e0d27ef985424d97b6a45bf0f23e51f0dcb5e66b875777506458aea7af6f9e4ffb69f43f3778ee73c81ed9d34c51c4b16b0b0f@52.232.243.152:30303'
-  - 'enode://94c15d1b9e2fe7ce56e458b9a3b672ef11894ddedd0c6f247e0f1d3487f52b66208fb4aeb8179fce6e3a749ea93ed147c37976d67af557508d199d9594c35f09@192.81.208.223:30303'