diff --git a/archetypes/echo/pom.xml b/archetypes/echo/pom.xml
index 4dcef700..7b1416c9 100644
--- a/archetypes/echo/pom.xml
+++ b/archetypes/echo/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.archetypes</groupId>
         <artifactId>tyrus-archetypes-project</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <description>
diff --git a/archetypes/pom.xml b/archetypes/pom.xml
index fc06e5b4..b24d46d2 100644
--- a/archetypes/pom.xml
+++ b/archetypes/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.tyrus</groupId>
         <artifactId>tyrus-project</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <groupId>org.glassfish.tyrus.archetypes</groupId>
diff --git a/bom/pom.xml b/bom/pom.xml
index 0e30e1d7..c626911e 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -29,7 +29,7 @@
 
     <groupId>org.glassfish.tyrus</groupId>
     <artifactId>tyrus-bom</artifactId>
-    <version>2.1.3.payara-p1-SNAPSHOT</version>
+    <version>2.1.3.payara-p2-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Tyrus BOM</name>
 
diff --git a/bundles/client-jdk/pom.xml b/bundles/client-jdk/pom.xml
index 9be79528..ce99849a 100644
--- a/bundles/client-jdk/pom.xml
+++ b/bundles/client-jdk/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.bundles</groupId>
         <artifactId>tyrus-bundles</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/bundles/client/pom.xml b/bundles/client/pom.xml
index e723ceef..f7fcdcaa 100644
--- a/bundles/client/pom.xml
+++ b/bundles/client/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.bundles</groupId>
         <artifactId>tyrus-bundles</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/bundles/pom.xml b/bundles/pom.xml
index 4ca41348..732f9a3f 100644
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.glassfish.tyrus</groupId>
         <artifactId>tyrus-project</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <groupId>org.glassfish.tyrus.bundles</groupId>
diff --git a/bundles/samples/pom.xml b/bundles/samples/pom.xml
index c9ad27d3..7bd624bc 100644
--- a/bundles/samples/pom.xml
+++ b/bundles/samples/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.bundles</groupId>
         <artifactId>tyrus-bundles</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <artifactId>tyrus-samples</artifactId>
diff --git a/bundles/websocket-ri-archive/pom.xml b/bundles/websocket-ri-archive/pom.xml
index 07797200..e5e396a0 100755
--- a/bundles/websocket-ri-archive/pom.xml
+++ b/bundles/websocket-ri-archive/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.bundles</groupId>
         <artifactId>tyrus-bundles</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <artifactId>websocket-ri-archive</artifactId>
diff --git a/bundles/websocket-ri-bundle/pom.xml b/bundles/websocket-ri-bundle/pom.xml
index 1f0858d8..2de52e0c 100755
--- a/bundles/websocket-ri-bundle/pom.xml
+++ b/bundles/websocket-ri-bundle/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.bundles</groupId>
         <artifactId>tyrus-bundles</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <artifactId>websocket-ri-bundle</artifactId>
diff --git a/client/pom.xml b/client/pom.xml
index a16774c3..f793e802 100755
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.glassfish.tyrus</groupId>
         <artifactId>tyrus-project</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/containers/glassfish/cdi/pom.xml b/containers/glassfish/cdi/pom.xml
index 51457d6a..787ab47c 100755
--- a/containers/glassfish/cdi/pom.xml
+++ b/containers/glassfish/cdi/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.tyrus</groupId>
         <artifactId>tyrus-containers-glassfish-project</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <packaging>bundle</packaging>
diff --git a/containers/glassfish/ejb/pom.xml b/containers/glassfish/ejb/pom.xml
index 946cbf7c..5c007863 100755
--- a/containers/glassfish/ejb/pom.xml
+++ b/containers/glassfish/ejb/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.tyrus</groupId>
         <artifactId>tyrus-containers-glassfish-project</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <packaging>bundle</packaging>
diff --git a/containers/glassfish/pom.xml b/containers/glassfish/pom.xml
index baf8b140..4af48e40 100755
--- a/containers/glassfish/pom.xml
+++ b/containers/glassfish/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.glassfish.tyrus</groupId>
         <artifactId>tyrus-containers-project</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/containers/grizzly-client/pom.xml b/containers/grizzly-client/pom.xml
