diff --git a/bootable-jar/boot/pom.xml b/bootable-jar/boot/pom.xml
index d8e7a3ade73..13b1870312a 100644
--- a/bootable-jar/boot/pom.xml
+++ b/bootable-jar/boot/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-jar-parent</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
     </parent>
 
     <artifactId>wildfly-jar-boot</artifactId>
diff --git a/bootable-jar/pom.xml b/bootable-jar/pom.xml
index bff39fb8d02..07bc199f099 100644
--- a/bootable-jar/pom.xml
+++ b/bootable-jar/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-parent</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
     </parent>
 
     <artifactId>wildfly-jar-parent</artifactId>
diff --git a/bootable-jar/runtime/pom.xml b/bootable-jar/runtime/pom.xml
index eb541af3710..f06b807caed 100644
--- a/bootable-jar/runtime/pom.xml
+++ b/bootable-jar/runtime/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-jar-parent</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
     </parent>
 
     <artifactId>wildfly-jar-runtime</artifactId>
diff --git a/build/pom.xml b/build/pom.xml
index 2dcb17bf5d0..8fb06476155 100644
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -30,7 +30,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-parent</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
     </parent>
 
     <artifactId>wildfly-core-build</artifactId>
diff --git a/cli/pom.xml b/cli/pom.xml
index cb96d920a80..a75adf75951 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-parent</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
     </parent>
 
     <artifactId>wildfly-cli</artifactId>
diff --git a/component-matrix-builder/pom.xml b/component-matrix-builder/pom.xml
index a57b09a1da4..f32bba48469 100644
--- a/component-matrix-builder/pom.xml
+++ b/component-matrix-builder/pom.xml
@@ -26,7 +26,7 @@
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
     </parent>
 
     <groupId>org.wildfly.core</groupId>
diff --git a/controller-client/pom.xml b/controller-client/pom.xml
index 5b4c5de6b4d..13511a1f76a 100644
--- a/controller-client/pom.xml
+++ b/controller-client/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-parent</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
     </parent>
 
     <artifactId>wildfly-controller-client</artifactId>
diff --git a/controller/pom.xml b/controller/pom.xml
index 145f9b3b35f..ec339cc08b4 100644
--- a/controller/pom.xml
+++ b/controller/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-parent</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
     </parent>
 
     <artifactId>wildfly-controller</artifactId>
diff --git a/core-feature-pack/common/pom.xml b/core-feature-pack/common/pom.xml
index 6fd1df32259..d2bb791cb9a 100644
--- a/core-feature-pack/common/pom.xml
+++ b/core-feature-pack/common/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-feature-pack-parent</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
     </parent>
 
     <artifactId>wildfly-core-feature-pack-common</artifactId>
diff --git a/core-feature-pack/ee-10-api/pom.xml b/core-feature-pack/ee-10-api/pom.xml
index 4099071349e..07e7c9e55e5 100644
--- a/core-feature-pack/ee-10-api/pom.xml
+++ b/core-feature-pack/ee-10-api/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-feature-pack-parent</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
     </parent>
 
     <artifactId>wildfly-core-feature-pack-ee-10-api</artifactId>
diff --git a/core-feature-pack/galleon-common/pom.xml b/core-feature-pack/galleon-common/pom.xml
index fc7d168f6c8..516fdb69d9f 100644
--- a/core-feature-pack/galleon-common/pom.xml
+++ b/core-feature-pack/galleon-common/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-feature-pack-parent</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
     </parent>
 
     <artifactId>wildfly-core-feature-pack-galleon-common</artifactId>
diff --git a/core-feature-pack/galleon-feature-pack/pom.xml b/core-feature-pack/galleon-feature-pack/pom.xml
index c8f7485e99f..b8f3c78cffa 100644
--- a/core-feature-pack/galleon-feature-pack/pom.xml
+++ b/core-feature-pack/galleon-feature-pack/pom.xml
@@ -30,7 +30,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-feature-pack-parent</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
     </parent>
 
     <artifactId>wildfly-core-galleon-pack</artifactId>
diff --git a/core-feature-pack/pom.xml b/core-feature-pack/pom.xml
index 3828d1f7c9c..35a2d39e949 100644
--- a/core-feature-pack/pom.xml
+++ b/core-feature-pack/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-parent</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
     </parent>
 
     <artifactId>wildfly-core-feature-pack-parent</artifactId>
