diff --git a/jetty-gcloud/jetty-gcloud-memcached-session-manager/src/main/config/etc/gcloud-memcached-session-context.xml b/jetty-gcloud/jetty-gcloud-memcached-session-manager/src/main/config/etc/gcloud-memcached-session-context.xml
new file mode 100644
index 00000000000..1580624b7c3
--- /dev/null
+++ b/jetty-gcloud/jetty-gcloud-memcached-session-manager/src/main/config/etc/gcloud-memcached-session-context.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
+
+<Configure class="org.eclipse.jetty.webapp.WebAppContext">
+
+  <!-- Get a reference to the GCloudSessionIdManager -->
+  <Ref id="Server">
+    <Call id="idMgr" name="getSessionIdManager"/>
+  </Ref>
+
+  <!-- Use the GCloudSessionIdManager to set up the GCloudMemcachedSessionManager -->
+  <Set name="sessionHandler">
+    <New class="org.eclipse.jetty.server.session.SessionHandler">
+      <Arg>
+        <New id="mgr" class="org.eclipse.jetty.gcloud.memcached.session.GCloudMemcachedSessionManager">
+          <Set name="sessionIdManager">
+            <Ref id="idMgr"/>
+          </Set>
+          <Set name="scavengeIntervalSec">600</Set>
+          <Set name="host">localhost</Set>
+          <Set name="port">11211</Set>
+        </New>
+      </Arg>
+    </New>
+  </Set>
+
+</Configure>
diff --git a/jetty-gcloud/jetty-gcloud-memcached-session-manager/src/main/config/etc/jetty-gcloud-memcached-sessions.xml b/jetty-gcloud/jetty-gcloud-memcached-session-manager/src/main/config/etc/jetty-gcloud-memcached-sessions.xml
new file mode 100644
index 00000000000..38b81ba5ea0
--- /dev/null
+++ b/jetty-gcloud/jetty-gcloud-memcached-session-manager/src/main/config/etc/jetty-gcloud-memcached-sessions.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
+
+<Configure id="Server" class="org.eclipse.jetty.server.Server">
+
+  <!-- ============================================================================== -->
+  <!-- Configure the Deployer to create a GCloudMemcachedSessionManager for every     -->
+  <!-- webapp that is deployed                                                        -->
+  <!-- ============================================================================== -->
+
+  <Ref id="DeploymentManager">
+    <!-- Add a customize step to the deployment lifecycle -->
+    <Call name="insertLifeCycleNode">
+      <Arg>deployed</Arg>
+      <Arg>starting</Arg>
+      <Arg>customise</Arg>
+    </Call>
+    <Call name="addLifeCycleBinding">
+      <Arg>
+        <New class="org.eclipse.jetty.deploy.bindings.GlobalWebappConfigBinding">
+         <Set name="jettyXml"><Property name="jetty.home" default="."/>/etc/gcloud-memcached-session-context.xml</Set>
+        </New>
+      </Arg>
+    </Call>
+  </Ref>
+
+</Configure>
diff --git a/jetty-gcloud/jetty-gcloud-memcached-session-manager/src/main/config/modules/gcloud-memcached-sessions.mod b/jetty-gcloud/jetty-gcloud-memcached-session-manager/src/main/config/modules/gcloud-memcached-sessions.mod
index f67153e3177..83697c42006 100644
--- a/jetty-gcloud/jetty-gcloud-memcached-session-manager/src/main/config/modules/gcloud-memcached-sessions.mod
+++ b/jetty-gcloud/jetty-gcloud-memcached-session-manager/src/main/config/modules/gcloud-memcached-sessions.mod
@@ -4,7 +4,7 @@
 
 [depend]
 ext
-gcloud-sessions
+gcloud-session-idmgr
 
 
 [files]