index 33846f79..9ae03c5e 100755
--- a/containers/grizzly-client/pom.xml
+++ b/containers/grizzly-client/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.tyrus</groupId>
         <artifactId>tyrus-containers-project</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <packaging>bundle</packaging>
diff --git a/containers/grizzly-server/pom.xml b/containers/grizzly-server/pom.xml
index a0b1b0dd..756f98db 100755
--- a/containers/grizzly-server/pom.xml
+++ b/containers/grizzly-server/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.tyrus</groupId>
         <artifactId>tyrus-containers-project</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <packaging>bundle</packaging>
diff --git a/containers/inmemory/pom.xml b/containers/inmemory/pom.xml
index 0a9a0650..95015e3b 100644
--- a/containers/inmemory/pom.xml
+++ b/containers/inmemory/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.tyrus</groupId>
         <artifactId>tyrus-containers-project</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <packaging>bundle</packaging>
diff --git a/containers/jdk-client/pom.xml b/containers/jdk-client/pom.xml
index d2e833e6..1b59f5a9 100755
--- a/containers/jdk-client/pom.xml
+++ b/containers/jdk-client/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.tyrus</groupId>
         <artifactId>tyrus-containers-project</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <packaging>bundle</packaging>
diff --git a/containers/pom.xml b/containers/pom.xml
index 3373ba43..fc629b2c 100755
--- a/containers/pom.xml
+++ b/containers/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.glassfish.tyrus</groupId>
         <artifactId>tyrus-project</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/containers/servlet/pom.xml b/containers/servlet/pom.xml
index 946830db..361bb042 100755
--- a/containers/servlet/pom.xml
+++ b/containers/servlet/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.glassfish.tyrus</groupId>
         <artifactId>tyrus-containers-project</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/containers/servlet/src/main/java/org/glassfish/tyrus/servlet/TyrusServletContainerInitializer.java b/containers/servlet/src/main/java/org/glassfish/tyrus/servlet/TyrusServletContainerInitializer.java
index 9ed851cc..1aeeaab4 100755
--- a/containers/servlet/src/main/java/org/glassfish/tyrus/servlet/TyrusServletContainerInitializer.java
+++ b/containers/servlet/src/main/java/org/glassfish/tyrus/servlet/TyrusServletContainerInitializer.java
@@ -76,6 +76,11 @@ public void onStartup(Set<Class<?>> classes, final ServletContext ctx) throws Se
             return;
         }
 
+        if (ctx.getAttribute(ServerContainer.class.getName()) != null) {
+            // Already initialized
+            return;
+        }
+
         classes.removeAll(FILTERED_CLASSES);
 
         final Integer incomingBufferSize = getIntContextParam(ctx, TyrusHttpUpgradeHandler.FRAME_BUFFER_SIZE);
diff --git a/core/pom.xml b/core/pom.xml
index 57703354..0aaef6ab 100755
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.glassfish.tyrus</groupId>
         <artifactId>tyrus-project</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/docs/pom.xml b/docs/pom.xml
index 6f471c6b..cecd089e 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.tyrus</groupId>
         <artifactId>tyrus-project</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <artifactId>tyrus-documentation</artifactId>
diff --git a/ext/client-cli/pom.xml b/ext/client-cli/pom.xml
index 450fbb6f..9a566635 100644
--- a/ext/client-cli/pom.xml
+++ b/ext/client-cli/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.ext</groupId>
         <artifactId>tyrus-extensions-project</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/ext/client-java8/pom.xml b/ext/client-java8/pom.xml
index 1f18ae79..9d414e43 100644
--- a/ext/client-java8/pom.xml
+++ b/ext/client-java8/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.ext</groupId>
         <artifactId>tyrus-extensions-project</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/ext/extension-deflate/pom.xml b/ext/extension-deflate/pom.xml
index 20995a35..6ce5a9ab 100644
--- a/ext/extension-deflate/pom.xml
+++ b/ext/extension-deflate/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.ext</groupId>
         <artifactId>tyrus-extensions-project</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/ext/monitoring-jmx/pom.xml b/ext/monitoring-jmx/pom.xml