diff --git a/core-management/core-management-client/pom.xml b/core-management/core-management-client/pom.xml
index 0cb5e0db759..c7c5fa5a42d 100644
--- a/core-management/core-management-client/pom.xml
+++ b/core-management/core-management-client/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-management</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
     </parent>
 
     <artifactId>wildfly-core-management-client</artifactId>
diff --git a/core-management/core-management-subsystem/pom.xml b/core-management/core-management-subsystem/pom.xml
index bc69984aa2a..6af9523a1a3 100644
--- a/core-management/core-management-subsystem/pom.xml
+++ b/core-management/core-management-subsystem/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-management</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
     </parent>
 
     <artifactId>wildfly-core-management-subsystem</artifactId>
diff --git a/core-management/pom.xml b/core-management/pom.xml
index c03f15c640f..82874d19ce5 100644
--- a/core-management/pom.xml
+++ b/core-management/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-parent</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
     </parent>
 
     <artifactId>wildfly-core-management</artifactId>
diff --git a/core-model-test/framework/pom.xml b/core-model-test/framework/pom.xml
index 478daf366f1..b5dbcc92d22 100644
--- a/core-model-test/framework/pom.xml
+++ b/core-model-test/framework/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-model-test</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
     </parent>
 
     <artifactId>wildfly-core-model-test-framework</artifactId>
diff --git a/core-model-test/pom.xml b/core-model-test/pom.xml
index 93caf52d131..eea33f68ad5 100644
--- a/core-model-test/pom.xml
+++ b/core-model-test/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-parent</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
     </parent>
 
     <artifactId>wildfly-core-model-test</artifactId>
diff --git a/core-model-test/test-controller-optional/pom.xml b/core-model-test/test-controller-optional/pom.xml
index 31b89138e37..1d00e394473 100644
--- a/core-model-test/test-controller-optional/pom.xml
+++ b/core-model-test/test-controller-optional/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-model-test</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
     </parent>
     <!--
       Just here for the tests module to include as an optional dependency to avoid picking up
diff --git a/core-model-test/tests/pom.xml b/core-model-test/tests/pom.xml
index 7252419987b..85c209c8028 100644
--- a/core-model-test/tests/pom.xml
+++ b/core-model-test/tests/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-model-test</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
     </parent>
 
     <artifactId>wildfly-core-model-test-tests</artifactId>
diff --git a/core-security/pom.xml b/core-security/pom.xml
index 49a4eec2e34..238ac9c037e 100644
--- a/core-security/pom.xml
+++ b/core-security/pom.xml
@@ -31,7 +31,7 @@
     <parent>
        <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-parent</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/deployment-repository/pom.xml b/deployment-repository/pom.xml
index 69e8c393c82..bd28947e040 100644
--- a/deployment-repository/pom.xml
+++ b/deployment-repository/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-parent</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
     </parent>
 
     <artifactId>wildfly-deployment-repository</artifactId>
diff --git a/deployment-scanner/pom.xml b/deployment-scanner/pom.xml
index b0fa4886b8f..35b5c87ddb4 100644
--- a/deployment-scanner/pom.xml
+++ b/deployment-scanner/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-parent</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
     </parent>
 
     <artifactId>wildfly-deployment-scanner</artifactId>
diff --git a/discovery/pom.xml b/discovery/pom.xml
index 6ca874d995c..f993f2d050e 100644
--- a/discovery/pom.xml
+++ b/discovery/pom.xml
@@ -30,7 +30,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-parent</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
     </parent>
 
     <artifactId>wildfly-discovery</artifactId>
diff --git a/dist/pom.xml b/dist/pom.xml
index 2f6217d8204..f4c2c98b017 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -30,7 +30,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-parent</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
     </parent>
 
     <artifactId>wildfly-core-dist</artifactId>
diff --git a/domain-http/error-context/pom.xml b/domain-http/error-context/pom.xml
index 50892312da5..3fef3d0e772 100644
--- a/domain-http/error-context/pom.xml
+++ b/domain-http/error-context/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-domain-http</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
     </parent>
 
     <artifactId>wildfly-domain-http-error-context</artifactId>
diff --git a/domain-http/interface/pom.xml b/domain-http/interface/pom.xml
index d598a5c7460..e355f5d612b 100644
--- a/domain-http/interface/pom.xml
+++ b/domain-http/interface/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-domain-http</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
     </parent>
 
     <artifactId>wildfly-domain-http-interface</artifactId>
