diff --git a/CHANGELOG.md b/CHANGELOG.md
index e2cadb5f32..4c03c7f7d1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+## [3.6.4] - 2022-08-31
+
 ### Changed
 
 - Update i18n resources
@@ -337,7 +339,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - for dependency upgrades
 -->
 
-[Unreleased]: https://github.com/hal/console/compare/v3.6.3...HEAD
+[Unreleased]: https://github.com/hal/console/compare/v3.6.4...HEAD
+[3.6.4]: https://github.com/hal/console/compare/v3.6.3...v3.6.4
 [3.6.3]: https://github.com/hal/console/compare/v3.6.2...v3.6.3
 [3.6.2]: https://github.com/hal/console/compare/v3.6.1...v3.6.2
 [3.6.1]: https://github.com/hal/console/compare/v3.6.0...v3.6.1
diff --git a/app/pom.xml b/app/pom.xml
index 71688d3f80..9c27894de3 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.jboss.hal</groupId>
         <artifactId>hal-gwt-parent</artifactId>
-        <version>3.6.4-SNAPSHOT</version>
+        <version>3.6.4.Final</version>
         <relativePath>../gwt-parent/pom.xml</relativePath>
     </parent>
 
diff --git a/app/src/main/module-i18n.gwt.xml b/app/src/main/module-i18n.gwt.xml
index a30a238762..6bc79c46e3 100644
--- a/app/src/main/module-i18n.gwt.xml
+++ b/app/src/main/module-i18n.gwt.xml
@@ -35,7 +35,7 @@
                                    value="org.jboss.hal.client.gin.CompositeModule"/>
 
     <define-configuration-property name="hal.version" is-multi-valued="false"/>
-    <set-configuration-property name="hal.version" value="3.6.4-SNAPSHOT"/>
+    <set-configuration-property name="hal.version" value="3.6.4.Final"/>
 
     <set-configuration-property name="CssResource.enableGss" value="true"/>
 
diff --git a/app/src/main/module.gwt.xml b/app/src/main/module.gwt.xml
index c090aa5773..6dd3f39607 100644
--- a/app/src/main/module.gwt.xml
+++ b/app/src/main/module.gwt.xml
@@ -35,7 +35,7 @@
                                    value="org.jboss.hal.client.gin.CompositeModule"/>
 
     <define-configuration-property name="hal.version" is-multi-valued="false"/>
-    <set-configuration-property name="hal.version" value="3.6.4-SNAPSHOT"/>
+    <set-configuration-property name="hal.version" value="3.6.4.Final"/>
 
     <set-configuration-property name="CssResource.enableGss" value="true"/>
 
diff --git a/ballroom/pom.xml b/ballroom/pom.xml
index 251e266e78..f711810563 100644
--- a/ballroom/pom.xml
+++ b/ballroom/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.jboss.hal</groupId>
         <artifactId>hal-gwt-parent</artifactId>
-        <version>3.6.4-SNAPSHOT</version>
+        <version>3.6.4.Final</version>
         <relativePath>../gwt-parent/pom.xml</relativePath>
     </parent>
 
diff --git a/bom/pom.xml b/bom/pom.xml
index a81e8afb47..49ffd4ff76 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.jboss.hal</groupId>
         <artifactId>hal-parent</artifactId>
-        <version>3.6.4-SNAPSHOT</version>
+        <version>3.6.4.Final</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/build-config/pom.xml b/build-config/pom.xml
index b12304d791..b0d4010e2d 100644
--- a/build-config/pom.xml
+++ b/build-config/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.jboss.hal</groupId>
         <artifactId>hal-parent</artifactId>
-        <version>3.6.4-SNAPSHOT</version>
+        <version>3.6.4.Final</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/code-parent/pom.xml b/code-parent/pom.xml
index 642971fbff..162a82e67b 100644
--- a/code-parent/pom.xml
+++ b/code-parent/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.jboss.hal</groupId>
         <artifactId>hal-parent</artifactId>