index da9d5a7f..bd7521c7 100644
--- a/ext/monitoring-jmx/pom.xml
+++ b/ext/monitoring-jmx/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.ext</groupId>
         <artifactId>tyrus-extensions-project</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <artifactId>tyrus-monitoring-jmx</artifactId>
diff --git a/ext/pom.xml b/ext/pom.xml
index 5de0f857..d2c5d31d 100644
--- a/ext/pom.xml
+++ b/ext/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.glassfish.tyrus</groupId>
         <artifactId>tyrus-project</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 43008f7c..03e274ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
 
     <groupId>org.glassfish.tyrus</groupId>
     <artifactId>tyrus-project</artifactId>
-    <version>2.1.3.payara-p1-SNAPSHOT</version>
+    <version>2.1.3.payara-p2-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>tyrus</name>
     <description>Tyrus is the reference implementation of Java API for WebSocket (JSR-356)</description>
diff --git a/samples/auction/pom.xml b/samples/auction/pom.xml
index 53641d22..9e55df05 100755
--- a/samples/auction/pom.xml
+++ b/samples/auction/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.samples</groupId>
         <artifactId>tyrus-samples-project</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <packaging>war</packaging>
diff --git a/samples/cdi/pom.xml b/samples/cdi/pom.xml
index 98187751..789133f1 100755
--- a/samples/cdi/pom.xml
+++ b/samples/cdi/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.samples</groupId>
         <artifactId>tyrus-samples-project</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <packaging>war</packaging>
diff --git a/samples/chat/pom.xml b/samples/chat/pom.xml
index 80426c27..2722bda5 100755
--- a/samples/chat/pom.xml
+++ b/samples/chat/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.samples</groupId>
         <artifactId>tyrus-samples-project</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <packaging>war</packaging>
diff --git a/samples/draw/pom.xml b/samples/draw/pom.xml
index bb5a3942..27c41548 100755
--- a/samples/draw/pom.xml
+++ b/samples/draw/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.samples</groupId>
         <artifactId>tyrus-samples-project</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <packaging>war</packaging>
diff --git a/samples/echo-basic-auth/pom.xml b/samples/echo-basic-auth/pom.xml
index f87345be..35076c91 100755
--- a/samples/echo-basic-auth/pom.xml
+++ b/samples/echo-basic-auth/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.samples</groupId>
         <artifactId>tyrus-samples-project</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <packaging>war</packaging>
diff --git a/samples/echo-https/pom.xml b/samples/echo-https/pom.xml
index dd3e2a8b..de53e59f 100755
--- a/samples/echo-https/pom.xml
+++ b/samples/echo-https/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.samples</groupId>
         <artifactId>tyrus-samples-project</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <packaging>war</packaging>
diff --git a/samples/echo/pom.xml b/samples/echo/pom.xml
index f8e52935..59014a3a 100755
--- a/samples/echo/pom.xml
+++ b/samples/echo/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.samples</groupId>
         <artifactId>tyrus-samples-project</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <packaging>war</packaging>
diff --git a/samples/pom.xml b/samples/pom.xml
index d20a1821..d97b3085 100755
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.glassfish.tyrus</groupId>
         <artifactId>tyrus-project</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <groupId>org.glassfish.tyrus.samples</groupId>
diff --git a/samples/programmatic-echo/pom.xml b/samples/programmatic-echo/pom.xml
index 9353cf23..90b90fcd 100755
--- a/samples/programmatic-echo/pom.xml
+++ b/samples/programmatic-echo/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.samples</groupId>
         <artifactId>tyrus-samples-project</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <packaging>war</packaging>
diff --git a/samples/shared-collection/pom.xml b/samples/shared-collection/pom.xml
index 167d0ac9..40c3b8cb 100644
--- a/samples/shared-collection/pom.xml
+++ b/samples/shared-collection/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.samples</groupId>
         <artifactId>tyrus-samples-project</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <packaging>war</packaging>