diff --git a/domain-http/pom.xml b/domain-http/pom.xml
index 115c850ca36..341ea9d0055 100644
--- a/domain-http/pom.xml
+++ b/domain-http/pom.xml
@@ -30,7 +30,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-parent</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
     </parent>
 
     <artifactId>wildfly-domain-http</artifactId>
diff --git a/domain-management/pom.xml b/domain-management/pom.xml
index 51e56836a88..efa21498253 100644
--- a/domain-management/pom.xml
+++ b/domain-management/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-parent</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
     </parent>
 
     <artifactId>wildfly-domain-management</artifactId>
diff --git a/elytron-tool-wrapper/pom.xml b/elytron-tool-wrapper/pom.xml
index 5b36e841e5b..b8f98df8c8d 100644
--- a/elytron-tool-wrapper/pom.xml
+++ b/elytron-tool-wrapper/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-parent</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
     </parent>
 
     <artifactId>wildfly-elytron-tool-wrapper</artifactId>
diff --git a/elytron/pom.xml b/elytron/pom.xml
index 09bd24a6259..b5996374d00 100644
--- a/elytron/pom.xml
+++ b/elytron/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-parent</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
     </parent>
 
     <artifactId>wildfly-elytron-integration</artifactId>
diff --git a/embedded/pom.xml b/embedded/pom.xml
index ab2c0bfa7a4..c2ce30ae60a 100644
--- a/embedded/pom.xml
+++ b/embedded/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-parent</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
     </parent>
 
     <artifactId>wildfly-embedded</artifactId>
diff --git a/event-logger/pom.xml b/event-logger/pom.xml
index 8a4f9c880a2..1ccd0d27a11 100644
--- a/event-logger/pom.xml
+++ b/event-logger/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>wildfly-core-parent</artifactId>
         <groupId>org.wildfly.core</groupId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/host-controller/pom.xml b/host-controller/pom.xml
index ff55365e2e2..53ec2012ab0 100644
--- a/host-controller/pom.xml
+++ b/host-controller/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-parent</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
     </parent>
 
     <artifactId>wildfly-host-controller</artifactId>
diff --git a/installation-manager/pom.xml b/installation-manager/pom.xml
index 6bc24e0b2e8..93124cfbea1 100644
--- a/installation-manager/pom.xml
+++ b/installation-manager/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>wildfly-core-parent</artifactId>
         <groupId>org.wildfly.core</groupId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
     </parent>
 
     <artifactId>wildfly-installation-manager</artifactId>
diff --git a/io/pom.xml b/io/pom.xml
index 6f9bd9d82e7..fec3e2635af 100644
--- a/io/pom.xml
+++ b/io/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <artifactId>wildfly-core-parent</artifactId>
         <groupId>org.wildfly.core</groupId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/io/subsystem/pom.xml b/io/subsystem/pom.xml
index d00ab3007a9..cfe46dfea5d 100644
--- a/io/subsystem/pom.xml
+++ b/io/subsystem/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <artifactId>wildfly-io-bom</artifactId>
         <groupId>org.wildfly.core</groupId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/io/tests/pom.xml b/io/tests/pom.xml
index d21682ef417..278c47de2a1 100644
--- a/io/tests/pom.xml
+++ b/io/tests/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <artifactId>wildfly-io-bom</artifactId>
         <groupId>org.wildfly.core</groupId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/jmx/pom.xml b/jmx/pom.xml
index 97411d4e9ba..5118aa0e026 100644
--- a/jmx/pom.xml
+++ b/jmx/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-parent</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
     </parent>
 
     <artifactId>wildfly-jmx</artifactId>
diff --git a/launcher/pom.xml b/launcher/pom.xml
index c199d76bad8..f7ff141d939 100644
--- a/launcher/pom.xml
+++ b/launcher/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-parent</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
     </parent>
 
     <artifactId>wildfly-launcher</artifactId>
diff --git a/logging/pom.xml b/logging/pom.xml
index a9946602777..6fb1de1cac9 100644
--- a/logging/pom.xml
+++ b/logging/pom.xml
@@ -30,7 +30,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-parent</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
     </parent>
 
     <artifactId>wildfly-logging</artifactId>
diff --git a/management-client-content/pom.xml b/management-client-content/pom.xml
index bb5567badb8..9844eda8207 100644
--- a/management-client-content/pom.xml
+++ b/management-client-content/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-parent</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
     </parent>
 
     <artifactId>wildfly-management-client-content</artifactId>
