diff --git a/api/pom.xml b/api/pom.xml
index caf297f..2a123f3 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>io.brooklyn</groupId>
         <artifactId>brooklyn-parent</artifactId>
-        <version>0.4.0-SNAPSHOT</version>  <!-- BROOKLYN_VERSION -->
+        <version>0.4.0-M2</version>  <!-- BROOKLYN_VERSION -->
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/core/pom.xml b/core/pom.xml
index fc7f3a3..f1a62f3 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>io.brooklyn</groupId>
 		<artifactId>brooklyn-parent</artifactId>
-		<version>0.4.0-SNAPSHOT</version>  <!-- BROOKLYN_VERSION -->
+		<version>0.4.0-M2</version>  <!-- BROOKLYN_VERSION -->
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docs/_config.yml b/docs/_config.yml
index 196188c..31c0c5f 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -1,3 +1,3 @@
 markdown: rdiscount
 brooklyn-root-url: /
-url: /v/0.4.0-SNAPSHOT  # BROOKLYN_VERSION
+url: /v/0.4.0-M2  # BROOKLYN_VERSION
diff --git a/docs/_scripts/help.txt b/docs/_scripts/help.txt
index 5752ce4..3e287fe 100644
--- a/docs/_scripts/help.txt
+++ b/docs/_scripts/help.txt
@@ -15,7 +15,7 @@
 
 
 export TARGET=`pwd -P`/../../brooklyncentral.github.com
-export BV=0.4.0-SNAPSHOT   # BROOKLYN_VERSION
+export BV=0.4.0-M2   # BROOKLYN_VERSION
 
 # build, copy
 if [ ! -f $TARGET/index.html ] ; then echo "could not find docs in $TARGET" ; exit 1 ; fi
diff --git a/docs/fields/current-snapshot-version.txt b/docs/fields/current-snapshot-version.txt
index 10145c2..18635d6 100644
--- a/docs/fields/current-snapshot-version.txt
+++ b/docs/fields/current-snapshot-version.txt
@@ -1 +1 @@
-0.4.0-SNAPSHOT
+0.4.0-M2
diff --git a/docs/start/download.md b/docs/start/download.md
index 4b68ff1..9a1d799 100644
--- a/docs/start/download.md
+++ b/docs/start/download.md
@@ -17,7 +17,7 @@
 You can grab a single JAR containing all of Brooklyn and its dependencies here:
 
 <!-- BROOKLYN_VERSION_BELOW -->