diff --git a/samples/simplelife/pom.xml b/samples/simplelife/pom.xml
index e21c6c87..011e0e1f 100755
--- a/samples/simplelife/pom.xml
+++ b/samples/simplelife/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.samples</groupId>
         <artifactId>tyrus-samples-project</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <packaging>war</packaging>
diff --git a/server/pom.xml b/server/pom.xml
index cff5df05..9f3cc7c3 100755
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.glassfish.tyrus</groupId>
         <artifactId>tyrus-project</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/spi/pom.xml b/spi/pom.xml
index a2040b4e..603daf79 100755
--- a/spi/pom.xml
+++ b/spi/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.glassfish.tyrus</groupId>
         <artifactId>tyrus-project</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/tests/containers/jdk-client/pom.xml b/tests/containers/jdk-client/pom.xml
index 3881d475..a6dc45d2 100644
--- a/tests/containers/jdk-client/pom.xml
+++ b/tests/containers/jdk-client/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.tests</groupId>
         <artifactId>tyrus-tests-containers</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <packaging>war</packaging>
diff --git a/tests/containers/pom.xml b/tests/containers/pom.xml
index 1b029041..d1fa2194 100644
--- a/tests/containers/pom.xml
+++ b/tests/containers/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.tests</groupId>
         <artifactId>tyrus-tests-project</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <packaging>pom</packaging>
diff --git a/tests/containers/servlet/pom.xml b/tests/containers/servlet/pom.xml
index 09dfc6c4..426b254a 100644
--- a/tests/containers/servlet/pom.xml
+++ b/tests/containers/servlet/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.tests</groupId>
         <artifactId>tyrus-tests-containers</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <packaging>war</packaging>
diff --git a/tests/e2e/application-config/pom.xml b/tests/e2e/application-config/pom.xml
index a7ebe0d7..ea7f7ef0 100755
--- a/tests/e2e/application-config/pom.xml
+++ b/tests/e2e/application-config/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.tests</groupId>
         <artifactId>tyrus-tests-e2e</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <packaging>war</packaging>
diff --git a/tests/e2e/jdk8/pom.xml b/tests/e2e/jdk8/pom.xml
index 2cd57c72..8db872cb 100644
--- a/tests/e2e/jdk8/pom.xml
+++ b/tests/e2e/jdk8/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.tests</groupId>
         <artifactId>tyrus-tests-e2e</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <packaging>war</packaging>
diff --git a/tests/e2e/jetty/auth-basic/pom.xml b/tests/e2e/jetty/auth-basic/pom.xml
index f68d2c95..7c8d10b3 100644
--- a/tests/e2e/jetty/auth-basic/pom.xml
+++ b/tests/e2e/jetty/auth-basic/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.tests</groupId>
         <artifactId>tyrus-tests-e2e-jetty</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <packaging>jar</packaging>
diff --git a/tests/e2e/jetty/auth-digest/pom.xml b/tests/e2e/jetty/auth-digest/pom.xml
index 7f53fca2..94ff62d2 100644
--- a/tests/e2e/jetty/auth-digest/pom.xml
+++ b/tests/e2e/jetty/auth-digest/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.tests</groupId>
         <artifactId>tyrus-tests-e2e-jetty</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <packaging>jar</packaging>
diff --git a/tests/e2e/jetty/pom.xml b/tests/e2e/jetty/pom.xml
index 3fdb9c9e..1db18a1e 100755
--- a/tests/e2e/jetty/pom.xml
+++ b/tests/e2e/jetty/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.tests</groupId>
         <artifactId>tyrus-tests-e2e</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <packaging>pom</packaging>
diff --git a/tests/e2e/non-deployable/pom.xml b/tests/e2e/non-deployable/pom.xml
index 860c5271..e1369c03 100755
--- a/tests/e2e/non-deployable/pom.xml
+++ b/tests/e2e/non-deployable/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.tests</groupId>
         <artifactId>tyrus-tests-e2e</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <packaging>war</packaging>
diff --git a/tests/e2e/pom.xml b/tests/e2e/pom.xml
index 185ebb59..672ac0c4 100755
--- a/tests/e2e/pom.xml
+++ b/tests/e2e/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.tests</groupId>
         <artifactId>tyrus-tests-project</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <packaging>pom</packaging>