-        <version>3.6.4-SNAPSHOT</version>
+        <version>3.6.4.Final</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/config/pom.xml b/config/pom.xml
index 27ce62e41c..a18d8bc7fd 100644
--- a/config/pom.xml
+++ b/config/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.jboss.hal</groupId>
         <artifactId>hal-gwt-parent</artifactId>
-        <version>3.6.4-SNAPSHOT</version>
+        <version>3.6.4.Final</version>
         <relativePath>../gwt-parent/pom.xml</relativePath>
     </parent>
 
diff --git a/core/pom.xml b/core/pom.xml
index 56b400ac71..b7a666cf88 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.jboss.hal</groupId>
         <artifactId>hal-gwt-parent</artifactId>
-        <version>3.6.4-SNAPSHOT</version>
+        <version>3.6.4.Final</version>
         <relativePath>../gwt-parent/pom.xml</relativePath>
     </parent>
 
diff --git a/db/pom.xml b/db/pom.xml
index 50138b02a9..8d56422bd1 100644
--- a/db/pom.xml
+++ b/db/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.jboss.hal</groupId>
         <artifactId>hal-gwt-parent</artifactId>
-        <version>3.6.4-SNAPSHOT</version>
+        <version>3.6.4.Final</version>
         <relativePath>../gwt-parent/pom.xml</relativePath>
     </parent>
 
diff --git a/dmr/pom.xml b/dmr/pom.xml
index 24433a1ac9..b8d6ac8ad6 100644
--- a/dmr/pom.xml
+++ b/dmr/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.jboss.hal</groupId>
         <artifactId>hal-gwt-parent</artifactId>
-        <version>3.6.4-SNAPSHOT</version>
+        <version>3.6.4.Final</version>
         <relativePath>../gwt-parent/pom.xml</relativePath>
     </parent>
 
diff --git a/flow/pom.xml b/flow/pom.xml
index a8f0f7bc0f..28c731f24b 100644
--- a/flow/pom.xml
+++ b/flow/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.jboss.hal</groupId>
         <artifactId>hal-gwt-parent</artifactId>
-        <version>3.6.4-SNAPSHOT</version>
+        <version>3.6.4.Final</version>
         <relativePath>../gwt-parent/pom.xml</relativePath>
     </parent>
 
diff --git a/gwt-parent/pom.xml b/gwt-parent/pom.xml
index 2ab45d6651..dc7d86de9f 100644
--- a/gwt-parent/pom.xml
+++ b/gwt-parent/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.jboss.hal</groupId>
         <artifactId>hal-code-parent</artifactId>
-        <version>3.6.4-SNAPSHOT</version>
+        <version>3.6.4.Final</version>
         <relativePath>../code-parent/pom.xml</relativePath>
     </parent>
 
diff --git a/js/pom.xml b/js/pom.xml
index 49dc71bc17..4322fec45c 100644
--- a/js/pom.xml
+++ b/js/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.jboss.hal</groupId>
         <artifactId>hal-gwt-parent</artifactId>
-        <version>3.6.4-SNAPSHOT</version>
+        <version>3.6.4.Final</version>
         <relativePath>../gwt-parent/pom.xml</relativePath>
     </parent>
 
diff --git a/meta/pom.xml b/meta/pom.xml
index 675cd74d3d..11c46a2809 100644
--- a/meta/pom.xml
+++ b/meta/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.jboss.hal</groupId>
         <artifactId>hal-gwt-parent</artifactId>
-        <version>3.6.4-SNAPSHOT</version>
+        <version>3.6.4.Final</version>
         <relativePath>../gwt-parent/pom.xml</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index 8beb13bde8..7846096c7d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
 
     <groupId>org.jboss.hal</groupId>
     <artifactId>hal-parent</artifactId>
-    <version>3.6.4-SNAPSHOT</version>
+    <version>3.6.4.Final</version>
     <packaging>pom</packaging>
     <name>HAL :: Parent</name>
     <description>WildFly / EAP management console</description>
