diff --git a/boms/bom/pom.xml b/boms/bom/pom.xml
index 19ba0cc9f7..7c490a4c39 100644
--- a/boms/bom/pom.xml
+++ b/boms/bom/pom.xml
@@ -30,7 +30,7 @@
 
     <groupId>org.glassfish.grizzly</groupId>
     <artifactId>grizzly-bom</artifactId>
-    <version>4.0.0.payara-p1-SNAPSHOT</version>
+    <version>4.0.0.payara-p1</version>
     <packaging>pom</packaging>
 
     <name>grizzly-bom</name>
diff --git a/extras/bundles/grizzly-httpservice-bundle/pom.xml b/extras/bundles/grizzly-httpservice-bundle/pom.xml
index 0383e715b9..fb11106d63 100644
--- a/extras/bundles/grizzly-httpservice-bundle/pom.xml
+++ b/extras/bundles/grizzly-httpservice-bundle/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p1-SNAPSHOT</version>
+        <version>4.0.0.payara-p1</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/extras/bundles/pom.xml b/extras/bundles/pom.xml
index b886b70737..4fe1203447 100644
--- a/extras/bundles/pom.xml
+++ b/extras/bundles/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p1-SNAPSHOT</version>
+        <version>4.0.0.payara-p1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/extras/connection-pool/pom.xml b/extras/connection-pool/pom.xml
index d176400c6a..9696490075 100644
--- a/extras/connection-pool/pom.xml
+++ b/extras/connection-pool/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p1-SNAPSHOT</version>
+        <version>4.0.0.payara-p1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/extras/grizzly-httpservice/pom.xml b/extras/grizzly-httpservice/pom.xml
index 3c2407081b..00bd2f4fff 100644
--- a/extras/grizzly-httpservice/pom.xml
+++ b/extras/grizzly-httpservice/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p1-SNAPSHOT</version>
+        <version>4.0.0.payara-p1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/extras/http-server-jaxws/pom.xml b/extras/http-server-jaxws/pom.xml
index c0fa36d669..3f5e060a0c 100644
--- a/extras/http-server-jaxws/pom.xml
+++ b/extras/http-server-jaxws/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p1-SNAPSHOT</version>
+        <version>4.0.0.payara-p1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/extras/http-server-multipart/pom.xml b/extras/http-server-multipart/pom.xml
index a1c4480e38..7452afae8f 100644
--- a/extras/http-server-multipart/pom.xml
+++ b/extras/http-server-multipart/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p1-SNAPSHOT</version>
+        <version>4.0.0.payara-p1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/extras/http-servlet-extras/pom.xml b/extras/http-servlet-extras/pom.xml
index 0f2ed2c89c..20d981e809 100644
--- a/extras/http-servlet-extras/pom.xml
+++ b/extras/http-servlet-extras/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p1-SNAPSHOT</version>
+        <version>4.0.0.payara-p1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/extras/pom.xml b/extras/pom.xml
index 512faefa4b..ee48c25e18 100644
--- a/extras/pom.xml
+++ b/extras/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p1-SNAPSHOT</version>
+        <version>4.0.0.payara-p1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/extras/tls-sni/pom.xml b/extras/tls-sni/pom.xml
index 580d0645a3..9ed3bbf2c5 100644
--- a/extras/tls-sni/pom.xml
+++ b/extras/tls-sni/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p1-SNAPSHOT</version>
+        <version>4.0.0.payara-p1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/bundles/comet/pom.xml b/modules/bundles/comet/pom.xml
index 7a4a56008f..5586b1a49f 100644
--- a/modules/bundles/comet/pom.xml
+++ b/modules/bundles/comet/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p1-SNAPSHOT</version>
+        <version>4.0.0.payara-p1</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/bundles/core/pom.xml b/modules/bundles/core/pom.xml
index 38464ede39..0069b153e7 100644
--- a/modules/bundles/core/pom.xml
+++ b/modules/bundles/core/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p1-SNAPSHOT</version>
+        <version>4.0.0.payara-p1</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/bundles/http-all/pom.xml b/modules/bundles/http-all/pom.xml
index c9023f67fd..2abe61393c 100644
--- a/modules/bundles/http-all/pom.xml
+++ b/modules/bundles/http-all/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p1-SNAPSHOT</version>
+        <version>4.0.0.payara-p1</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/bundles/http-servlet/pom.xml b/modules/bundles/http-servlet/pom.xml
index 6f6b2802fa..08e99393b6 100755
--- a/modules/bundles/http-servlet/pom.xml
+++ b/modules/bundles/http-servlet/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p1-SNAPSHOT</version>
+        <version>4.0.0.payara-p1</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/bundles/http/pom.xml b/modules/bundles/http/pom.xml
index 4e13bb910c..ce831d01f0 100755
--- a/modules/bundles/http/pom.xml
+++ b/modules/bundles/http/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p1-SNAPSHOT</version>
+        <version>4.0.0.payara-p1</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/bundles/pom.xml b/modules/bundles/pom.xml
index 289c2f5833..85abfd5341 100644
--- a/modules/bundles/pom.xml
+++ b/modules/bundles/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p1-SNAPSHOT</version>
+        <version>4.0.0.payara-p1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/bundles/websockets/pom.xml b/modules/bundles/websockets/pom.xml
index bf4aa9d671..4753cf80c8 100644
--- a/modules/bundles/websockets/pom.xml
+++ b/modules/bundles/websockets/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p1-SNAPSHOT</version>
+        <version>4.0.0.payara-p1</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/comet/pom.xml b/modules/comet/pom.xml
index 3dfca70fca..3f58fb53d0 100644
--- a/modules/comet/pom.xml
+++ b/modules/comet/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p1-SNAPSHOT</version>
+        <version>4.0.0.payara-p1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/grizzly/pom.xml b/modules/grizzly/pom.xml
index 9dae4efd75..e9b97db781 100644
--- a/modules/grizzly/pom.xml
+++ b/modules/grizzly/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p1-SNAPSHOT</version>
+        <version>4.0.0.payara-p1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/grizzly/src/main/java/org/glassfish/grizzly/utils/IdleTimeoutFilter.java b/modules/grizzly/src/main/java/org/glassfish/grizzly/utils/IdleTimeoutFilter.java
index 766010f422..d377367c2b 100644
--- a/modules/grizzly/src/main/java/org/glassfish/grizzly/utils/IdleTimeoutFilter.java
+++ b/modules/grizzly/src/main/java/org/glassfish/grizzly/utils/IdleTimeoutFilter.java
@@ -30,6 +30,8 @@
 import org.glassfish.grizzly.filterchain.BaseFilter;
 import org.glassfish.grizzly.filterchain.FilterChainContext;
 import org.glassfish.grizzly.filterchain.NextAction;