diff --git a/model-test/pom.xml b/model-test/pom.xml
index ef99c58ae0d..40cccd8b139 100644
--- a/model-test/pom.xml
+++ b/model-test/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-parent</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
     </parent>
 
     <artifactId>wildfly-model-test</artifactId>
diff --git a/network/pom.xml b/network/pom.xml
index d4c3e0d2896..d4419d583e0 100644
--- a/network/pom.xml
+++ b/network/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-parent</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
     </parent>
 
     <artifactId>wildfly-network</artifactId>
diff --git a/patching/pom.xml b/patching/pom.xml
index d3f5874f434..b2e96847b7b 100644
--- a/patching/pom.xml
+++ b/patching/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-parent</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
     </parent>
 
     <artifactId>wildfly-patching</artifactId>
diff --git a/platform-mbean/pom.xml b/platform-mbean/pom.xml
index d3864f1cf79..1fd4867c25b 100644
--- a/platform-mbean/pom.xml
+++ b/platform-mbean/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-parent</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
     </parent>
 
     <artifactId>wildfly-platform-mbean</artifactId>
diff --git a/pom.xml b/pom.xml
index c6a3b4775fb..386f5f1076a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
 
     <groupId>org.wildfly.core</groupId>
     <artifactId>wildfly-core-parent</artifactId>
-    <version>21.1.1.Final-SNAPSHOT</version>
+    <version>21.1.1.Final</version>
 
     <packaging>pom</packaging>
 
diff --git a/process-controller/pom.xml b/process-controller/pom.xml
index cd52c09ee43..370243e290b 100644
--- a/process-controller/pom.xml
+++ b/process-controller/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-parent</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
     </parent>
 
     <artifactId>wildfly-process-controller</artifactId>
diff --git a/protocol/pom.xml b/protocol/pom.xml
index 65b86fcf733..654281fc887 100644
--- a/protocol/pom.xml
+++ b/protocol/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-parent</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
     </parent>
 
     <artifactId>wildfly-protocol</artifactId>
diff --git a/remoting/pom.xml b/remoting/pom.xml
index 01dd70f4fe0..d774b8a0ef9 100644
--- a/remoting/pom.xml
+++ b/remoting/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-parent</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
     </parent>
 
     <artifactId>wildfly-remoting-parent</artifactId>
diff --git a/remoting/subsystem/pom.xml b/remoting/subsystem/pom.xml
index 7e466ca994e..06001cad6d6 100644
--- a/remoting/subsystem/pom.xml
+++ b/remoting/subsystem/pom.xml
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-remoting-parent</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/remoting/tests/pom.xml b/remoting/tests/pom.xml
index c614c333269..64a7b4a8e01 100644
--- a/remoting/tests/pom.xml
+++ b/remoting/tests/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-remoting-parent</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/request-controller/pom.xml b/request-controller/pom.xml
index d9c73304263..6fb58e254e9 100644
--- a/request-controller/pom.xml
+++ b/request-controller/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-parent</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
     </parent>
 
     <artifactId>wildfly-request-controller</artifactId>
diff --git a/security-manager/pom.xml b/security-manager/pom.xml
index 2eb45468a83..ddcce6d753b 100644
--- a/security-manager/pom.xml
+++ b/security-manager/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-parent</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
     </parent>
 
     <artifactId>wildfly-security-manager</artifactId>
diff --git a/server/pom.xml b/server/pom.xml
index c68a8845fc3..1dceea86801 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-parent</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
     </parent>
 
     <artifactId>wildfly-server</artifactId>
diff --git a/subsystem-test/framework/pom.xml b/subsystem-test/framework/pom.xml
index 7ad1b861d41..5bb875f683e 100644
--- a/subsystem-test/framework/pom.xml
+++ b/subsystem-test/framework/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-subsystem-test-parent</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
     </parent>
 
     <artifactId>wildfly-subsystem-test-framework</artifactId>
diff --git a/subsystem-test/pom.xml b/subsystem-test/pom.xml
index cb655db4e4c..b373616d9ab 100644
--- a/subsystem-test/pom.xml
+++ b/subsystem-test/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-parent</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/subsystem-test/test-controller-optional/pom.xml b/subsystem-test/test-controller-optional/pom.xml
index 3f7e5fc63b7..6ddd56158a0 100644
--- a/subsystem-test/test-controller-optional/pom.xml
+++ b/subsystem-test/test-controller-optional/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-subsystem-test-parent</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
     </parent>
     <!--
       Just here for the tests module to include as an optional dependency to avoid picking up
