diff --git a/build-cache-maven-plugin/pom.xml b/build-cache-maven-plugin/pom.xml
index ef58f61f7..f6c39b823 100644
--- a/build-cache-maven-plugin/pom.xml
+++ b/build-cache-maven-plugin/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>helidon-build-tools-project</artifactId>
         <groupId>io.helidon.build-tools</groupId>
-        <version>2.3.6-SNAPSHOT</version>
+        <version>2.3.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>helidon-build-cache-maven-plugin</artifactId>
diff --git a/dev-loop/pom.xml b/dev-loop/pom.xml
index a015d2af6..aa2e971e4 100644
--- a/dev-loop/pom.xml
+++ b/dev-loop/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.helidon.build-tools</groupId>
         <artifactId>helidon-build-tools-project</artifactId>
-        <version>2.3.6-SNAPSHOT</version>
+        <version>2.3.6</version>
     </parent>
     <artifactId>helidon-dev-loop</artifactId>
     <name>Helidon Dev Loop</name>
diff --git a/enforcer-maven-plugin/pom.xml b/enforcer-maven-plugin/pom.xml
index e7aa85e36..50881fb8d 100644
--- a/enforcer-maven-plugin/pom.xml
+++ b/enforcer-maven-plugin/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>io.helidon.build-tools</groupId>
         <artifactId>helidon-build-tools-project</artifactId>
-        <version>2.3.6-SNAPSHOT</version>
+        <version>2.3.6</version>
     </parent>
     <artifactId>helidon-enforcer-plugin</artifactId>
     <name>Helidon Enforcer Plugin</name>
diff --git a/helidon-archetype/engine/pom.xml b/helidon-archetype/engine/pom.xml
index 19628627e..da8f46888 100644
--- a/helidon-archetype/engine/pom.xml
+++ b/helidon-archetype/engine/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>io.helidon.build-tools.archetype</groupId>
         <artifactId>helidon-archetype-project</artifactId>
-        <version>2.3.6-SNAPSHOT</version>
+        <version>2.3.6</version>
     </parent>
     <artifactId>helidon-archetype-engine</artifactId>
     <name>Helidon Archetype Engine</name>
diff --git a/helidon-archetype/maven-plugin/pom.xml b/helidon-archetype/maven-plugin/pom.xml
index 2c4dbe94e..2c1bd97c9 100644
--- a/helidon-archetype/maven-plugin/pom.xml
+++ b/helidon-archetype/maven-plugin/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>io.helidon.build-tools.archetype</groupId>
         <artifactId>helidon-archetype-project</artifactId>
-        <version>2.3.6-SNAPSHOT</version>
+        <version>2.3.6</version>
     </parent>
     <artifactId>helidon-archetype-maven-plugin</artifactId>
     <name>Helidon Archetype Maven Plugin</name>
diff --git a/helidon-archetype/maven-plugin/src/it/projects/test1/catalog2/catalog.xml b/helidon-archetype/maven-plugin/src/it/projects/test1/catalog2/catalog.xml
index f6a114bd8..7d7832717 100644
--- a/helidon-archetype/maven-plugin/src/it/projects/test1/catalog2/catalog.xml
+++ b/helidon-archetype/maven-plugin/src/it/projects/test1/catalog2/catalog.xml
@@ -19,7 +19,7 @@
 <archetype-catalog modelVersion="1.0"
                    name="catalog2"
                    groupId="io.helidon.build-tools.archetype.tests"
-                   version="2.3.6-SNAPSHOT">
+                   version="2.3.6">
 
     <archetype name="test-archetype1"
                title="Test Archetype #1"
diff --git a/helidon-archetype/pom.xml b/helidon-archetype/pom.xml
index ee7657e7d..7ba4fe119 100644
--- a/helidon-archetype/pom.xml
+++ b/helidon-archetype/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>io.helidon.build-tools</groupId>
         <artifactId>helidon-build-tools-project</artifactId>
-        <version>2.3.6-SNAPSHOT</version>
+        <version>2.3.6</version>
     </parent>
     <groupId>io.helidon.build-tools.archetype</groupId>
     <artifactId>helidon-archetype-project</artifactId>