diff --git a/processors/pom.xml b/processors/pom.xml
index 3a7617bc9e..662796f89f 100644
--- a/processors/pom.xml
+++ b/processors/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.jboss.hal</groupId>
         <artifactId>hal-code-parent</artifactId>
-        <version>3.6.4-SNAPSHOT</version>
+        <version>3.6.4.Final</version>
         <relativePath>../code-parent/pom.xml</relativePath>
     </parent>
 
diff --git a/resources/pom.xml b/resources/pom.xml
index 5b6931aab7..d0c16cc4fa 100644
--- a/resources/pom.xml
+++ b/resources/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.jboss.hal</groupId>
         <artifactId>hal-gwt-parent</artifactId>
-        <version>3.6.4-SNAPSHOT</version>
+        <version>3.6.4.Final</version>
         <relativePath>../gwt-parent/pom.xml</relativePath>
     </parent>
 
diff --git a/spi/pom.xml b/spi/pom.xml
index 6c8b1ded54..1e1ea2ce07 100644
--- a/spi/pom.xml
+++ b/spi/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.jboss.hal</groupId>
         <artifactId>hal-gwt-parent</artifactId>
-        <version>3.6.4-SNAPSHOT</version>
+        <version>3.6.4.Final</version>
         <relativePath>../gwt-parent/pom.xml</relativePath>
     </parent>
 
diff --git a/standalone/pom.xml b/standalone/pom.xml
index 66be81263c..e0eb358aac 100644
--- a/standalone/pom.xml
+++ b/standalone/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.jboss.hal</groupId>
         <artifactId>hal-code-parent</artifactId>
-        <version>3.6.4-SNAPSHOT</version>
+        <version>3.6.4.Final</version>
         <relativePath>../code-parent/pom.xml</relativePath>
     </parent>
 
diff --git a/testsuite/pom.xml b/testsuite/pom.xml
index 68834c0d24..0526b7b216 100644
--- a/testsuite/pom.xml
+++ b/testsuite/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.jboss.hal</groupId>
         <artifactId>hal-code-parent</artifactId>
-        <version>3.6.4-SNAPSHOT</version>
+        <version>3.6.4.Final</version>
         <relativePath>../code-parent/pom.xml</relativePath>
     </parent>
 
diff --git a/themes/eap/pom.xml b/themes/eap/pom.xml
index b3dbbcde79..35704f1b3a 100644
--- a/themes/eap/pom.xml
+++ b/themes/eap/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.jboss.hal</groupId>
         <artifactId>hal-theme-parent</artifactId>
-        <version>3.6.4-SNAPSHOT</version>
+        <version>3.6.4.Final</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/themes/hal/pom.xml b/themes/hal/pom.xml
index 4225da63dc..4fd44b1223 100644
--- a/themes/hal/pom.xml
+++ b/themes/hal/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.jboss.hal</groupId>
         <artifactId>hal-theme-parent</artifactId>
-        <version>3.6.4-SNAPSHOT</version>
+        <version>3.6.4.Final</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/themes/pom.xml b/themes/pom.xml
index 031671e744..6b5577f719 100644
--- a/themes/pom.xml
+++ b/themes/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.jboss.hal</groupId>
         <artifactId>hal-gwt-parent</artifactId>
-        <version>3.6.4-SNAPSHOT</version>
+        <version>3.6.4.Final</version>
         <relativePath>../gwt-parent/pom.xml</relativePath>
     </parent>
 
diff --git a/themes/wildfly/pom.xml b/themes/wildfly/pom.xml
index bd86755d96..c23ee8e71b 100644
--- a/themes/wildfly/pom.xml
+++ b/themes/wildfly/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.jboss.hal</groupId>
         <artifactId>hal-theme-parent</artifactId>
-        <version>3.6.4-SNAPSHOT</version>
+        <version>3.6.4.Final</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/version.txt b/version.txt
index 5261c33775..5766994f30 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-3.6.4-SNAPSHOT
+3.6.4.Final