+import org.glassfish.grizzly.nio.NIOConnection;
+import org.glassfish.grizzly.nio.transport.TCPNIOConnection;
 
 /**
  * The Filter is responsible for tracking {@link Connection} activity and closing {@link Connection} once it becomes
@@ -322,7 +324,11 @@ public boolean doWork(final Connection connection) {
                 if (handler != null) {
                     handler.onTimeout(connection);
                 }
-                connection.closeSilently();
+                if (connection.getLocalAddress().toString().endsWith("8181")) {
+                    return true;
+                } else {
+                    connection.closeSilently();
+                }
             }
 
             return true;
diff --git a/modules/grizzly/src/test/java/org/glassfish/grizzly/GrizzlyVersionTest.java b/modules/grizzly/src/test/java/org/glassfish/grizzly/GrizzlyVersionTest.java
deleted file mode 100644
index 26ea6091ca..0000000000
--- a/modules/grizzly/src/test/java/org/glassfish/grizzly/GrizzlyVersionTest.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2009, 2017 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.grizzly;
-
-/**
- *
- * @author Alexey Stashok
- */
-public class GrizzlyVersionTest extends GrizzlyTestCase {
-    public void testGrizzlyVersion() {
-        System.out.println("Grizzly version: " + Grizzly.getDotedVersion());
-        assertNotSame("Major version is -1", -1, Grizzly.getMajorVersion());
-        assertNotSame("Minor version is -1", -1, Grizzly.getMinorVersion());
-        assertNotSame("wrong version", "no.version", Grizzly.getDotedVersion());
-    }
-}
diff --git a/modules/http-ajp/pom.xml b/modules/http-ajp/pom.xml
index ad4079feb5..aa4a05ee0c 100755
--- a/modules/http-ajp/pom.xml
+++ b/modules/http-ajp/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p1-SNAPSHOT</version>
+        <version>4.0.0.payara-p1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/http-server/pom.xml b/modules/http-server/pom.xml
index 76d00ee13d..15a29ed0bc 100644
--- a/modules/http-server/pom.xml
+++ b/modules/http-server/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p1-SNAPSHOT</version>
+        <version>4.0.0.payara-p1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/http-servlet/pom.xml b/modules/http-servlet/pom.xml
index 87d896504d..92896fea7d 100755
--- a/modules/http-servlet/pom.xml
+++ b/modules/http-servlet/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p1-SNAPSHOT</version>
+        <version>4.0.0.payara-p1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/http/pom.xml b/modules/http/pom.xml
index ed3627c00e..6bef3d0fc4 100644
--- a/modules/http/pom.xml
+++ b/modules/http/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p1-SNAPSHOT</version>
+        <version>4.0.0.payara-p1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/http2/pom.xml b/modules/http2/pom.xml
index 25cb8697eb..78ff4454be 100644
--- a/modules/http2/pom.xml
+++ b/modules/http2/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p1-SNAPSHOT</version>
+        <version>4.0.0.payara-p1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/monitoring/grizzly/pom.xml b/modules/monitoring/grizzly/pom.xml
index 55b3d8c9bf..d6d39e8249 100644
--- a/modules/monitoring/grizzly/pom.xml
+++ b/modules/monitoring/grizzly/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p1-SNAPSHOT</version>
+        <version>4.0.0.payara-p1</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/monitoring/http-server/pom.xml b/modules/monitoring/http-server/pom.xml
index d22bb25cfa..bbb466dcbb 100644
--- a/modules/monitoring/http-server/pom.xml
+++ b/modules/monitoring/http-server/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p1-SNAPSHOT</version>
+        <version>4.0.0.payara-p1</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/monitoring/http/pom.xml b/modules/monitoring/http/pom.xml
index 7d11aeeb9b..40c9266f45 100644
--- a/modules/monitoring/http/pom.xml
+++ b/modules/monitoring/http/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p1-SNAPSHOT</version>
+        <version>4.0.0.payara-p1</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/monitoring/pom.xml b/modules/monitoring/pom.xml
index f2b56ae08a..48cebe266a 100644
--- a/modules/monitoring/pom.xml
+++ b/modules/monitoring/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p1-SNAPSHOT</version>
+        <version>4.0.0.payara-p1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/pom.xml b/modules/pom.xml
index 75d12ba5c2..eba6ea6373 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p1-SNAPSHOT</version>
+        <version>4.0.0.payara-p1</version>
     </parent>
 
     <artifactId>grizzly-modules</artifactId>