diff --git a/tests/e2e/standard-config/pom.xml b/tests/e2e/standard-config/pom.xml
index 552a7c67..643f7632 100755
--- a/tests/e2e/standard-config/pom.xml
+++ b/tests/e2e/standard-config/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.tests</groupId>
         <artifactId>tyrus-tests-e2e</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <packaging>war</packaging>
diff --git a/tests/pom.xml b/tests/pom.xml
index 06d34827..b820ce69 100755
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.tyrus</groupId>
         <artifactId>tyrus-project</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <groupId>org.glassfish.tyrus.tests</groupId>
diff --git a/tests/qa/browser-test/pom.xml b/tests/qa/browser-test/pom.xml
index c0973ada..15720a77 100755
--- a/tests/qa/browser-test/pom.xml
+++ b/tests/qa/browser-test/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.tests.qa</groupId>
         <artifactId>tyrus-tests-qa-project</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <packaging>war</packaging>
diff --git a/tests/qa/lifecycle-test/pom.xml b/tests/qa/lifecycle-test/pom.xml
index c02fd5dc..d292c50c 100644
--- a/tests/qa/lifecycle-test/pom.xml
+++ b/tests/qa/lifecycle-test/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.tests.qa</groupId>
         <artifactId>tyrus-tests-qa-project</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <packaging>war</packaging>
diff --git a/tests/qa/pom.xml b/tests/qa/pom.xml
index 1f269b2f..8e26c42b 100644
--- a/tests/qa/pom.xml
+++ b/tests/qa/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.tests</groupId>
         <artifactId>tyrus-tests-project</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <groupId>org.glassfish.tyrus.tests.qa</groupId>
diff --git a/tests/servlet/async/pom.xml b/tests/servlet/async/pom.xml
index 8bbb5bd7..df8faaa9 100644
--- a/tests/servlet/async/pom.xml
+++ b/tests/servlet/async/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.tests.servlet</groupId>
         <artifactId>tyrus-tests-servlet-project</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <packaging>war</packaging>
diff --git a/tests/servlet/autobahn-server/pom.xml b/tests/servlet/autobahn-server/pom.xml
index d932dbac..51acc29e 100644
--- a/tests/servlet/autobahn-server/pom.xml
+++ b/tests/servlet/autobahn-server/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.tests.servlet</groupId>
         <artifactId>tyrus-tests-servlet-project</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <packaging>war</packaging>
diff --git a/tests/servlet/basic/pom.xml b/tests/servlet/basic/pom.xml
index 9fe03b63..a06295e5 100644
--- a/tests/servlet/basic/pom.xml
+++ b/tests/servlet/basic/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.tests.servlet</groupId>
         <artifactId>tyrus-tests-servlet-project</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <packaging>war</packaging>
diff --git a/tests/servlet/debug/pom.xml b/tests/servlet/debug/pom.xml
index 406855c2..7a44f324 100644
--- a/tests/servlet/debug/pom.xml
+++ b/tests/servlet/debug/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>tyrus-tests-servlet-project</artifactId>
         <groupId>org.glassfish.tyrus.tests.servlet</groupId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/tests/servlet/dynamic-deploy/pom.xml b/tests/servlet/dynamic-deploy/pom.xml
index 52257aa7..39d590b4 100644
--- a/tests/servlet/dynamic-deploy/pom.xml
+++ b/tests/servlet/dynamic-deploy/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.tests.servlet</groupId>
         <artifactId>tyrus-tests-servlet-project</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <packaging>war</packaging>
diff --git a/tests/servlet/embedded-glassfish-test/pom.xml b/tests/servlet/embedded-glassfish-test/pom.xml
index 3c14c37e..b5f7dc84 100644
--- a/tests/servlet/embedded-glassfish-test/pom.xml
+++ b/tests/servlet/embedded-glassfish-test/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.tests.servlet</groupId>
         <artifactId>tyrus-tests-servlet-project</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <packaging>war</packaging>
