diff --git a/dist/pom.xml b/dist/pom.xml
index 15e4ced..7e6842f 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.modeshape.quickstarts</groupId>
     <artifactId>modeshape-quickstarts-dist</artifactId>
-    <version>4.2.0.Final</version>
+    <version>4.3-SNAPSHOT</version>
     <name>ModeShape AS Quickstarts Distribution</name>
     <description>POM for building the quickstarts distribution.</description>
     <url>http://www.modeshape.org</url>
diff --git a/modeshape-cdi/README.md b/modeshape-cdi/README.md
index b8688db..f5e6221 100644
--- a/modeshape-cdi/README.md
+++ b/modeshape-cdi/README.md
@@ -38,7 +38,7 @@ for help on how to install and configure Maven 3._
 2. Open a command line and navigate to the root directory of this quickstart.
 3. Type this command to build and deploy the archive:
 
-        mvn clean package jboss-as:deploy
+        mvn clean package wildfly:deploy
 
 4. This will deploy `target/modeshape-cdi.war` to the running instance of the server.
 
@@ -66,7 +66,7 @@ Undeploy the Archive
 2. Open a command line and navigate to the root directory of this quickstart.
 3. When you are finished testing, type this command to undeploy the archive:
 
-        mvn jboss-as:undeploy
+        mvn wildfly:undeploy
 
 Run the Arquillian Tests
 -------------------------
diff --git a/modeshape-cdi/pom.xml b/modeshape-cdi/pom.xml
index 629e452..de7ef21 100644
--- a/modeshape-cdi/pom.xml
+++ b/modeshape-cdi/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.modeshape.quickstarts</groupId>
     <artifactId>modeshape-cdi</artifactId>
-    <version>4.2.0.Final</version>
+    <version>4.3-SNAPSHOT</version>
     <packaging>war</packaging>
     <name>Example of a JSF web application that uses ModeShape via CDI</name>
     <description>
@@ -29,7 +29,7 @@
         <version.wildfly.maven.plugin>1.0.1.Final</version.wildfly.maven.plugin>
 
         <!-- Global dependency version information-->
-        <version.modeshape>4.2.0.Final</version.modeshape>
+        <version.modeshape>4.3-SNAPSHOT</version.modeshape>
     </properties>
 
     <dependencyManagement>
diff --git a/modeshape-cli/README.md b/modeshape-cli/README.md
index 20f23a6..6210941 100644
--- a/modeshape-cli/README.md
+++ b/modeshape-cli/README.md
@@ -47,7 +47,7 @@ for help on how to install and configure Maven 3._
 2. Open a command line and navigate to the root directory of this quickstart.
 3. Type this command to build and deploy the archive:
 
-        mvn clean package jboss-as:deploy
+        mvn clean package wildfly:deploy
 
 4. This will deploy `target/modeshape-cli.war` to the running instance of the server.
 
@@ -64,7 +64,7 @@ Undeploy the Archive
 2. Open a command line and navigate to the root directory of this quickstart.
 3. When you are finished testing, type this command to undeploy the archive:
 
-        mvn jboss-as:undeploy
+        mvn wildfly:undeploy
 
 Remove the demo repository
 ---------------------------
diff --git a/modeshape-cli/pom.xml b/modeshape-cli/pom.xml
index 2a5cefd..14dafbd 100644
--- a/modeshape-cli/pom.xml
+++ b/modeshape-cli/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.modeshape.quickstarts</groupId>
     <artifactId>modeshape-cli</artifactId>
-    <version>4.2.0.Final</version>
+    <version>4.3-SNAPSHOT</version>
     <packaging>war</packaging>
     <name>Example of a JSF web application that uses CLI scripts to create and remove a repository</name>
     <description>
@@ -29,7 +29,7 @@
         <version.wildfly.maven.plugin>1.0.1.Final</version.wildfly.maven.plugin>
 
         <!-- Global dependency version information-->
-        <version.modeshape>4.2.0.Final</version.modeshape>
+        <version.modeshape>4.3-SNAPSHOT</version.modeshape>
     </properties>
 
     <dependencyManagement>