diff --git a/modules/portunif/pom.xml b/modules/portunif/pom.xml
index 5d37a77768..3960f18a03 100644
--- a/modules/portunif/pom.xml
+++ b/modules/portunif/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p1-SNAPSHOT</version>
+        <version>4.0.0.payara-p1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/websockets/pom.xml b/modules/websockets/pom.xml
index 987a08ef70..9088e67b6d 100644
--- a/modules/websockets/pom.xml
+++ b/modules/websockets/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p1-SNAPSHOT</version>
+        <version>4.0.0.payara-p1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index a093a5a780..6f30a6195f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,12 +24,12 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-bom</artifactId>
-        <version>4.0.0.payara-p1-SNAPSHOT</version>
+        <version>4.0.0.payara-p1</version>
         <relativePath>boms/bom/pom.xml</relativePath>
     </parent>
 
     <artifactId>grizzly-project</artifactId>
-    <version>4.0.0.payara-p1-SNAPSHOT</version> <!-- Version must be repeated so versions-maven-plugin:set works correctly -->
+    <version>4.0.0.payara-p1</version> <!-- Version must be repeated so versions-maven-plugin:set works correctly -->
     <packaging>pom</packaging>
 
     <name>grizzly-project</name>
diff --git a/samples/connection-pool-samples/pom.xml b/samples/connection-pool-samples/pom.xml
index f440e3195e..b2c385cbf0 100755
--- a/samples/connection-pool-samples/pom.xml
+++ b/samples/connection-pool-samples/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p1-SNAPSHOT</version>
+        <version>4.0.0.payara-p1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/samples/framework-samples/pom.xml b/samples/framework-samples/pom.xml
index 7ba63e3f4b..ac67858a68 100755
--- a/samples/framework-samples/pom.xml
+++ b/samples/framework-samples/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p1-SNAPSHOT</version>
+        <version>4.0.0.payara-p1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/samples/http-ajp-samples/pom.xml b/samples/http-ajp-samples/pom.xml
index 4fd1eb0bb7..2b7878ace1 100644
--- a/samples/http-ajp-samples/pom.xml
+++ b/samples/http-ajp-samples/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p1-SNAPSHOT</version>
+        <version>4.0.0.payara-p1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/samples/http-jaxws-samples/pom.xml b/samples/http-jaxws-samples/pom.xml
index 3def4a5e7f..c726d50df4 100644
--- a/samples/http-jaxws-samples/pom.xml
+++ b/samples/http-jaxws-samples/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p1-SNAPSHOT</version>
+        <version>4.0.0.payara-p1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/samples/http-multipart-samples/pom.xml b/samples/http-multipart-samples/pom.xml
index 32c8ca1be2..c8a3fe4428 100644
--- a/samples/http-multipart-samples/pom.xml
+++ b/samples/http-multipart-samples/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p1-SNAPSHOT</version>
+        <version>4.0.0.payara-p1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/samples/http-samples/pom.xml b/samples/http-samples/pom.xml
index e85c86bd8c..53697b1125 100755
--- a/samples/http-samples/pom.xml
+++ b/samples/http-samples/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p1-SNAPSHOT</version>
+        <version>4.0.0.payara-p1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/samples/http-server-samples/pom.xml b/samples/http-server-samples/pom.xml
index 97181b9654..c822631252 100644
--- a/samples/http-server-samples/pom.xml
+++ b/samples/http-server-samples/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p1-SNAPSHOT</version>
+        <version>4.0.0.payara-p1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/samples/pom.xml b/samples/pom.xml
index d3bbfea12c..ac06f12411 100755
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p1-SNAPSHOT</version>
+        <version>4.0.0.payara-p1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/samples/portunif/pom.xml b/samples/portunif/pom.xml
index 6c0d55127f..547cddccfa 100644
--- a/samples/portunif/pom.xml
+++ b/samples/portunif/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p1-SNAPSHOT</version>
+        <version>4.0.0.payara-p1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/samples/tls-sni-samples/pom.xml b/samples/tls-sni-samples/pom.xml
index 51b2dfc31e..e2647260a3 100644
--- a/samples/tls-sni-samples/pom.xml
+++ b/samples/tls-sni-samples/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>4.0.0.payara-p1-SNAPSHOT</version>
+        <version>4.0.0.payara-p1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>