diff --git a/tests/servlet/inject/pom.xml b/tests/servlet/inject/pom.xml
index f05a4b3e..4d4c2cec 100644
--- a/tests/servlet/inject/pom.xml
+++ b/tests/servlet/inject/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.tests.servlet</groupId>
         <artifactId>tyrus-tests-servlet-project</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <packaging>war</packaging>
diff --git a/tests/servlet/maxsessions-per-app/pom.xml b/tests/servlet/maxsessions-per-app/pom.xml
index 1c80d929..ff18dcb0 100755
--- a/tests/servlet/maxsessions-per-app/pom.xml
+++ b/tests/servlet/maxsessions-per-app/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.tests.servlet</groupId>
         <artifactId>tyrus-tests-servlet-project</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <packaging>war</packaging>
diff --git a/tests/servlet/maxsessions-per-remoteaddr/pom.xml b/tests/servlet/maxsessions-per-remoteaddr/pom.xml
index 4ca1a530..ee98feef 100755
--- a/tests/servlet/maxsessions-per-remoteaddr/pom.xml
+++ b/tests/servlet/maxsessions-per-remoteaddr/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.tests.servlet</groupId>
         <artifactId>tyrus-tests-servlet-project</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <packaging>war</packaging>
diff --git a/tests/servlet/mbean/pom.xml b/tests/servlet/mbean/pom.xml
index e262f522..f4e5db8c 100644
--- a/tests/servlet/mbean/pom.xml
+++ b/tests/servlet/mbean/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.tests.servlet</groupId>
         <artifactId>tyrus-tests-servlet-project</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <packaging>war</packaging>
diff --git a/tests/servlet/noappconfig/pom.xml b/tests/servlet/noappconfig/pom.xml
index f3984edf..798191da 100755
--- a/tests/servlet/noappconfig/pom.xml
+++ b/tests/servlet/noappconfig/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.tests.servlet</groupId>
         <artifactId>tyrus-tests-servlet-project</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <packaging>war</packaging>
diff --git a/tests/servlet/oneappconfig/pom.xml b/tests/servlet/oneappconfig/pom.xml
index 5f1b6046..d6f5ae1a 100755
--- a/tests/servlet/oneappconfig/pom.xml
+++ b/tests/servlet/oneappconfig/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.tests.servlet</groupId>
         <artifactId>tyrus-tests-servlet-project</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <packaging>war</packaging>
diff --git a/tests/servlet/pom.xml b/tests/servlet/pom.xml
index 96274d8f..6aa64c8b 100755
--- a/tests/servlet/pom.xml
+++ b/tests/servlet/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.tests</groupId>
         <artifactId>tyrus-tests-project</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <groupId>org.glassfish.tyrus.tests.servlet</groupId>
diff --git a/tests/servlet/remote-endpoint-timeout/pom.xml b/tests/servlet/remote-endpoint-timeout/pom.xml
index e5740d1a..56c08eb6 100755
--- a/tests/servlet/remote-endpoint-timeout/pom.xml
+++ b/tests/servlet/remote-endpoint-timeout/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.tests.servlet</groupId>
         <artifactId>tyrus-tests-servlet-project</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <packaging>war</packaging>
diff --git a/tests/servlet/session/pom.xml b/tests/servlet/session/pom.xml
index fe1f97ad..86a139ea 100755
--- a/tests/servlet/session/pom.xml
+++ b/tests/servlet/session/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.tests.servlet</groupId>
         <artifactId>tyrus-tests-servlet-project</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <packaging>war</packaging>
diff --git a/tests/servlet/twoappconfig/pom.xml b/tests/servlet/twoappconfig/pom.xml
index c54c4962..415603c4 100755
--- a/tests/servlet/twoappconfig/pom.xml
+++ b/tests/servlet/twoappconfig/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.tests.servlet</groupId>
         <artifactId>tyrus-tests-servlet-project</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <packaging>war</packaging>
diff --git a/tests/tools/pom.xml b/tests/tools/pom.xml
index 57670aa5..c66416a2 100755
--- a/tests/tools/pom.xml
+++ b/tests/tools/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.tests</groupId>
         <artifactId>tyrus-tests-project</artifactId>
-        <version>2.1.3.payara-p1-SNAPSHOT</version>
+        <version>2.1.3.payara-p2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>