diff --git a/helidon-cli-maven-plugin/pom.xml b/helidon-cli-maven-plugin/pom.xml
index 138de0123..058b62445 100644
--- a/helidon-cli-maven-plugin/pom.xml
+++ b/helidon-cli-maven-plugin/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.helidon.build-tools</groupId>
         <artifactId>helidon-build-tools-project</artifactId>
-        <version>2.3.6-SNAPSHOT</version>
+        <version>2.3.6</version>
     </parent>
     <artifactId>helidon-cli-maven-plugin</artifactId>
     <name>Helidon CLI Maven Plugin</name>
diff --git a/helidon-cli/codegen/pom.xml b/helidon-cli/codegen/pom.xml
index 5596d588f..7fbf5c3a0 100644
--- a/helidon-cli/codegen/pom.xml
+++ b/helidon-cli/codegen/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>io.helidon.build-tools.cli</groupId>
         <artifactId>helidon-cli-project</artifactId>
-        <version>2.3.6-SNAPSHOT</version>
+        <version>2.3.6</version>
     </parent>
     <artifactId>helidon-cli-codegen</artifactId>
     <name>Helidon Command Line Interface Code Generator</name>
diff --git a/helidon-cli/harness/pom.xml b/helidon-cli/harness/pom.xml
index 71737c8cd..b0cc303be 100644
--- a/helidon-cli/harness/pom.xml
+++ b/helidon-cli/harness/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>io.helidon.build-tools.cli</groupId>
         <artifactId>helidon-cli-project</artifactId>
-        <version>2.3.6-SNAPSHOT</version>
+        <version>2.3.6</version>
     </parent>
     <artifactId>helidon-cli-harness</artifactId>
     <name>Helidon Command Line Interface Harness</name>
diff --git a/helidon-cli/impl/pom.xml b/helidon-cli/impl/pom.xml
index 109cca45a..3a1b6d164 100644
--- a/helidon-cli/impl/pom.xml
+++ b/helidon-cli/impl/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>io.helidon.build-tools.cli</groupId>
         <artifactId>helidon-cli-project</artifactId>
-        <version>2.3.6-SNAPSHOT</version>
+        <version>2.3.6</version>
     </parent>
     <artifactId>helidon-cli-impl</artifactId>
     <name>Helidon Command Line Interface Impl</name>
diff --git a/helidon-cli/plugin/pom.xml b/helidon-cli/plugin/pom.xml
index fb31de619..a79e6f227 100644
--- a/helidon-cli/plugin/pom.xml
+++ b/helidon-cli/plugin/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>io.helidon.build-tools.cli</groupId>
         <artifactId>helidon-cli-project</artifactId>
-        <version>2.3.6-SNAPSHOT</version>
+        <version>2.3.6</version>
     </parent>
     <artifactId>helidon-cli-plugin</artifactId>
     <name>Helidon Command Line Interface Plugin</name>
diff --git a/helidon-cli/pom.xml b/helidon-cli/pom.xml
index 04c3faa07..a5fee5323 100644
--- a/helidon-cli/pom.xml
+++ b/helidon-cli/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>io.helidon.build-tools</groupId>
         <artifactId>helidon-build-tools-project</artifactId>
-        <version>2.3.6-SNAPSHOT</version>
+        <version>2.3.6</version>
     </parent>
     <groupId>io.helidon.build-tools.cli</groupId>
     <artifactId>helidon-cli-project</artifactId>
diff --git a/helidon-linker/pom.xml b/helidon-linker/pom.xml
index 038398fd6..c3625162d 100644
--- a/helidon-linker/pom.xml
+++ b/helidon-linker/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.helidon.build-tools</groupId>
         <artifactId>helidon-build-tools-project</artifactId>
-        <version>2.3.6-SNAPSHOT</version>
+        <version>2.3.6</version>
     </parent>
     <artifactId>helidon-linker</artifactId>
     <name>Helidon Linker</name>