diff --git a/modeshape-clustering/README.md b/modeshape-clustering/README.md
index 2ebe014..39d62f4 100644
--- a/modeshape-clustering/README.md
+++ b/modeshape-clustering/README.md
@@ -26,8 +26,7 @@ The simplest way to do this is to follow the instructions provided [here](https:
 Start 2 JBoss Wildfly instances with the set of provided configurations (see above)
 --------------------------------------------------------------------------------------
 
-1. Copy the `standalone-modeshape-node1.xml` and `standalone-modeshape-node2.xml` configuration files from the root of the quickstart
-into the `JBOSS_HOME/standalone/configuration` folder
+1. Copy the `standalone` folder from the root of the quickstart into the `JBOSS_HOME`folder
 2. Open a command line and navigate to the root of the JBoss server directory.
 3. Start the `master` server:
 
diff --git a/modeshape-clustering/pom.xml b/modeshape-clustering/pom.xml
index e25300e..488ace7 100644
--- a/modeshape-clustering/pom.xml
+++ b/modeshape-clustering/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.modeshape.quickstarts</groupId>
     <artifactId>modeshape-clustering</artifactId>
-    <version>4.2.0.Final</version>
+    <version>4.3-SNAPSHOT</version>
     <packaging>war</packaging>
     <name>Example of a JSF web application that uses several clustered ModeShape servers</name>
     <description>
@@ -29,7 +29,7 @@
         <version.wildfly.maven.plugin>1.0.1.Final</version.wildfly.maven.plugin>
 
         <!-- Global dependency version information-->
-        <version.modeshape>4.2.0.Final</version.modeshape>
+        <version.modeshape>4.3-SNAPSHOT</version.modeshape>
     </properties>
 
     <dependencyManagement>
diff --git a/modeshape-clustering/standalone/configuration/modeshape/clustered-repo-cache-config.xml b/modeshape-clustering/standalone/configuration/modeshape/clustered-repo-cache-config.xml
new file mode 100644
index 0000000..20e5a85
--- /dev/null
+++ b/modeshape-clustering/standalone/configuration/modeshape/clustered-repo-cache-config.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="urn:infinispan:config:6.0 http://www.infinispan.org/schemas/infinispan-config-6.0.xsd"
+            xmlns="urn:infinispan:config:6.0">
+    <global>
+        <globalJmxStatistics enabled="false" allowDuplicateDomains="true"/>
+        <transport clusterName="modeshape-cluster">
+            <properties>
+                <property name="configurationFile" value="${jboss.server.config.dir}/modeshape/jgroups-config.xml" />
+            </properties>
+        </transport>
+    </global>
+
+    <namedCache name="clustered-repo">
+        <clustering mode="replication">
+            <sync />
+        </clustering>
+
+        <transaction transactionManagerLookupClass="org.infinispan.transaction.lookup.GenericTransactionManagerLookup"
+                     transactionMode="TRANSACTIONAL"
+                     lockingMode="PESSIMISTIC" />
+        <locking lockAcquisitionTimeout="60000"/>
+        <persistence passivation="false">
+            <singleFile
+                    preload="false"
+                    shared="false"
+                    fetchPersistentState="true"
+                    purgeOnStartup="true"
+                    location="${jboss.server.data.dir}/modeshape/store/repo-${jboss.node.name}">
+            </singleFile>
+        </persistence>
+    </namedCache>
+
+    <namedCache name="binary-fs">
+        <clustering mode="replication">
+            <sync />
+        </clustering>
+        <locking lockAcquisitionTimeout="60000"/>
+        <transaction
+                transactionManagerLookupClass="org.infinispan.transaction.lookup.GenericTransactionManagerLookup"
+                transactionMode="TRANSACTIONAL"
+                lockingMode="PESSIMISTIC"/>
+        <persistence
+                passivation="false">
+            <singleFile
+                    shared="false"
+                    preload="false"
+                    fetchPersistentState="false"
+                    purgeOnStartup="false"
+                    location="${jboss.server.data.dir}/modeshape/binary-store/repo-${jboss.node.name}-data">
+            </singleFile>
+        </persistence>
+    </namedCache>
+
+    <namedCache name="binary-fs-meta">
+        <clustering mode="replication">
+            <sync />
+        </clustering>
+        <locking lockAcquisitionTimeout="60000"/>
+
+        <transaction
+                transactionManagerLookupClass="org.infinispan.transaction.lookup.GenericTransactionManagerLookup"
+                transactionMode="TRANSACTIONAL"
+                lockingMode="PESSIMISTIC"/>
+        <persistence
+                passivation="false">
+            <singleFile
+                    shared="false"
+                    preload="false"
+                    fetchPersistentState="false"
+                    purgeOnStartup="false"
+                    location="${jboss.server.data.dir}/modeshape/binary-store/repo-${jboss.node.name}-metadata">
+            </singleFile>
+        </persistence>
+    </namedCache>
+</infinispan>
diff --git a/modeshape-clustering/standalone/configuration/modeshape/jgroups-config.xml b/modeshape-clustering/standalone/configuration/modeshape/jgroups-config.xml
new file mode 100644
index 0000000..f069430
--- /dev/null
+++ b/modeshape-clustering/standalone/configuration/modeshape/jgroups-config.xml
@@ -0,0 +1,37 @@
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xmlns="urn:org:jgroups"
+        xsi:schemaLocation="urn:org:jgroups http://www.jgroups.org/schema/jgroups.xsd">
+    <TCP bind_port="0"
+         recv_buf_size="${tcp.recv_buf_size:5M}"
+         send_buf_size="${tcp.send_buf_size:5M}"
+         max_bundle_size="64K"
+         max_bundle_timeout="30"
+         use_send_queues="true"
+         sock_conn_timeout="300"
+         timer_type="new3"
+         timer.min_threads="4"
+         timer.max_threads="10"
+         timer.keep_alive_time="3000"
+         timer.queue_max_size="500"
+         thread_pool.enabled="false"
+         oob_thread_pool.enabled="false"
+         port_range="0"/>
+    <MPING/>
+    <MERGE3 min_interval="10000"
+            max_interval="30000"/>
+    <FD timeout="3000" max_tries="3" />
+    <VERIFY_SUSPECT timeout="1500" />
+    <BARRIER />
+    <pbcast.NAKACK2 use_mcast_xmit="false"
+                    discard_delivered_msgs="true"/>
+    <UNICAST3 />
+    <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+                   max_bytes="4M"/>
+    <pbcast.GMS print_local_addr="true" join_timeout="2000"
+                view_bundling="true"/>
+    <MFC max_credits="2M"
+         min_threshold="0.4"/>
+    <FRAG2 frag_size="60K" />
+    <!--RSVP resend_interval="2000" timeout="10000"/-->
+    <pbcast.STATE_TRANSFER/>
+</config>
\ No newline at end of file
diff --git a/modeshape-clustering/standalone-modeshape-node1.xml b/modeshape-clustering/standalone/configuration/standalone-modeshape-node1.xml
similarity index 91%
rename from modeshape-clustering/standalone-modeshape-node1.xml
rename to modeshape-clustering/standalone/configuration/standalone-modeshape-node1.xml
index b890ee4..723b132 100644
--- a/modeshape-clustering/standalone-modeshape-node1.xml
+++ b/modeshape-clustering/standalone/configuration/standalone-modeshape-node1.xml
@@ -222,32 +222,9 @@
             <worker name="default" io-threads="3"/>
             <buffer-pool name="default" buffer-size="16384" buffers-per-slice="128"/>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:infinispan:2.0">
-            <cache-container name="modeshape" aliases="modeshape modeshape-cluster" default-cache="sample" module="org.modeshape">
-                <transport lock-timeout="60000"/>
-                <replicated-cache name="clustered-repo" mode="SYNC">
-                    <locking isolation="READ_COMMITTED"/>
-                    <transaction mode="NON_XA"/>
-                    <file-store relative-to="jboss.server.data.dir" path="modeshape/store/sample-${jboss.node.name}" passivation="false" purge="false"/>
-                </replicated-cache>
-            </cache-container>
-            <cache-container name="modeshape-binary-cache-container" aliases="modeshape-binary-cache" default-cache="binary-fs" module="org.modeshape">
-                <transport lock-timeout="60000"/>
-                <replicated-cache name="binary-fs" mode="SYNC">
-                    <locking isolation="READ_COMMITTED"/>
-                    <transaction mode="NON_XA"/>
-                    <file-store relative-to="jboss.server.data.dir" path="modeshape/binary-store/sample-binary-data-${jboss.node.name}" passivation="false" purge="false"/>
-                </replicated-cache>
-                <replicated-cache name="binary-fs-meta" mode="SYNC">
-                    <locking isolation="READ_COMMITTED"/>
-                    <transaction mode="NON_XA"/>
-                    <file-store relative-to="jboss.server.data.dir" path="modeshape/binary-store/sample-binary-metadata-${jboss.node.name}" passivation="false" purge="false"/>
-                </replicated-cache>
-            </cache-container>
-        </subsystem>
-        <subsystem xmlns="urn:jboss:domain:modeshape:2.0">
-            <repository name="clustered-repo" cache-name="clustered-repo" cache-container="modeshape-cluster" anonymous-roles="admin">
-                <cache-binary-storage data-cache-name="binary-fs" metadata-cache-name="binary-fs-meta" cache-container="modeshape-binary-cache-container"/>
+        <subsystem xmlns="urn:jboss:domain:modeshape:2.1">
+            <repository name="clustered-repo" anonymous-roles="admin">
+                <cache-binary-storage data-cache-name="binary-fs" metadata-cache-name="binary-fs-meta"/>
             </repository>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
diff --git a/modeshape-clustering/standalone-modeshape-node2.xml b/modeshape-clustering/standalone/configuration/standalone-modeshape-node2.xml
similarity index 91%
rename from modeshape-clustering/standalone-modeshape-node2.xml
rename to modeshape-clustering/standalone/configuration/standalone-modeshape-node2.xml
index d1d7bb1..fed0edf 100644
--- a/modeshape-clustering/standalone-modeshape-node2.xml
+++ b/modeshape-clustering/standalone/configuration/standalone-modeshape-node2.xml
@@ -222,32 +222,9 @@
             <worker name="default" io-threads="3"/>
             <buffer-pool name="default" buffer-size="16384" buffers-per-slice="128"/>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:infinispan:2.0">
-            <cache-container name="modeshape" aliases="modeshape modeshape-cluster" default-cache="sample" module="org.modeshape">
-                <transport lock-timeout="60000"/>
-                <replicated-cache name="clustered-repo" mode="SYNC">
-                    <locking isolation="READ_COMMITTED"/>
-                    <transaction mode="NON_XA"/>
-                    <file-store relative-to="jboss.server.data.dir" path="modeshape/store/sample-${jboss.node.name}" passivation="false" purge="false"/>
-                </replicated-cache>
-            </cache-container>
-            <cache-container name="modeshape-binary-cache-container" aliases="modeshape-binary-cache" default-cache="binary-fs" module="org.modeshape">
-                <transport lock-timeout="60000"/>
-                <replicated-cache name="binary-fs" mode="SYNC">
-                    <locking isolation="READ_COMMITTED"/>
-                    <transaction mode="NON_XA"/>
-                    <file-store relative-to="jboss.server.data.dir" path="modeshape/binary-store/sample-binary-data-${jboss.node.name}" passivation="false" purge="false"/>
-                </replicated-cache>
-                <replicated-cache name="binary-fs-meta" mode="SYNC">
-                    <locking isolation="READ_COMMITTED"/>
-                    <transaction mode="NON_XA"/>
-                    <file-store relative-to="jboss.server.data.dir" path="modeshape/binary-store/sample-binary-metadata-${jboss.node.name}" passivation="false" purge="false"/>
-                </replicated-cache>
-            </cache-container>
-        </subsystem>
-        <subsystem xmlns="urn:jboss:domain:modeshape:2.0">
-            <repository name="clustered-repo" cache-name="clustered-repo" cache-container="modeshape-cluster" anonymous-roles="admin">
-                <cache-binary-storage data-cache-name="binary-fs" metadata-cache-name="binary-fs-meta" cache-container="modeshape-binary-cache-container"/>
+        <subsystem xmlns="urn:jboss:domain:modeshape:2.1">
+            <repository name="clustered-repo" anonymous-roles="admin">
+                <cache-binary-storage data-cache-name="binary-fs" metadata-cache-name="binary-fs-meta"/>
             </repository>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
diff --git a/modeshape-ejb/README.md b/modeshape-ejb/README.md
index 0294683..4682f58 100644
--- a/modeshape-ejb/README.md
+++ b/modeshape-ejb/README.md
@@ -38,7 +38,7 @@ for help on how to install and configure Maven 3._
 2. Open a command line and navigate to the root directory of this quickstart.
 3. Type this command to build and deploy the archive:
 
-        mvn clean package jboss-as:deploy
+        mvn clean package wildfly:deploy
 
 4. This will deploy `target/modeshape-ejb.war` to the running instance of the server.
 
@@ -65,7 +65,7 @@ Undeploy the Archive
 2. Open a command line and navigate to the root directory of this quickstart.
 3. When you are finished testing, type this command to undeploy the archive:
 
-        mvn jboss-as:undeploy
+        mvn wildfly:undeploy
 
 Run the Arquillian Tests
 -------------------------
diff --git a/modeshape-ejb/pom.xml b/modeshape-ejb/pom.xml
index 50e3334..a1242b5 100644
--- a/modeshape-ejb/pom.xml
+++ b/modeshape-ejb/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.modeshape.quickstarts</groupId>
     <artifactId>modeshape-ejb</artifactId>
-    <version>4.2.0.Final</version>
+    <version>4.3-SNAPSHOT</version>
     <packaging>war</packaging>
     <name>Example of web application that uses ModeShape via EJBs</name>
     <description>
@@ -29,7 +29,7 @@
         <version.wildfly.maven.plugin>1.0.1.Final</version.wildfly.maven.plugin>
 
         <!-- Global dependency version information-->
-        <version.modeshape>4.2.0.Final</version.modeshape>
+        <version.modeshape>4.3-SNAPSHOT</version.modeshape>
     </properties>
 
     <dependencyManagement>
diff --git a/modeshape-federation/README.md b/modeshape-federation/README.md
index 9e94641..5c83783 100644
--- a/modeshape-federation/README.md
+++ b/modeshape-federation/README.md
@@ -23,8 +23,7 @@ The simplest way to do this is to follow the instructions provided [here](https:
 Start a JBoss Wildfly instance with the provided configuration file (see above)
 ---------------------------------------------------------------------------
 
-1. Copy the `standalone-modeshape-federation.xml` file from the root of the quickstart into the `JBOSS_HOME/standalone/configuration`
-folder
+1. Copy the `standalone` folder from the root of the quickstart into the `JBOSS_HOME`folder
 2. Open a command line and navigate to the root of the JBoss server directory.
 3. Start the `master` server:
 
@@ -42,7 +41,7 @@ for help on how to install and configure Maven 3._
 2. Open a command line and navigate to the root directory of this quickstart.
 3. Type this command to build and deploy the archive into the `master` server:
 
-        mvn clean package jboss-as:deploy
+        mvn clean package wildfly:deploy
 
 4. This will deploy `target/modeshape-federation.war` to the running server.
 
@@ -65,7 +64,7 @@ Undeploy the Archive
 2. Open a command line and navigate to the root directory of this quickstart.
 3. When you are finished testing, type this command to undeploy the archive from the server:
 
-        mvn jboss-as:undeploy
+        mvn wildfly:undeploy
 
 Run the Arquillian Tests
 -------------------------
diff --git a/modeshape-federation/pom.xml b/modeshape-federation/pom.xml
index 0156d1b..72bd159 100644
--- a/modeshape-federation/pom.xml
+++ b/modeshape-federation/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.modeshape.quickstarts</groupId>
     <artifactId>modeshape-federation</artifactId>
-    <version>4.2.0.Final</version>
+    <version>4.3-SNAPSHOT</version>
     <packaging>war</packaging>
     <name>Example of a JSF web application that uses ModeShape in Federated mode</name>
     <description>
@@ -29,7 +29,7 @@
         <version.wildfly.maven.plugin>1.0.1.Final</version.wildfly.maven.plugin>
 
         <!-- Global dependency version information-->
-        <version.modeshape>4.2.0.Final</version.modeshape>
+        <version.modeshape>4.3-SNAPSHOT</version.modeshape>
     </properties>
 
     <dependencyManagement>
diff --git a/modeshape-federation/standalone/configuration/modeshape/federated-repository-cache-config.xml b/modeshape-federation/standalone/configuration/modeshape/federated-repository-cache-config.xml
new file mode 100644
index 0000000..28bdced
--- /dev/null
+++ b/modeshape-federation/standalone/configuration/modeshape/federated-repository-cache-config.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="urn:infinispan:config:6.0 http://www.infinispan.org/schemas/infinispan-config-6.0.xsd"
+            xmlns="urn:infinispan:config:6.0">
+
+    <global>
+        <globalJmxStatistics enabled="false" allowDuplicateDomains="true"/>
+    </global>
+
+    <namedCache name="federated-repository">
+        <transaction
+                transactionManagerLookupClass="org.infinispan.transaction.lookup.GenericTransactionManagerLookup"
+                transactionMode="TRANSACTIONAL"
+                lockingMode="PESSIMISTIC"/>
+    </namedCache>
+</infinispan>
diff --git a/modeshape-federation/standalone-modeshape-federation.xml b/modeshape-federation/standalone/configuration/standalone-modeshape-federation.xml
similarity index 96%
rename from modeshape-federation/standalone-modeshape-federation.xml
rename to modeshape-federation/standalone/configuration/standalone-modeshape-federation.xml
index 335fe6d..68835de 100644
--- a/modeshape-federation/standalone-modeshape-federation.xml
+++ b/modeshape-federation/standalone/configuration/standalone-modeshape-federation.xml
@@ -249,18 +249,7 @@
             <worker name="default" io-threads="3"/>
             <buffer-pool name="default" buffer-size="16384" buffers-per-slice="128"/>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:infinispan:2.0">
-            <!-- Each ModeShape repository uses one (or more) cache in a cache container. We define a single container
-              named "modeshape" (other names require specifying the container names in each repository configuration
-         -->
-            <cache-container name="modeshape" default-cache="sample" module="org.modeshape">
-                <local-cache name="federated-repository">
-                    <!-- ModeShape requires transactions -->
-                    <transaction mode="NON_XA"/>
-                </local-cache>
-            </cache-container>
-        </subsystem>
-        <subsystem xmlns="urn:jboss:domain:modeshape:2.0">
+        <subsystem xmlns="urn:jboss:domain:modeshape:2.1">
             <!--The list of web applications that is packaged inside the kit and should be deployed when the subsystem starts up-->
             <webapp name="modeshape-rest.war"/>
             <webapp name="modeshape-webdav.war"/>
diff --git a/modeshape-servlet/README.md b/modeshape-servlet/README.md
index 2f4c4c7..af4c933 100644
--- a/modeshape-servlet/README.md
+++ b/modeshape-servlet/README.md
@@ -38,7 +38,7 @@ for help on how to install and configure Maven 3._
 2. Open a command line and navigate to the root directory of this quickstart.
 3. Type this command to build and deploy the archive:
 
-        mvn clean package jboss-as:deploy
+        mvn clean package wildfly:deploy
 
 4. This will deploy `target/modeshape-servlet.war` to the running instance of the server.
 
@@ -68,7 +68,7 @@ Undeploy the Archive
 2. Open a command line and navigate to the root directory of this quickstart.
 3. When you are finished testing, type this command to undeploy the archive:
 
-        mvn jboss-as:undeploy
+        mvn wildfly:undeploy
 
 Run the Arquillian Tests
 -------------------------
diff --git a/modeshape-servlet/pom.xml b/modeshape-servlet/pom.xml
index 0235aa0..e549e3b 100644
--- a/modeshape-servlet/pom.xml
+++ b/modeshape-servlet/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.modeshape.quickstarts</groupId>
     <artifactId>modeshape-servlet</artifactId>
-    <version>4.2.0.Final</version>
+    <version>4.3-SNAPSHOT</version>
     <packaging>war</packaging>
     <name>Example of web application that uses ModeShape</name>
     <description>
@@ -29,7 +29,7 @@
         <version.wildfly.maven.plugin>1.0.1.Final</version.wildfly.maven.plugin>
 
         <!-- Global dependency version information-->
-        <version.modeshape>4.2.0.Final</version.modeshape>
+        <version.modeshape>4.3-SNAPSHOT</version.modeshape>
         <version.google.http-client>1.14.1-beta</version.google.http-client>
     </properties>
 
diff --git a/pom.xml b/pom.xml
index ecc104e..3b5c02b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.modeshape.quickstarts</groupId>
     <artifactId>modeshape-quickstarts</artifactId>
-    <version>4.2.0.Final</version>
+    <version>4.3-SNAPSHOT</version>
     <name>ModeShape Wildfly Quickstarts</name>
     <description>Top-Level POM for building all of the quickstarts.</description>
     <url>http://www.modeshape.org</url>