diff --git a/subsystem-test/tests/pom.xml b/subsystem-test/tests/pom.xml
index 9eeacabbfea..147ff2316bb 100644
--- a/subsystem-test/tests/pom.xml
+++ b/subsystem-test/tests/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-subsystem-test-parent</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
     </parent>
 
     <artifactId>wildfly-subsystem-test-tests</artifactId>
diff --git a/testbom/pom.xml b/testbom/pom.xml
index 0f8402c9292..e49af4aec90 100644
--- a/testbom/pom.xml
+++ b/testbom/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-parent</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
     </parent>
 
     <artifactId>wildfly-core-testbom</artifactId>
diff --git a/testsuite/client-old-server/pom.xml b/testsuite/client-old-server/pom.xml
index 82c21d2affb..7e1a2d1c783 100644
--- a/testsuite/client-old-server/pom.xml
+++ b/testsuite/client-old-server/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-testsuite</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/testsuite/domain/pom.xml b/testsuite/domain/pom.xml
index a0471dc5936..fdbb4d0482d 100644
--- a/testsuite/domain/pom.xml
+++ b/testsuite/domain/pom.xml
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-testsuite</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/testsuite/elytron/pom.xml b/testsuite/elytron/pom.xml
index 47ebd2f71de..de5b83cad5a 100644
--- a/testsuite/elytron/pom.xml
+++ b/testsuite/elytron/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-testsuite</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/testsuite/embedded/pom.xml b/testsuite/embedded/pom.xml
index ef6d294def3..c3a72d989bd 100644
--- a/testsuite/embedded/pom.xml
+++ b/testsuite/embedded/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>wildfly-core-testsuite</artifactId>
         <groupId>org.wildfly.core</groupId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/testsuite/layers/pom.xml b/testsuite/layers/pom.xml
index 9a3c15cfe10..41801e7d851 100644
--- a/testsuite/layers/pom.xml
+++ b/testsuite/layers/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-testsuite</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/testsuite/manualmode/pom.xml b/testsuite/manualmode/pom.xml
index 4851cdd6b71..c7ccf897b0e 100644
--- a/testsuite/manualmode/pom.xml
+++ b/testsuite/manualmode/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-testsuite</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/testsuite/pom.xml b/testsuite/pom.xml
index f8773b0784e..2574dca6446 100644
--- a/testsuite/pom.xml
+++ b/testsuite/pom.xml
@@ -57,7 +57,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-parent</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
     </parent>
 
     <artifactId>wildfly-core-testsuite</artifactId>
diff --git a/testsuite/rbac/pom.xml b/testsuite/rbac/pom.xml
index dba76dc2530..9441470f874 100644
--- a/testsuite/rbac/pom.xml
+++ b/testsuite/rbac/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-testsuite</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/testsuite/scripts/pom.xml b/testsuite/scripts/pom.xml
index 41bf0b9c97b..35a48335dab 100644
--- a/testsuite/scripts/pom.xml
+++ b/testsuite/scripts/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>wildfly-core-testsuite</artifactId>
         <groupId>org.wildfly.core</groupId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/testsuite/shared/pom.xml b/testsuite/shared/pom.xml
index f673973b8d2..86b49d2538f 100644
--- a/testsuite/shared/pom.xml
+++ b/testsuite/shared/pom.xml
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-parent</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/testsuite/standalone/pom.xml b/testsuite/standalone/pom.xml
index a3a208524bd..999d155dfb4 100644
--- a/testsuite/standalone/pom.xml
+++ b/testsuite/standalone/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-testsuite</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/testsuite/test-runner/pom.xml b/testsuite/test-runner/pom.xml
index b12c9f7ea60..3fd9010e1e1 100644
--- a/testsuite/test-runner/pom.xml
+++ b/testsuite/test-runner/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-parent</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/threads/pom.xml b/threads/pom.xml
index 2e9b5b20645..358f8398c73 100644
--- a/threads/pom.xml
+++ b/threads/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-parent</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
     </parent>
 
     <artifactId>wildfly-threads</artifactId>
diff --git a/version/pom.xml b/version/pom.xml
index b8e845711b9..a41088890a9 100644
--- a/version/pom.xml
+++ b/version/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-parent</artifactId>
-        <version>21.1.1.Final-SNAPSHOT</version>
+        <version>21.1.1.Final</version>
     </parent>
 
     <artifactId>wildfly-version</artifactId>