diff --git a/ansible/roles/faucet/defaults/main.yml b/ansible/roles/faucet/defaults/main.yml
index 5d352a7..3578387 100644
--- a/ansible/roles/faucet/defaults/main.yml
+++ b/ansible/roles/faucet/defaults/main.yml
@@ -26,8 +26,7 @@ faucet_geth_main_port: 30303
 faucet_geth_rpc_port: 8545
 faucet_geth_rcp_api: 'eth,net,web3,admin,personal,shh'
 faucet_geth_alias: 'geth'
-faucet_geth_bootnodes:
-  - 'enode://a24ac7c5484ef4ed0c5eb2d36620ba4e4aa13b8c84684e1b4aab0cebea2ae45cb4d375b77eab56516d34bfbd3c1a833fc51296ff084b770b94fb9028c4d25ccf@52.169.42.101:30303'
+faucet_geth_bootnodes: []
 
 # generic container settings
 cont_state: started
diff --git a/ansible/roles/faucet/tasks/config.yml b/ansible/roles/faucet/tasks/config.yml
new file mode 100644
index 0000000..37d98b7
--- /dev/null
+++ b/ansible/roles/faucet/tasks/config.yml
@@ -0,0 +1,30 @@
+---
+- name: Create container folders
+  file:
+    path: '{{ item }}'
+    state: directory
+    mode: 0750
+    owner: dockremap
+    group: docker
+  with_items:
+    - '{{ faucet_geth_vol }}/data'
+    - '{{ faucet_geth_vol }}/data/keystore'
+
+- name: Create faucet wallet keystore file
+  copy:
+    dest: '{{ faucet_geth_vol }}/data/keystore/wallet.json'
+    content: '{{ faucet_account_json }}'
+    mode: 0640
+    owner: dockremap
+    group: docker
+
+- name: Create faucet wallet password file
+  copy:
+    dest: '{{ faucet_geth_vol }}/data/keystore/wallet.pass'
+    content: '{{ faucet_account_pass }}'
+    mode: 0640
+    owner: dockremap
+    group: docker
+
+- name: Load config based on network
+  include_vars: '{{ faucet_network }}.yml'
diff --git a/ansible/roles/faucet/tasks/geth.yml b/ansible/roles/faucet/tasks/geth.yml
index 79634b0..45aa64d 100644
--- a/ansible/roles/faucet/tasks/geth.yml
+++ b/ansible/roles/faucet/tasks/geth.yml
@@ -1,30 +1,6 @@
 ---
-- name: Create container folders
-  file:
-    path: '{{ item }}'
-    state: directory
-    mode: 0750
-    owner: dockremap
-    group: docker
-  with_items:
-    - '{{ faucet_geth_vol }}/data'
-    - '{{ faucet_geth_vol }}/data/keystore'
-
-- name: Create faucet wallet keystore file
-  copy:
-    dest: '{{ faucet_geth_vol }}/data/keystore/wallet.json'
-    content: '{{ faucet_account_json }}'
-    mode: 0640
-    owner: dockremap
-    group: docker
-
-- name: Create faucet wallet password file
-  copy:
-    dest: '{{ faucet_geth_vol }}/data/keystore/wallet.pass'
-    content: '{{ faucet_account_pass }}'
-    mode: 0640
-    owner: dockremap
-    group: docker
+- debug: msg={{faucet_network}}
+- debug: msg={{faucet_geth_bootnodes}}
 
 - name: 'Create geth container: {{ faucet_geth_name }}'
   docker_container:
@@ -39,7 +15,6 @@
     command: |
       --datadir=/data
       --networkid={{ faucet_network_id | mandatory }}
-      --bootnodes={{ faucet_geth_bootnodes | join(",") }}
       --password=/data/keystore/wallet.pass
       --unlock={{ faucet_account_addr }}
       --syncmode=light
@@ -49,6 +24,9 @@
       --rpcaddr=0.0.0.0
       --rpcport={{ faucet_geth_rpc_port }}
       --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/tasks/main.yml b/ansible/roles/faucet/tasks/main.yml
index 3c22929..f25e88d 100644
--- a/ansible/roles/faucet/tasks/main.yml
+++ b/ansible/roles/faucet/tasks/main.yml
@@ -1,5 +1,6 @@
 ---
 - import_tasks: wrapper.yml
+- import_tasks: config.yml
 - import_tasks: geth.yml
 - import_tasks: faucet.yml
 - import_tasks: proxy.yml
diff --git a/ansible/roles/faucet/vars/rinkeby.yml b/ansible/roles/faucet/vars/rinkeby.yml
new file mode 100644
index 0000000..7f0ab6d
--- /dev/null
+++ b/ansible/roles/faucet/vars/rinkeby.yml
@@ -0,0 +1,3 @@
+---
+faucet_geth_bootnodes:
+  - 'enode://a24ac7c5484ef4ed0c5eb2d36620ba4e4aa13b8c84684e1b4aab0cebea2ae45cb4d375b77eab56516d34bfbd3c1a833fc51296ff084b770b94fb9028c4d25ccf@52.169.42.101:30303'
diff --git a/ansible/roles/faucet/vars/ropsten.yml b/ansible/roles/faucet/vars/ropsten.yml
new file mode 100644
index 0000000..00492c6
--- /dev/null
+++ b/ansible/roles/faucet/vars/ropsten.yml
@@ -0,0 +1,2 @@
+---
+faucet_geth_bootnodes: []