diff --git a/helidon-maven-plugin/pom.xml b/helidon-maven-plugin/pom.xml
index 198049978..93a62bc77 100644
--- a/helidon-maven-plugin/pom.xml
+++ b/helidon-maven-plugin/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>io.helidon.build-tools</groupId>
         <artifactId>helidon-build-tools-project</artifactId>
-        <version>2.3.6-SNAPSHOT</version>
+        <version>2.3.6</version>
     </parent>
     <artifactId>helidon-maven-plugin</artifactId>
     <name>Helidon Maven Plugin</name>
diff --git a/licensing/pom.xml b/licensing/pom.xml
index b3c7e4995..d2e3a7c92 100644
--- a/licensing/pom.xml
+++ b/licensing/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.helidon.build-tools</groupId>
         <artifactId>helidon-build-tools-project</artifactId>
-        <version>2.3.6-SNAPSHOT</version>
+        <version>2.3.6</version>
     </parent>
 
     <artifactId>helidon-build-licensing</artifactId>
diff --git a/pom.xml b/pom.xml
index 98ac9c8d6..8e8096e67 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.helidon.build-tools</groupId>
     <artifactId>helidon-build-tools-project</artifactId>
-    <version>2.3.6-SNAPSHOT</version>
+    <version>2.3.6</version>
     <packaging>pom</packaging>
     <name>Helidon Build Tools Project</name>
 
diff --git a/services-maven-plugin/pom.xml b/services-maven-plugin/pom.xml
index 69c3efa6a..e791f1b88 100644
--- a/services-maven-plugin/pom.xml
+++ b/services-maven-plugin/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>io.helidon.build-tools</groupId>
         <artifactId>helidon-build-tools-project</artifactId>
-        <version>2.3.6-SNAPSHOT</version>
+        <version>2.3.6</version>
     </parent>
     <artifactId>helidon-services-plugin</artifactId>
     <name>Helidon Services Plugin</name>
diff --git a/sitegen-maven-plugin/pom.xml b/sitegen-maven-plugin/pom.xml
index d55135065..f5b6c6d81 100644
--- a/sitegen-maven-plugin/pom.xml
+++ b/sitegen-maven-plugin/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.helidon.build-tools</groupId>
         <artifactId>helidon-build-tools-project</artifactId>
-        <version>2.3.6-SNAPSHOT</version>
+        <version>2.3.6</version>
     </parent>
     <artifactId>sitegen-maven-plugin</artifactId>
     <name>Helidon Site Generator</name>
diff --git a/snakeyaml-codegen-maven-plugin/pom.xml b/snakeyaml-codegen-maven-plugin/pom.xml
index 44830d96c..5801b628d 100644
--- a/snakeyaml-codegen-maven-plugin/pom.xml
+++ b/snakeyaml-codegen-maven-plugin/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>io.helidon.build-tools</groupId>
         <artifactId>helidon-build-tools-project</artifactId>
-        <version>2.3.6-SNAPSHOT</version>
+        <version>2.3.6</version>
     </parent>
 
     <artifactId>snakeyaml-codegen-maven-plugin</artifactId>
diff --git a/stager-maven-plugin/pom.xml b/stager-maven-plugin/pom.xml
index 826430f95..74e7549e8 100644
--- a/stager-maven-plugin/pom.xml
+++ b/stager-maven-plugin/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>io.helidon.build-tools</groupId>
         <artifactId>helidon-build-tools-project</artifactId>
-        <version>2.3.6-SNAPSHOT</version>
+        <version>2.3.6</version>
     </parent>
     <artifactId>helidon-stager-maven-plugin</artifactId>
     <name>Helidon Stager Maven Plugin</name>
diff --git a/utils/pom.xml b/utils/pom.xml
index a0e63cf80..bba27223a 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>io.helidon.build-tools</groupId>
         <artifactId>helidon-build-tools-project</artifactId>
-        <version>2.3.6-SNAPSHOT</version>
+        <version>2.3.6</version>
     </parent>
     <artifactId>helidon-utils</artifactId>
     <name>Helidon Build Utilities</name>