diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7918cc9e3..318ceda12 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+## [3.6.21] - 2024-12-18
+
 ## [3.6.20] - 2024-11-15
 
 ## [3.6.19] - 2024-05-24
@@ -584,7 +586,8 @@ Release process failed. Do not use this release!
 - for dependency upgrades
 -->
 
-[Unreleased]: https://github.com/hal/console/compare/v3.6.20...HEAD
+[Unreleased]: https://github.com/hal/console/compare/v3.6.21...HEAD
+[3.6.21]: https://github.com/hal/console/compare/v3.6.20...v3.6.21
 [3.6.20]: https://github.com/hal/console/compare/v3.6.19...v3.6.20
 [3.6.19]: https://github.com/hal/console/compare/v3.6.18...v3.6.19
 [3.6.18]: https://github.com/hal/console/compare/v3.6.17...v3.6.18
diff --git a/app/pom.xml b/app/pom.xml
index e03f33a33..2a664972b 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.21-SNAPSHOT</version>
+        <version>3.6.21.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 1bbacfde8..1121166a1 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.21-SNAPSHOT"/>
+    <set-configuration-property name="hal.version" value="3.6.21.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 16bf4176e..50d3b3dbd 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.21-SNAPSHOT"/>
+    <set-configuration-property name="hal.version" value="3.6.21.Final"/>
 
     <set-configuration-property name="CssResource.enableGss" value="true"/>
 
diff --git a/ballroom/pom.xml b/ballroom/pom.xml
index d67576d72..4679d795e 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.21-SNAPSHOT</version>
+        <version>3.6.21.Final</version>
         <relativePath>../gwt-parent/pom.xml</relativePath>
     </parent>
 
diff --git a/bom/pom.xml b/bom/pom.xml
index f3c1a32fa..22013517c 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.21-SNAPSHOT</version>
+        <version>3.6.21.Final</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/build-config/pom.xml b/build-config/pom.xml
index ff1e8b6c3..6fe67004b 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.21-SNAPSHOT</version>
+        <version>3.6.21.Final</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/code-parent/pom.xml b/code-parent/pom.xml
index a23094695..9fea1b187 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.21-SNAPSHOT</version>
+        <version>3.6.21.Final</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/config/pom.xml b/config/pom.xml
index 060eecdc9..334d3966f 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.21-SNAPSHOT</version>
+        <version>3.6.21.Final</version>
         <relativePath>../gwt-parent/pom.xml</relativePath>
     </parent>
 
diff --git a/core/pom.xml b/core/pom.xml
index e022717bd..f442e92e8 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.21-SNAPSHOT</version>
+        <version>3.6.21.Final</version>
         <relativePath>../gwt-parent/pom.xml</relativePath>
     </parent>
 
diff --git a/db/pom.xml b/db/pom.xml
index 9898f23c1..faeb127a5 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.21-SNAPSHOT</version>
+        <version>3.6.21.Final</version>
         <relativePath>../gwt-parent/pom.xml</relativePath>
     </parent>
 
diff --git a/dmr/pom.xml b/dmr/pom.xml
index 6f3062260..f3028f2e4 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.21-SNAPSHOT</version>
+        <version>3.6.21.Final</version>
         <relativePath>../gwt-parent/pom.xml</relativePath>
     </parent>
 
diff --git a/flow/pom.xml b/flow/pom.xml
index 25383aff4..21355d431 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.21-SNAPSHOT</version>
+        <version>3.6.21.Final</version>
         <relativePath>../gwt-parent/pom.xml</relativePath>
     </parent>
 
diff --git a/gwt-parent/pom.xml b/gwt-parent/pom.xml
index 3b64ba35a..2f6ac0f05 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.21-SNAPSHOT</version>
+        <version>3.6.21.Final</version>
         <relativePath>../code-parent/pom.xml</relativePath>
     </parent>
 
diff --git a/js/pom.xml b/js/pom.xml
index 40009c7f6..f9895b046 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.21-SNAPSHOT</version>
+        <version>3.6.21.Final</version>
         <relativePath>../gwt-parent/pom.xml</relativePath>
     </parent>
 
diff --git a/meta/pom.xml b/meta/pom.xml
index a79d24459..d77b54094 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.21-SNAPSHOT</version>
+        <version>3.6.21.Final</version>
         <relativePath>../gwt-parent/pom.xml</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index db8a2a440..f7f10dcab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
 
     <groupId>org.jboss.hal</groupId>
     <artifactId>hal-parent</artifactId>
-    <version>3.6.21-SNAPSHOT</version>
+    <version>3.6.21.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 e9b9f6a64..0d29d546f 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.21-SNAPSHOT</version>
+        <version>3.6.21.Final</version>
         <relativePath>../code-parent/pom.xml</relativePath>
     </parent>
 
diff --git a/resources/pom.xml b/resources/pom.xml
index 0b8fb37b6..b67b49ef5 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.21-SNAPSHOT</version>
+        <version>3.6.21.Final</version>
         <relativePath>../gwt-parent/pom.xml</relativePath>
     </parent>
 
diff --git a/spi/pom.xml b/spi/pom.xml
index f01414601..79860c9fa 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.21-SNAPSHOT</version>
+        <version>3.6.21.Final</version>
         <relativePath>../gwt-parent/pom.xml</relativePath>
     </parent>
 
diff --git a/standalone/pom.xml b/standalone/pom.xml
index 7948e3214..549ecf857 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.21-SNAPSHOT</version>
+        <version>3.6.21.Final</version>
         <relativePath>../code-parent/pom.xml</relativePath>
     </parent>
 
diff --git a/testsuite/pom.xml b/testsuite/pom.xml
index 554549471..74271d9d0 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.21-SNAPSHOT</version>
+        <version>3.6.21.Final</version>
         <relativePath>../code-parent/pom.xml</relativePath>
     </parent>
 
diff --git a/themes/eap/pom.xml b/themes/eap/pom.xml
index fe01f8328..b31ef4058 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.21-SNAPSHOT</version>
+        <version>3.6.21.Final</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/themes/hal/pom.xml b/themes/hal/pom.xml
index 841c0db19..6ac2ff9ae 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.21-SNAPSHOT</version>
+        <version>3.6.21.Final</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/themes/pom.xml b/themes/pom.xml
index 0cd11bd0c..d759d58fa 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.21-SNAPSHOT</version>
+        <version>3.6.21.Final</version>
         <relativePath>../gwt-parent/pom.xml</relativePath>
     </parent>
 
diff --git a/themes/wildfly/pom.xml b/themes/wildfly/pom.xml
index 5749caf72..7a7dd3a7e 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.21-SNAPSHOT</version>
+        <version>3.6.21.Final</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/version.txt b/version.txt
index 7ef860e15..47e297b3b 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-3.6.21-SNAPSHOT
+3.6.21.Final