@@ -15,6 +15,10 @@ maven://org.slf4j/slf4j-api/1.6.6|lib/ext/slf4j-api-1.6.6.jar
 lib/jetty-gcloud-memcached-session-manager-${jetty.version}.jar
 lib/xmemcached/*.jar
 
+
+[xml]
+etc/jetty-gcloud-memcached-sessions.xml
+
 [license]
 Xmemcached is an open source project hosted on Github and released under the Apache 2.0 license.
 https://github.com/killme2008/xmemcached
diff --git a/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/etc/gcloud-session-context.xml b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/etc/gcloud-session-context.xml
new file mode 100644
index 00000000000..111c2ca643a
--- /dev/null
+++ b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/etc/gcloud-session-context.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
+
+<Configure class="org.eclipse.jetty.webapp.WebAppContext">
+
+  <!-- Get a reference to the GCloudSessionIdManager -->
+  <Ref id="Server">
+    <Call id="idMgr" name="getSessionIdManager"/>
+  </Ref>
+
+  <!-- Use the GCloudSessionIdManager to set up the GCloudSessionManager -->
+  <Set name="sessionHandler">
+    <New class="org.eclipse.jetty.server.session.SessionHandler">
+      <Arg>
+        <New id="mgr" class="org.eclipse.jetty.gcloud.session.GCloudSessionManager">
+          <Set name="sessionIdManager">
+            <Ref id="idMgr"/>
+          </Set>
+          <Set name="scavengeIntervalSec">600</Set>
+        </New>
+      </Arg>
+    </New>
+  </Set>
+
+</Configure>
diff --git a/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/etc/jetty-gcloud-session-idmgr.xml b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/etc/jetty-gcloud-session-idmgr.xml
new file mode 100644
index 00000000000..3ca24feb178
--- /dev/null
+++ b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/etc/jetty-gcloud-session-idmgr.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
+
+<Configure id="Server" class="org.eclipse.jetty.server.Server">
+
+
+  <!-- ===================================================================== -->
+  <!-- Configure a GCloudSessionIdManager                                    -->
+  <!-- ===================================================================== -->
+  <Set name="sessionIdManager">
+    <New id="idMgr" class="org.eclipse.jetty.gcloud.session.GCloudSessionIdManager">
+      <Arg>
+        <Ref id="Server"/>
+      </Arg>
+      <Set name="workerName"><Property name="jetty.gcloudSession.workerName"><Default>node<Env name="GAE_MODULE_INSTANCE" default="0"/></Default></Property></Set>
+    </New>
+  </Set>
+
+</Configure>
diff --git a/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/etc/jetty-gcloud-sessions.xml b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/etc/jetty-gcloud-sessions.xml
index 3ca24feb178..dc0a4741518 100644
--- a/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/etc/jetty-gcloud-sessions.xml
+++ b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/etc/jetty-gcloud-sessions.xml
@@ -3,17 +3,25 @@
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
+  <!-- ===================================================================== -->
+  <!-- Configure the Deployer to create a GCloudSessionManager for every     -->
+  <!-- webapp that is deployed                                               -->
+  <!-- ===================================================================== -->
 
-  <!-- ===================================================================== -->
-  <!-- Configure a GCloudSessionIdManager                                    -->
-  <!-- ===================================================================== -->
-  <Set name="sessionIdManager">
-    <New id="idMgr" class="org.eclipse.jetty.gcloud.session.GCloudSessionIdManager">
+  <Ref id="DeploymentManager">
+    <!-- Add a customize step to the deployment lifecycle -->
+    <Call name="insertLifeCycleNode">
+      <Arg>deployed</Arg>
+      <Arg>starting</Arg>
+      <Arg>customise</Arg>
+    </Call>
+    <Call name="addLifeCycleBinding">
       <Arg>
-        <Ref id="Server"/>
+        <New class="org.eclipse.jetty.deploy.bindings.GlobalWebappConfigBinding">
+          <Set name="jettyXml"><Property name="jetty.home" default="."/>/etc/gcloud-session-context.xml</Set>
+        </New>
       </Arg>
-      <Set name="workerName"><Property name="jetty.gcloudSession.workerName"><Default>node<Env name="GAE_MODULE_INSTANCE" default="0"/></Default></Property></Set>
-    </New>
-  </Set>
+    </Call>
+  </Ref>
 
 </Configure>
diff --git a/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/gcloud-session-idmgr.mod b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/gcloud-session-idmgr.mod
new file mode 100644
index 00000000000..06f8cd32435
--- /dev/null
+++ b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/gcloud-session-idmgr.mod
@@ -0,0 +1,63 @@
+#
+# Jetty GCloudDatastore SessionIdManager module
+#
+
+[depend]
+annotations
+webapp
+
+[files]
+maven://com.google.cloud/gcloud-java-datastore/0.2.3|lib/gcloud/gcloud-java-datastore-0.2.3.jar
+maven://com.google.cloud/gcloud-java-core/0.2.3|lib/gcloud/gcloud-java-core-0.2.3.jar
+maven://com.google.auth/google-auth-library-credentials/0.3.1|lib/gcloud/google-auth-library-credentials-0.3.1.jar
+maven://com.google.auth/google-auth-library-oauth2-http/0.3.1|lib/gcloud/google-auth-library-oauth2-http-0.3.1.jar
+maven://com.google.http-client/google-http-client-jackson2/1.19.0|lib/gcloud/google-http-client-jackson2-1.19.0.jar
+maven://com.fasterxml.jackson.core/jackson-core/2.1.3|lib/gcloud/jackson-core-2.1.3.jar
+maven://com.google.http-client/google-http-client/1.21.0|lib/gcloud/google-http-client-1.21.0.jar
+maven://com.google.code.findbugs/jsr305/1.3.9|lib/gcloud/jsr305-1.3.9.jar
+maven://org.apache.httpcomponents/httpclient/4.0.1|lib/gcloud/httpclient-4.0.1.jar
+maven://org.apache.httpcomponents/httpcore/4.0.1|lib/gcloud/httpcore-4.0.1.jar
+maven://commons-logging/commons-logging/1.1.1|lib/gcloud/commons-logging-1.1.1.jar
+maven://commons-codec/commons-codec/1.3|lib/gcloud/commons-codec-1.3.jar
+maven://com.google.oauth-client/google-oauth-client/1.21.0|lib/gcloud/google-oauth-client-1.21.0.jar
+maven://com.google.guava/guava/19.0|lib/gcloud/guava-19.0.jar
+maven://com.google.api-client/google-api-client-appengine/1.21.0|lib/gcloud/google-api-client-appengine-1.21.0.jar
+maven://com.google.oauth-client/google-oauth-client-appengine/1.21.0|lib/gcloud/google-oauth-client-appengine-1.21.0.jar
+maven://com.google.oauth-client/google-oauth-client-servlet/1.21.0|lib/gcloud/google-oauth-client-servlet-1.21.0.jar
+maven://com.google.http-client/google-http-client-jdo/1.21.0|lib/gcloud/google-http-client-jdo-1.21.0.jar
+maven://com.google.api-client/google-api-client-servlet/1.21.0|lib/gcloud/google-api-client-servlet-1.21.0.jar
+maven://javax.jdo/jdo2-api/2.3-eb|lib/gcloud/jdo2-api-2.3-eb.jar
+maven://javax.transaction/transaction-api/1.1|lib/gcloud/transaction-api-1.1.jar
+maven://com.google.http-client/google-http-client-appengine/1.21.0|lib/gcloud/google-http-client-appengine-1.21.0.jar
+maven://com.google.http-client/google-http-client-jackson/1.21.0|lib/gcloud/google-http-client-jackson-1.21.0.jar
+maven://org.codehaus.jackson/jackson-core-asl/1.9.11|lib/gcloud/jackson-core-asl-1.9.11.jar
+maven://joda-time/joda-time/2.9.2|lib/gcloud/joda-time-2.9.2.jar
+maven://org.json/json/20151123|lib/gcloud/json-20151123.jar
+maven://com.google.cloud.datastore/datastore-v1beta3-protos/1.0.0-beta|lib/gcloud/datastore-v1beta3-protos-1.0.0-beta.jar
+maven://com.google.protobuf/protobuf-java/3.0.0-beta-1|lib/gcloud/protobuf-java-3.0.0-beta-1.jar
+maven://com.google.cloud.datastore/datastore-v1beta3-proto-client/1.0.0-beta.2|lib/gcloud/datastore-v1beta3-proto-client-1.0.0-beta.2.jar
+maven://com.google.http-client/google-http-client-protobuf/1.20.0|lib/gcloud/google-http-client-protobuf-1.20.0.jar
+maven://com.google.api-client/google-api-client/1.20.0|lib/gcloud/google-api-client-1.20.0.jar
+maven://com.google.guava/guava-jdk5/13.0|lib/gcloud/guava-jdk5-13.0.jar
+
+
+
+[lib]
+lib/jetty-gcloud-session-manager-${jetty.version}.jar
+lib/gcloud/*.jar
+
+[xml]
+etc/jetty-gcloud-session-idmgr.xml
+
+[license]
+GCloudDatastore is an open source project hosted on Github and released under the Apache 2.0 license.
+https://github.com/GoogleCloudPlatform/gcloud-java
+http://www.apache.org/licenses/LICENSE-2.0.html
+
+[ini-template]
+## Unique identifier to force the workername for this node in the cluster
+## If not set, will default to the string "node" plus the Env variable $GAE_MODULE_INSTANCE
+# jetty.gcloudSession.workerName=node1
+
+
+
diff --git a/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/gcloud-sessions.mod b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/gcloud-sessions.mod
index 9cb9591a66a..89e5bb7d65c 100644
--- a/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/gcloud-sessions.mod
+++ b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/gcloud-sessions.mod
@@ -3,61 +3,9 @@
 #
 
 [depend]
-annotations
-webapp
+gcloud-session-idmgr
 
-[files]
-maven://com.google.cloud/gcloud-java-datastore/0.2.3|lib/gcloud/gcloud-java-datastore-0.2.3.jar
-maven://com.google.cloud/gcloud-java-core/0.2.3|lib/gcloud/gcloud-java-core-0.2.3.jar
-maven://com.google.auth/google-auth-library-credentials/0.3.1|lib/gcloud/google-auth-library-credentials-0.3.1.jar
-maven://com.google.auth/google-auth-library-oauth2-http/0.3.1|lib/gcloud/google-auth-library-oauth2-http-0.3.1.jar
-maven://com.google.http-client/google-http-client-jackson2/1.19.0|lib/gcloud/google-http-client-jackson2-1.19.0.jar
-maven://com.fasterxml.jackson.core/jackson-core/2.1.3|lib/gcloud/jackson-core-2.1.3.jar
-maven://com.google.http-client/google-http-client/1.21.0|lib/gcloud/google-http-client-1.21.0.jar
-maven://com.google.code.findbugs/jsr305/1.3.9|lib/gcloud/jsr305-1.3.9.jar
-maven://org.apache.httpcomponents/httpclient/4.0.1|lib/gcloud/httpclient-4.0.1.jar
-maven://org.apache.httpcomponents/httpcore/4.0.1|lib/gcloud/httpcore-4.0.1.jar
-maven://commons-logging/commons-logging/1.1.1|lib/gcloud/commons-logging-1.1.1.jar
-maven://commons-codec/commons-codec/1.3|lib/gcloud/commons-codec-1.3.jar
-maven://com.google.oauth-client/google-oauth-client/1.21.0|lib/gcloud/google-oauth-client-1.21.0.jar
-maven://com.google.guava/guava/19.0|lib/gcloud/guava-19.0.jar
-maven://com.google.api-client/google-api-client-appengine/1.21.0|lib/gcloud/google-api-client-appengine-1.21.0.jar
-maven://com.google.oauth-client/google-oauth-client-appengine/1.21.0|lib/gcloud/google-oauth-client-appengine-1.21.0.jar
-maven://com.google.oauth-client/google-oauth-client-servlet/1.21.0|lib/gcloud/google-oauth-client-servlet-1.21.0.jar
-maven://com.google.http-client/google-http-client-jdo/1.21.0|lib/gcloud/google-http-client-jdo-1.21.0.jar
-maven://com.google.api-client/google-api-client-servlet/1.21.0|lib/gcloud/google-api-client-servlet-1.21.0.jar
-maven://javax.jdo/jdo2-api/2.3-eb|lib/gcloud/jdo2-api-2.3-eb.jar
-maven://javax.transaction/transaction-api/1.1|lib/gcloud/transaction-api-1.1.jar
-maven://com.google.http-client/google-http-client-appengine/1.21.0|lib/gcloud/google-http-client-appengine-1.21.0.jar
-maven://com.google.http-client/google-http-client-jackson/1.21.0|lib/gcloud/google-http-client-jackson-1.21.0.jar
-maven://org.codehaus.jackson/jackson-core-asl/1.9.11|lib/gcloud/jackson-core-asl-1.9.11.jar
-maven://joda-time/joda-time/2.9.2|lib/gcloud/joda-time-2.9.2.jar
-maven://org.json/json/20151123|lib/gcloud/json-20151123.jar
-maven://com.google.cloud.datastore/datastore-v1beta3-protos/1.0.0-beta|lib/gcloud/datastore-v1beta3-protos-1.0.0-beta.jar
-maven://com.google.protobuf/protobuf-java/3.0.0-beta-1|lib/gcloud/protobuf-java-3.0.0-beta-1.jar
-maven://com.google.cloud.datastore/datastore-v1beta3-proto-client/1.0.0-beta.2|lib/gcloud/datastore-v1beta3-proto-client-1.0.0-beta.2.jar
-maven://com.google.http-client/google-http-client-protobuf/1.20.0|lib/gcloud/google-http-client-protobuf-1.20.0.jar
-maven://com.google.api-client/google-api-client/1.20.0|lib/gcloud/google-api-client-1.20.0.jar
-maven://com.google.guava/guava-jdk5/13.0|lib/gcloud/guava-jdk5-13.0.jar
-
-
-
-[lib]
-lib/jetty-gcloud-session-manager-${jetty.version}.jar
-lib/gcloud/*.jar
 
 [xml]
 etc/jetty-gcloud-sessions.xml
 
-[license]
-GCloudDatastore is an open source project hosted on Github and released under the Apache 2.0 license.
-https://github.com/GoogleCloudPlatform/gcloud-java
-http://www.apache.org/licenses/LICENSE-2.0.html
-
-[ini-template]
-## Unique identifier to force the workername for this node in the cluster
-## If not set, will default to the string "node" plus the Env variable $GAE_MODULE_INSTANCE
-# jetty.gcloudSession.workerName=node1
-
-
-