diff --git a/.drone.jsonnet b/.drone.jsonnet
index 87ce4402..c932b72c 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -1,7 +1,10 @@
 local Image(name, image) = {
 	name: name,
 	image: "gcr.io/kosu-io/" + image,
-	pull: "always",
+	pull: "always"
+};
+
+local GethConfig() = {
 	environment: {
 		WEB3_URI: "http://kosu-geth:8545",
 		WEB3_URI_WS: "ws://kosu-geth:8546",
@@ -30,7 +33,7 @@ local KosuGeth(name) = Image(name, "kosu-test-geth:latest") {
 		 	"depends_on": ["clone"],
 		},
 
-	    Image("build-project", "node-lts:latest") {
+	    Image("build-project", "node-lts:latest") + GethConfig() {
 			"commands": [
 				"yarn",
 				"yarn setup:ci",
@@ -41,12 +44,12 @@ local KosuGeth(name) = Image(name, "kosu-test-geth:latest") {
 			"depends_on": ["clone"]
 		},
 
-		Image("npm-tests", "node-lts:latest") {
+		Image("npm-tests", "node-lts:latest") + GethConfig() {
 			"commands": [ "yarn test:ci" ],
 			"depends_on": [ "build-project" ],
 		},
 
-		Image("solidity", "node-lts:latest") {
+		Image("solidity", "node-lts:latest") + GethConfig() {
 			"commands": [ "yarn contracts:test:ci" ],
 			"depends_on": [ "build-project" ],
 		},
diff --git a/.drone.yml b/.drone.yml
index 02b20313..6a18ca1c 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -12,9 +12,6 @@ steps:
   image: gcr.io/kosu-io/node-lts:latest
   commands:
   - yarn prettier:ci
-  environment:
-    WEB3_URI: http://kosu-geth:8545
-    WEB3_URI_WS: ws://kosu-geth:8546
   depends_on:
   - clone
 
@@ -62,9 +59,6 @@ steps:
   commands:
   - cd packages/go-kosu
   - ./kosud -H ./testnet/node0 -E ws://go-kosu-ci-geth:8546
-  environment:
-    WEB3_URI: http://kosu-geth:8545
-    WEB3_URI_WS: ws://kosu-geth:8546
   depends_on:
   - build-project
 
@@ -75,9 +69,6 @@ steps:
   commands:
   - cd packages/go-kosu
   - ./kosud -H ./testnet/node1 -E ws://go-kosu-ci-geth:8546
-  environment:
-    WEB3_URI: http://kosu-geth:8545
-    WEB3_URI_WS: ws://kosu-geth:8546
   depends_on:
   - build-project
 
@@ -88,9 +79,6 @@ steps:
   commands:
   - cd packages/go-kosu
   - ./kosud -H ./testnet/node2 -E ws://go-kosu-ci-geth:8546
-  environment:
-    WEB3_URI: http://kosu-geth:8545
-    WEB3_URI_WS: ws://kosu-geth:8546
   depends_on:
   - build-project
 
@@ -101,9 +89,6 @@ steps:
   commands:
   - cd packages/go-kosu
   - ./kosud -H ./testnet/node3 -E ws://go-kosu-ci-geth:8546
-  environment:
-    WEB3_URI: http://kosu-geth:8545
-    WEB3_URI_WS: ws://kosu-geth:8546
   depends_on:
   - build-project
 
@@ -114,9 +99,6 @@ steps:
   - cd packages/go-kosu
   - export KOSU_TEST_NODES=$(pwd)/testnet/node0@kosu-node-1:26657,$(pwd)/testnet/node1@kosu-node-1:26657,$(pwd)/testnet/node2@kosu-node-1:26657,$(pwd)/testnet/node3@kosu-node-1:26657
   - make ci
-  environment:
-    WEB3_URI: http://kosu-geth:8545
-    WEB3_URI_WS: ws://kosu-geth:8546
   depends_on:
   - build-project
   - kosu-node-0
@@ -128,9 +110,6 @@ services:
 - name: kosu-geth
   pull: always
   image: gcr.io/kosu-io/kosu-test-geth:latest
-  environment:
-    WEB3_URI: http://kosu-geth:8545
-    WEB3_URI_WS: ws://kosu-geth:8546
   ports:
   - 8545
   - 8546
@@ -138,9 +117,6 @@ services:
 - name: go-kosu-ci-geth
   pull: always
   image: gcr.io/kosu-io/kosu-test-geth:latest
-  environment:
-    WEB3_URI: http://kosu-geth:8545
-    WEB3_URI_WS: ws://kosu-geth:8546
   ports:
   - 8545
   - 8546