diff --git a/docker/pom.xml b/docker/pom.xml
index d37d0a4a7e..170e968a01 100644
--- a/docker/pom.xml
+++ b/docker/pom.xml
@@ -2,12 +2,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>docker</artifactId>
-    <version>5.9.21-SNAPSHOT</version>
+    <version>5.9.21</version>
     <packaging>docker</packaging>
     <parent>
         <groupId>org.tailormap</groupId>
         <artifactId>tailormap</artifactId>
-        <version>5.9.21-SNAPSHOT</version>
+        <version>5.9.21</version>
     </parent>
     <name>Tailormap Dockerfile</name>
     <description>Create a docker image of Tailormap</description>
diff --git a/form/pom.xml b/form/pom.xml
index 8eed211aff..8959818b8e 100644
--- a/form/pom.xml
+++ b/form/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.tailormap</groupId>
         <artifactId>tailormap</artifactId>
-        <version>5.9.21-SNAPSHOT</version>
+        <version>5.9.21</version>
     </parent>
     <dependencies>
         <dependency>
diff --git a/geotools-commons/pom.xml b/geotools-commons/pom.xml
index e6ee2a98bf..26593b191e 100755
--- a/geotools-commons/pom.xml
+++ b/geotools-commons/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.tailormap</groupId>
         <artifactId>tailormap</artifactId>
-        <version>5.9.21-SNAPSHOT</version>
+        <version>5.9.21</version>
     </parent>
     <name>geotools-commons</name>
 
diff --git a/pom.xml b/pom.xml
index 029f0e8d67..e804e7b440 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.tailormap</groupId>
     <artifactId>tailormap</artifactId>
-    <version>5.9.21-SNAPSHOT</version>
+    <version>5.9.21</version>
     <packaging>pom</packaging>
     <name>tailormap</name>
     <url>https://github.com/b3partners/tailormap</url>
@@ -11,7 +11,7 @@
         <connection>scm:git:git@github.com:b3partners/tailormap.git</connection>
         <developerConnection>scm:git:git@github.com:b3partners/tailormap.git</developerConnection>
         <url>https://github.com/b3partners/tailormap.git</url>
-        <tag>HEAD</tag>
+        <tag>v5.9.21</tag>
     </scm>
     <ciManagement>
         <system>Jenkins</system>
diff --git a/solr-commons/pom.xml b/solr-commons/pom.xml
index 31368951f2..e1def912c6 100644
--- a/solr-commons/pom.xml
+++ b/solr-commons/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.tailormap</groupId>
         <artifactId>tailormap</artifactId>
-        <version>5.9.21-SNAPSHOT</version>
+        <version>5.9.21</version>
     </parent>
     <name>solr-commons</name>
     <dependencies>
diff --git a/tomcat-lib/pom.xml b/tomcat-lib/pom.xml
index 4c02036da6..df14d0b2f7 100644
--- a/tomcat-lib/pom.xml
+++ b/tomcat-lib/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.tailormap</groupId>
         <artifactId>tailormap</artifactId>
-        <version>5.9.21-SNAPSHOT</version>
+        <version>5.9.21</version>
     </parent>
     <name>Tomcat libs distributie</name>
     <description>A zipfile w/ drivers to be placed in the Tomcat lib directory</description>
diff --git a/viewer-admin/pom.xml b/viewer-admin/pom.xml
index 012ad6e87c..8649a423b6 100755
--- a/viewer-admin/pom.xml
+++ b/viewer-admin/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.tailormap</groupId>
         <artifactId>tailormap</artifactId>
-        <version>5.9.21-SNAPSHOT</version>
+        <version>5.9.21</version>
     </parent>
     <name>viewer-admin</name>
     <properties>
diff --git a/viewer-audit-noplogger/pom.xml b/viewer-audit-noplogger/pom.xml
index 5c127442e2..ff6796ced3 100644
--- a/viewer-audit-noplogger/pom.xml
+++ b/viewer-audit-noplogger/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.tailormap</groupId>
         <artifactId>tailormap</artifactId>
-        <version>5.9.21-SNAPSHOT</version>
+        <version>5.9.21</version>
     </parent>
     <name>viewer auditing NOP logger module</name>
     <description>This module primarily serves the testcase of having multiple LoggingService proviers on the classpath
diff --git a/viewer-audit/pom.xml b/viewer-audit/pom.xml
index dd44d004ae..36f006a4f7 100644
--- a/viewer-audit/pom.xml
+++ b/viewer-audit/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.tailormap</groupId>
         <artifactId>tailormap</artifactId>
-        <version>5.9.21-SNAPSHOT</version>
+        <version>5.9.21</version>
     </parent>
     <name>viewer auditing module</name>
     <dependencies>
diff --git a/viewer-commons/pom.xml b/viewer-commons/pom.xml
index b6946ddbe5..4a79704012 100755
--- a/viewer-commons/pom.xml
+++ b/viewer-commons/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.tailormap</groupId>
         <artifactId>tailormap</artifactId>
-        <version>5.9.21-SNAPSHOT</version>
+        <version>5.9.21</version>
     </parent>
     <name>viewer-commons</name>
     <dependencies>
diff --git a/viewer-config-persistence/pom.xml b/viewer-config-persistence/pom.xml
index 2b2f23c7f7..278e42293d 100755
--- a/viewer-config-persistence/pom.xml
+++ b/viewer-config-persistence/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.tailormap</groupId>
         <artifactId>tailormap</artifactId>
-        <version>5.9.21-SNAPSHOT</version>
+        <version>5.9.21</version>
     </parent>
     <name>viewer-config-persistence</name>
     <licenses>
diff --git a/viewer-helpers/pom.xml b/viewer-helpers/pom.xml
index 3155d4a9de..ab4afcf9af 100755
--- a/viewer-helpers/pom.xml
+++ b/viewer-helpers/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.tailormap</groupId>
         <artifactId>tailormap</artifactId>
-        <version>5.9.21-SNAPSHOT</version>
+        <version>5.9.21</version>
     </parent>
     <name>viewer-helpers</name>
     <build>
diff --git a/viewer/pom.xml b/viewer/pom.xml
index 84dbdb8f14..f0bc06c5e3 100755
--- a/viewer/pom.xml
+++ b/viewer/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.tailormap</groupId>
         <artifactId>tailormap</artifactId>
-        <version>5.9.21-SNAPSHOT</version>
+        <version>5.9.21</version>
     </parent>
     <name>viewer</name>
     <properties>
diff --git a/web-commons/pom.xml b/web-commons/pom.xml
index 9f393ba535..ca570a7ace 100755
--- a/web-commons/pom.xml
+++ b/web-commons/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.tailormap</groupId>
         <artifactId>tailormap</artifactId>
-        <version>5.9.21-SNAPSHOT</version>
+        <version>5.9.21</version>
     </parent>
     <name>web-commons</name>
     <dependencies>