-* [SNAPSHOT](http://ccweb.cloudsoftcorp.com/maven/libs-snapshot-local/io/brooklyn/brooklyn-all/0.4.0-SNAPSHOT/)
+* [SNAPSHOT](http://ccweb.cloudsoftcorp.com/maven/libs-snapshot-local/io/brooklyn/brooklyn-all/0.4.0-M2/)
 
 Just download your preferred flavour and add it to your classpath.
 
diff --git a/docs/use/guide/defining-applications/examples.md b/docs/use/guide/defining-applications/examples.md
index ea7b440..99bb4b8 100644
--- a/docs/use/guide/defining-applications/examples.md
+++ b/docs/use/guide/defining-applications/examples.md
@@ -22,7 +22,7 @@
 	<dependency>
 		<groupId>io.brooklyn</groupId>
 		<artifactId>brooklyn-all</artifactId>
-		<version>0.4.0-SNAPSHOT</version>  <!-- BROOKLYN_VERSION -->
+		<version>0.4.0-M2</version>  <!-- BROOKLYN_VERSION -->
 	</dependency>
 </dependencies>
  
diff --git a/docs/use/guide/management/index.md b/docs/use/guide/management/index.md
index f010836..eb21d14 100644
--- a/docs/use/guide/management/index.md
+++ b/docs/use/guide/management/index.md
@@ -86,8 +86,8 @@
 
 {% highlight bash %}
 % BROOKLYN_HOME=/path/to/brooklyn
-% PATH=$PATH:${BROOKLYN_HOME}/usage/dist/target/brooklyn-0.4.0-SNAPSHOT-dist/brooklyn/bin
-% export BROOKLYN_CLASSPATH=${BROOKLYN_HOME}/examples/simple-web-cluster/target/brooklyn-example-simple-web-cluster-0.4.0-SNAPSHOT.jar
+% PATH=$PATH:${BROOKLYN_HOME}/usage/dist/target/brooklyn-0.4.0-M2-dist/brooklyn/bin
+% export BROOKLYN_CLASSPATH=${BROOKLYN_HOME}/examples/simple-web-cluster/target/brooklyn-example-simple-web-cluster-0.4.0-M2.jar
 % brooklyn launch --app brooklyn.demo.SingleWebServerExample --location localhost
 {% endhighlight %}
 
diff --git a/examples/global-web-fabric/pom.xml b/examples/global-web-fabric/pom.xml
index 17ad565..00de48c 100644
--- a/examples/global-web-fabric/pom.xml
+++ b/examples/global-web-fabric/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.brooklyn.example</groupId>
         <artifactId>brooklyn-examples-parent</artifactId>
-        <version>0.4.0-SNAPSHOT</version>   <!-- BROOKLYN_VERSION -->
+        <version>0.4.0-M2</version>   <!-- BROOKLYN_VERSION -->
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/examples/hadoop-and-whirr/pom.xml b/examples/hadoop-and-whirr/pom.xml
index 857108c..c40da48 100644
--- a/examples/hadoop-and-whirr/pom.xml
+++ b/examples/hadoop-and-whirr/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>io.brooklyn.example</groupId>
         <artifactId>brooklyn-examples-parent</artifactId>
-        <version>0.4.0-SNAPSHOT</version>   <!-- BROOKLYN_VERSION -->
+        <version>0.4.0-M2</version>   <!-- BROOKLYN_VERSION -->
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/examples/pom.xml b/examples/pom.xml
index d81234a..afed387 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>io.brooklyn</groupId>
         <artifactId>brooklyn-parent</artifactId>
-        <version>0.4.0-SNAPSHOT</version>   <!-- BROOKLYN_VERSION -->
+        <version>0.4.0-M2</version>   <!-- BROOKLYN_VERSION -->
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/examples/portable-cloudfoundry/pom.xml b/examples/portable-cloudfoundry/pom.xml
index 5354d9f..dc82227 100644
--- a/examples/portable-cloudfoundry/pom.xml
+++ b/examples/portable-cloudfoundry/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.brooklyn.example</groupId>
         <artifactId>brooklyn-examples-parent</artifactId>
-        <version>0.4.0-SNAPSHOT</version>   <!-- BROOKLYN_VERSION -->
+        <version>0.4.0-M2</version>   <!-- BROOKLYN_VERSION -->
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/examples/simple-messaging-pubsub/pom.xml b/examples/simple-messaging-pubsub/pom.xml
index a374ee6..9d6575d 100644
--- a/examples/simple-messaging-pubsub/pom.xml
+++ b/examples/simple-messaging-pubsub/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.brooklyn.example</groupId>
         <artifactId>brooklyn-examples-parent</artifactId>
-        <version>0.4.0-SNAPSHOT</version>   <!-- BROOKLYN_VERSION -->
+        <version>0.4.0-M2</version>   <!-- BROOKLYN_VERSION -->
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/examples/simple-web-cluster/pom.xml b/examples/simple-web-cluster/pom.xml
index 961b3a3..985d127 100644
--- a/examples/simple-web-cluster/pom.xml
+++ b/examples/simple-web-cluster/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>io.brooklyn.example</groupId>
         <artifactId>brooklyn-examples-parent</artifactId>
-        <version>0.4.0-SNAPSHOT</version>   <!-- BROOKLYN_VERSION -->
+        <version>0.4.0-M2</version>   <!-- BROOKLYN_VERSION -->
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/examples/webapps/hello-world-hadoop-jar/pom.xml b/examples/webapps/hello-world-hadoop-jar/pom.xml
index 90649f4..995d007 100644
--- a/examples/webapps/hello-world-hadoop-jar/pom.xml
+++ b/examples/webapps/hello-world-hadoop-jar/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>io.brooklyn.example</groupId>
         <artifactId>brooklyn-examples-webapps-parent</artifactId>
-        <version>0.4.0-SNAPSHOT</version>   <!-- BROOKLYN_VERSION -->
+        <version>0.4.0-M2</version>   <!-- BROOKLYN_VERSION -->
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/examples/webapps/hello-world-hadoop/pom.xml b/examples/webapps/hello-world-hadoop/pom.xml
index 7b08dbb..54623e3 100644
--- a/examples/webapps/hello-world-hadoop/pom.xml
+++ b/examples/webapps/hello-world-hadoop/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.brooklyn.example</groupId>
         <artifactId>brooklyn-examples-webapps-parent</artifactId>
-        <version>0.4.0-SNAPSHOT</version>   <!-- BROOKLYN_VERSION -->
+        <version>0.4.0-M2</version>   <!-- BROOKLYN_VERSION -->
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -23,7 +23,7 @@
             <version>1.0.2</version>
         </dependency>
         <dependency>
-            <groupId>io.brooklyn</groupId>
+            <groupId>io.brooklyn.example</groupId>
             <artifactId>brooklyn-example-hello-world-hadoop-jar</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/examples/webapps/hello-world-sql/pom.xml b/examples/webapps/hello-world-sql/pom.xml
index 808dae0..45ff1de 100644
--- a/examples/webapps/hello-world-sql/pom.xml
+++ b/examples/webapps/hello-world-sql/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.brooklyn.example</groupId>
         <artifactId>brooklyn-examples-webapps-parent</artifactId>
-        <version>0.4.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+        <version>0.4.0-M2</version> <!-- BROOKLYN_VERSION -->
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/examples/webapps/hello-world-webapp/pom.xml b/examples/webapps/hello-world-webapp/pom.xml
index 887e786..9ecdf7b 100644
--- a/examples/webapps/hello-world-webapp/pom.xml
+++ b/examples/webapps/hello-world-webapp/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.brooklyn.example</groupId>
         <artifactId>brooklyn-examples-webapps-parent</artifactId>
-        <version>0.4.0-SNAPSHOT</version>   <!-- BROOKLYN_VERSION -->
+        <version>0.4.0-M2</version>   <!-- BROOKLYN_VERSION -->
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/examples/webapps/pom.xml b/examples/webapps/pom.xml
index 23ec477..9e9d028 100644
--- a/examples/webapps/pom.xml
+++ b/examples/webapps/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>io.brooklyn.example</groupId>
         <artifactId>brooklyn-examples-parent</artifactId>
-        <version>0.4.0-SNAPSHOT</version>   <!-- BROOKLYN_VERSION -->
+        <version>0.4.0-M2</version>   <!-- BROOKLYN_VERSION -->
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/policy/pom.xml b/policy/pom.xml
index 46b9d7d..74b36c6 100644
--- a/policy/pom.xml
+++ b/policy/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>io.brooklyn</groupId>
         <artifactId>brooklyn-parent</artifactId>
-        <version>0.4.0-SNAPSHOT</version>  <!-- BROOKLYN_VERSION -->
+        <version>0.4.0-M2</version>  <!-- BROOKLYN_VERSION -->
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index fa410a2..20627e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>io.brooklyn</groupId>
     <artifactId>brooklyn-parent</artifactId>
-    <version>0.4.0-SNAPSHOT</version>  <!-- BROOKLYN_VERSION -->
+    <version>0.4.0-M2</version>  <!-- BROOKLYN_VERSION -->
 
     <name>Brooklyn Parent Project</name>
     <description>
diff --git a/sandbox/database/pom.xml b/sandbox/database/pom.xml
index cf93f35..e9aae31 100644
--- a/sandbox/database/pom.xml
+++ b/sandbox/database/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>io.brooklyn</groupId>
         <artifactId>brooklyn-parent</artifactId>
-        <version>0.4.0-SNAPSHOT</version>  <!-- BROOKLYN_VERSION -->
+        <version>0.4.0-M2</version>  <!-- BROOKLYN_VERSION -->
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/sandbox/mgmt/pom.xml b/sandbox/mgmt/pom.xml
index 98e99bb..a14245e 100644
--- a/sandbox/mgmt/pom.xml
+++ b/sandbox/mgmt/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>io.brooklyn</groupId>
 		<artifactId>brooklyn-parent</artifactId>
-		<version>0.4.0-SNAPSHOT</version>  <!-- BROOKLYN_VERSION -->
+		<version>0.4.0-M2</version>  <!-- BROOKLYN_VERSION -->
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
diff --git a/sandbox/rest/pom.xml b/sandbox/rest/pom.xml
index 066533d..d5558d9 100644
--- a/sandbox/rest/pom.xml
+++ b/sandbox/rest/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>io.brooklyn</groupId>
         <artifactId>brooklyn-parent</artifactId>
-        <version>0.4.0-SNAPSHOT</version>
+        <version>0.4.0-M2</version>
         <!-- BROOKLYN_VERSION -->
         <relativePath>../../pom.xml</relativePath>
     </parent>
diff --git a/sandbox/web-acceptance/pom.xml b/sandbox/web-acceptance/pom.xml
index f24f947..de963ce 100644
--- a/sandbox/web-acceptance/pom.xml
+++ b/sandbox/web-acceptance/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>io.brooklyn</groupId>
         <artifactId>brooklyn-parent</artifactId>
-        <version>0.4.0-SNAPSHOT</version>   <!-- BROOKLYN_VERSION -->
+        <version>0.4.0-M2</version>   <!-- BROOKLYN_VERSION -->
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/software/base/pom.xml b/software/base/pom.xml
index 4166112..4e897f0 100644
--- a/software/base/pom.xml
+++ b/software/base/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>io.brooklyn</groupId>
         <artifactId>brooklyn-parent</artifactId>
-        <version>0.4.0-SNAPSHOT</version>  <!-- BROOKLYN_VERSION -->
+        <version>0.4.0-M2</version>  <!-- BROOKLYN_VERSION -->
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/software/database/pom.xml b/software/database/pom.xml
index 9b144c0..66a8d3a 100644
--- a/software/database/pom.xml
+++ b/software/database/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>io.brooklyn</groupId>
         <artifactId>brooklyn-parent</artifactId>
-        <version>0.4.0-SNAPSHOT</version>  <!-- BROOKLYN_VERSION -->
+        <version>0.4.0-M2</version>  <!-- BROOKLYN_VERSION -->
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/software/messaging/pom.xml b/software/messaging/pom.xml
index 56b0890..9dfa021 100644
--- a/software/messaging/pom.xml
+++ b/software/messaging/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>io.brooklyn</groupId>
 		<artifactId>brooklyn-parent</artifactId>
-		<version>0.4.0-SNAPSHOT</version>  <!-- BROOKLYN_VERSION -->
+		<version>0.4.0-M2</version>  <!-- BROOKLYN_VERSION -->
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
diff --git a/software/nosql/pom.xml b/software/nosql/pom.xml
index 7bb16ad..152684f 100644
--- a/software/nosql/pom.xml
+++ b/software/nosql/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>io.brooklyn</groupId>
 		<artifactId>brooklyn-parent</artifactId>
-		<version>0.4.0-SNAPSHOT</version>  <!-- BROOKLYN_VERSION -->
+		<version>0.4.0-M2</version>  <!-- BROOKLYN_VERSION -->
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
diff --git a/software/osgi/pom.xml b/software/osgi/pom.xml
index 75ca648..d01c478 100644
--- a/software/osgi/pom.xml
+++ b/software/osgi/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>io.brooklyn</groupId>
 		<artifactId>brooklyn-parent</artifactId>
-		<version>0.4.0-SNAPSHOT</version>  <!-- BROOKLYN_VERSION -->
+		<version>0.4.0-M2</version>  <!-- BROOKLYN_VERSION -->
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
diff --git a/software/webapp/pom.xml b/software/webapp/pom.xml
index e1c5e22..68345aa 100644
--- a/software/webapp/pom.xml
+++ b/software/webapp/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>io.brooklyn</groupId>
         <artifactId>brooklyn-parent</artifactId>
-        <version>0.4.0-SNAPSHOT</version>  <!-- BROOKLYN_VERSION -->
+        <version>0.4.0-M2</version>  <!-- BROOKLYN_VERSION -->
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/systems/paas/cloudfoundry/pom.xml b/systems/paas/cloudfoundry/pom.xml
index 1c9f446..b9d5fd1 100644
--- a/systems/paas/cloudfoundry/pom.xml
+++ b/systems/paas/cloudfoundry/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>io.brooklyn</groupId>
         <artifactId>brooklyn-parent</artifactId>
-        <version>0.4.0-SNAPSHOT</version>  <!-- BROOKLYN_VERSION -->
+        <version>0.4.0-M2</version>  <!-- BROOKLYN_VERSION -->
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/systems/paas/openshift/pom.xml b/systems/paas/openshift/pom.xml
index a051065..d1653b4 100644
--- a/systems/paas/openshift/pom.xml
+++ b/systems/paas/openshift/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>io.brooklyn</groupId>
 		<artifactId>brooklyn-parent</artifactId>
-		<version>0.4.0-SNAPSHOT</version>  <!-- BROOKLYN_VERSION -->
+		<version>0.4.0-M2</version>  <!-- BROOKLYN_VERSION -->
 		<relativePath>../../../pom.xml</relativePath>
 	</parent>
 
diff --git a/systems/whirr/base/pom.xml b/systems/whirr/base/pom.xml
index d503d8c..a481479 100644
--- a/systems/whirr/base/pom.xml
+++ b/systems/whirr/base/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>io.brooklyn</groupId>
         <artifactId>brooklyn-parent</artifactId>
-        <version>0.4.0-SNAPSHOT</version>  <!-- BROOKLYN_VERSION -->
+        <version>0.4.0-M2</version>  <!-- BROOKLYN_VERSION -->
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/systems/whirr/hadoop/pom.xml b/systems/whirr/hadoop/pom.xml
index 7b56f9c..4e52861 100644
--- a/systems/whirr/hadoop/pom.xml
+++ b/systems/whirr/hadoop/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>io.brooklyn</groupId>
 		<artifactId>brooklyn-parent</artifactId>
-		<version>0.4.0-SNAPSHOT</version>  <!-- BROOKLYN_VERSION -->
+		<version>0.4.0-M2</version>  <!-- BROOKLYN_VERSION -->
 		<relativePath>../../../pom.xml</relativePath>
 	</parent>
 
diff --git a/usage/all/pom.xml b/usage/all/pom.xml
index 5bd7122..5d442e4 100644
--- a/usage/all/pom.xml
+++ b/usage/all/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>io.brooklyn</groupId>
         <artifactId>brooklyn-parent</artifactId>
-        <version>0.4.0-SNAPSHOT</version>  <!-- BROOKLYN_VERSION -->
+        <version>0.4.0-M2</version>  <!-- BROOKLYN_VERSION -->
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/usage/cli/README.md b/usage/cli/README.md
index 0d2656e..e8f8b69 100644
--- a/usage/cli/README.md
+++ b/usage/cli/README.md
@@ -65,7 +65,7 @@
 Launching one of the examples on localhost:
 ```
 $ BROOKLYN_HOME=/path/to/brooklyn
-$ PATH=$PATH:${BROOKLYN_HOME}/usage/dist/brooklyn-0.4.0-SNAPSHOT-dist/bin
+$ PATH=$PATH:${BROOKLYN_HOME}/usage/dist/brooklyn-0.4.0-M2-dist/bin
 $ export BROOKLYN_CLASSPATH=${BROOKLYN_HOME}/examples/simple-web-cluster/target/classes/ # point this to your app
 $ brooklyn launch --app brooklyn.demo.SingleWebServerExample # --location is set to localhost by default
 ```
diff --git a/usage/cli/pom.xml b/usage/cli/pom.xml
index 6cf1013..08eb5c9 100644
--- a/usage/cli/pom.xml
+++ b/usage/cli/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>io.brooklyn</groupId>
         <artifactId>brooklyn-parent</artifactId>
-        <version>0.4.0-SNAPSHOT</version>  <!-- BROOKLYN_VERSION -->
+        <version>0.4.0-M2</version>  <!-- BROOKLYN_VERSION -->
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/usage/cli/src/test/java/brooklyn/cli/CliIntegrationTest.java b/usage/cli/src/test/java/brooklyn/cli/CliIntegrationTest.java
index 04939da..4155062 100644
--- a/usage/cli/src/test/java/brooklyn/cli/CliIntegrationTest.java
+++ b/usage/cli/src/test/java/brooklyn/cli/CliIntegrationTest.java
@@ -13,7 +13,7 @@
 public class CliIntegrationTest {
     
     // FIXME: this should not be hardcoded
-    String brooklynBinPath = "../dist/target/brooklyn-0.4.0-SNAPSHOT-dist/brooklyn/bin/";
+    String brooklynBinPath = "../dist/target/brooklyn-0.4.0-M2-dist/brooklyn/bin/";
     
     // Helper function used in testing
     private String convertStreamToString(InputStream is) {
diff --git a/usage/dist/pom.xml b/usage/dist/pom.xml
index 4bcf2df..29322f1 100644
--- a/usage/dist/pom.xml
+++ b/usage/dist/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>io.brooklyn</groupId>
         <artifactId>brooklyn-parent</artifactId>
-        <version>0.4.0-SNAPSHOT</version>  <!-- BROOKLYN_VERSION -->
+        <version>0.4.0-M2</version>  <!-- BROOKLYN_VERSION -->
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/usage/launcher/pom.xml b/usage/launcher/pom.xml
index 509af51..115963f 100644
--- a/usage/launcher/pom.xml
+++ b/usage/launcher/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>io.brooklyn</groupId>
         <artifactId>brooklyn-parent</artifactId>
-        <version>0.4.0-SNAPSHOT</version>  <!-- BROOKLYN_VERSION -->
+        <version>0.4.0-M2</version>  <!-- BROOKLYN_VERSION -->
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/usage/qa/pom.xml b/usage/qa/pom.xml
index 1e77531..1bb2c44 100644
--- a/usage/qa/pom.xml
+++ b/usage/qa/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>io.brooklyn</groupId>
         <artifactId>brooklyn-parent</artifactId>
-        <version>0.4.0-SNAPSHOT</version>  <!-- BROOKLYN_VERSION -->
+        <version>0.4.0-M2</version>  <!-- BROOKLYN_VERSION -->
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/usage/qa/start-monitor.sh b/usage/qa/start-monitor.sh
index 03b786f..ffdb5e7 100755
--- a/usage/qa/start-monitor.sh
+++ b/usage/qa/start-monitor.sh
@@ -7,7 +7,7 @@
 #set -x # debug
 
 CLASS=brooklyn.qa.longevity.Monitor
-VERSION=0.4.0-SNAPSHOT
+VERSION=0.4.0-M2
 
 ROOT=$(cd $(dirname $0) && pwd)
 cd $ROOT
diff --git a/usage/qa/start-webcluster.sh b/usage/qa/start-webcluster.sh
index d249051..b7051a4 100755
--- a/usage/qa/start-webcluster.sh
+++ b/usage/qa/start-webcluster.sh
@@ -7,7 +7,7 @@
 #set -x # debug
 
 CLASS=brooklyn.qa.longevity.webcluster.WebClusterApp
-VERSION=0.4.0-SNAPSHOT
+VERSION=0.4.0-M2
 
 ROOT=$(cd $(dirname $0) && pwd)
 cd $ROOT
diff --git a/usage/test-support/pom.xml b/usage/test-support/pom.xml
index 05b9085..b087993 100644
--- a/usage/test-support/pom.xml
+++ b/usage/test-support/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>io.brooklyn</groupId>
 		<artifactId>brooklyn-parent</artifactId>
-		<version>0.4.0-SNAPSHOT</version>  <!-- BROOKLYN_VERSION -->
+		<version>0.4.0-M2</version>  <!-- BROOKLYN_VERSION -->
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
diff --git a/usage/web-console/application.properties b/usage/web-console/application.properties
index fb668c8..5910cc3 100644
--- a/usage/web-console/application.properties
+++ b/usage/web-console/application.properties
@@ -3,6 +3,6 @@
 app.grails.version=1.3.7
 app.name=brooklyn-web-console
 app.servlet.version=2.4
-app.version=0.4.0-SNAPSHOT
+app.version=0.4.0-M2
 plugins.haml=0.3
 plugins.tomcat=1.3.7
diff --git a/usage/web-console/pom.xml b/usage/web-console/pom.xml
index 960127a..2f6847b 100644
--- a/usage/web-console/pom.xml
+++ b/usage/web-console/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>io.brooklyn</groupId>
         <artifactId>brooklyn-parent</artifactId>
-        <version>0.4.0-SNAPSHOT</version>  <!-- BROOKLYN_VERSION -->
+        <version>0.4.0-M2</version>  <!-- BROOKLYN_VERSION -->
         <relativePath>../../pom.xml</relativePath>
     </parent>