diff --git a/build.gradle b/build.gradle
index 3d3803a290..489fb7b640 100644
--- a/build.gradle
+++ b/build.gradle
@@ -135,8 +135,9 @@ dependencies {
     compile project(':node')
     compile "com.google.guava:guava:$guava_version"
 
-    runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
-    runtime project(path: ":webserver:webcapsule", configuration: 'runtimeArtifacts')
+    // Set to compile to ensure it exists now deploy nodes no longer relies on build
+    compile project(path: ":node:capsule", configuration: 'runtimeArtifacts')
+    compile project(path: ":webserver:webcapsule", configuration: 'runtimeArtifacts')
 
     // For the buildCordappDependenciesJar task
     runtime project(':client:jfx')
@@ -173,7 +174,7 @@ tasks.withType(Test) {
     reports.html.destination = file("${reporting.baseDir}/${name}")
 }
 
-task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['build']) {
+task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
     directory "./build/nodes"
     networkMap "Controller"
     node {
diff --git a/docs/source/creating-a-cordapp.rst b/docs/source/creating-a-cordapp.rst
index d3c977089b..a1884718fe 100644
--- a/docs/source/creating-a-cordapp.rst
+++ b/docs/source/creating-a-cordapp.rst
@@ -192,7 +192,7 @@ is a three node example;
 
 .. code-block:: text
 
-    task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['build']) {
+    task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
         directory "./build/nodes" // The output directory
         networkMap "Controller" // The artemis address of the node named here will be used as the networkMapService.address on all other nodes.
         node {
diff --git a/docs/source/example-code/build.gradle b/docs/source/example-code/build.gradle
index 165fc52623..f9ed909ea9 100644
--- a/docs/source/example-code/build.gradle
+++ b/docs/source/example-code/build.gradle
@@ -74,7 +74,7 @@ task integrationTest(type: Test) {
     classpath = sourceSets.integrationTest.runtimeClasspath
 }
 
-task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['build']) {
+task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
     directory "./build/nodes"
     networkMap "Notary"
     node {
diff --git a/docs/source/tutorial-cordapp.rst b/docs/source/tutorial-cordapp.rst
index abfcbec64a..2bf280416d 100644
--- a/docs/source/tutorial-cordapp.rst
+++ b/docs/source/tutorial-cordapp.rst
@@ -772,7 +772,7 @@ like to deploy for testing. See further details below:
 
 .. sourcecode:: groovy
 
-  task deployNodes(type: com.r3corda.plugins.Cordform, dependsOn: ['build']) {
+  task deployNodes(type: com.r3corda.plugins.Cordform, dependsOn: ['jar']) {
       directory "./kotlin-source/build/nodes"                            // The output directory.
       networkMap "Controller"                              // The artemis address of the node to be used as the network map.
       node {
diff --git a/samples/attachment-demo/build.gradle b/samples/attachment-demo/build.gradle
index c9694362a1..d9cd1b22a8 100644
--- a/samples/attachment-demo/build.gradle
+++ b/samples/attachment-demo/build.gradle
@@ -51,7 +51,7 @@ dependencies {
     }
 }
 
-task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['build']) {
+task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
     ext.rpcUsers = [ ['user' : "demo", 'password' : "demo", 'permissions' : ["StartFlow.net.corda.flows.FinalityFlow"]] ]
 
     directory "./build/nodes"
diff --git a/samples/bank-of-corda-demo/build.gradle b/samples/bank-of-corda-demo/build.gradle
index df1b6d1ad7..9b0a50eb63 100644
--- a/samples/bank-of-corda-demo/build.gradle
+++ b/samples/bank-of-corda-demo/build.gradle
@@ -48,7 +48,7 @@ dependencies {
     compile "org.glassfish.jersey.core:jersey-server:${jersey_version}"
 }
 
-task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['build']) {
+task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
     directory "./build/nodes"
     // This name "Notary" is hard-coded into BankOfCordaClientApi so if you change it here, change it there too.
     // In this demo the node that runs a standalone notary also acts as the network map server.
diff --git a/samples/irs-demo/build.gradle b/samples/irs-demo/build.gradle
index c8f83f15b5..0e8e9b1357 100644
--- a/samples/irs-demo/build.gradle
+++ b/samples/irs-demo/build.gradle
@@ -54,7 +54,7 @@ dependencies {
     compile "com.squareup.okhttp3:okhttp:$okhttp_version"
 }
 
-task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['build']) {
+task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
     directory "./build/nodes"
     networkMap "Notary"
     node {
diff --git a/samples/raft-notary-demo/build.gradle b/samples/raft-notary-demo/build.gradle
index bc93859958..9b763e9bdf 100644
--- a/samples/raft-notary-demo/build.gradle
+++ b/samples/raft-notary-demo/build.gradle
@@ -73,7 +73,7 @@ task generateNotaryIdentity(type: JavaExec) {
     args = [nodeDirs, notaryType, notaryName]
 }
 
-task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['build', 'generateNotaryIdentity']) {
+task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar', 'generateNotaryIdentity']) {
     directory deployTo
     networkMap "Notary 1"
     node {
diff --git a/samples/simm-valuation-demo/build.gradle b/samples/simm-valuation-demo/build.gradle
index ed3f6e3fbd..fe6aaeee8e 100644
--- a/samples/simm-valuation-demo/build.gradle
+++ b/samples/simm-valuation-demo/build.gradle
@@ -65,7 +65,7 @@ dependencies {
     compile "com.opengamma.strata:strata-math:${strata_version}"
 }
 
-task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['build']) {
+task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
     directory "./build/nodes"
     networkMap "Controller"
     node {
diff --git a/samples/trader-demo/build.gradle b/samples/trader-demo/build.gradle
index 0e26c04bbf..bbbff4491d 100644
--- a/samples/trader-demo/build.gradle
+++ b/samples/trader-demo/build.gradle
@@ -58,7 +58,7 @@ dependencies {
     // Specify your cordapp's dependencies below, including dependent cordapps
 }
 
-task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['build']) {
+task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
     ext.rpcUsers = [['user': "demo", 'password': "demo", 'permissions': [
             'StartFlow.net.corda.flows.IssuerFlow$IssuanceRequester',
             "StartFlow.net.corda.traderdemo.flow.SellerFlow"