diff --git a/greenmail-core/pom.xml b/greenmail-core/pom.xml
index 04bec76ca2..a8eca814c0 100644
--- a/greenmail-core/pom.xml
+++ b/greenmail-core/pom.xml
@@ -8,12 +8,12 @@
 
   <artifactId>greenmail</artifactId>
   <packaging>jar</packaging>
-  <version>2.1.0-SNAPSHOT</version>
+  <version>2.1.0-alpha-4</version>
 
   <parent>
     <groupId>com.icegreen</groupId>
     <artifactId>greenmail-parent</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0-alpha-4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/greenmail-docker/standalone/pom.xml b/greenmail-docker/standalone/pom.xml
index 6e5d54abbe..14ece0187f 100644
--- a/greenmail-docker/standalone/pom.xml
+++ b/greenmail-docker/standalone/pom.xml
@@ -4,7 +4,7 @@
   <description>Docker image running GreenMail Standalone</description>
 
   <artifactId>greenmail-docker-standalone</artifactId>
-  <version>2.1.0-SNAPSHOT</version>
+  <version>2.1.0-alpha-4</version>
   <!-- Does not actually provide a JAR, but requires the JAR Maven lifecycle
        for unit test -->
   <packaging>jar</packaging>
@@ -16,7 +16,7 @@
   <parent>
     <groupId>com.icegreen</groupId>
     <artifactId>greenmail-parent</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0-alpha-4</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/greenmail-junit4/pom.xml b/greenmail-junit4/pom.xml
index 96607d0f68..a9297d6b8d 100644
--- a/greenmail-junit4/pom.xml
+++ b/greenmail-junit4/pom.xml
@@ -8,12 +8,12 @@
 
   <artifactId>greenmail-junit4</artifactId>
   <packaging>jar</packaging>
-  <version>2.1.0-SNAPSHOT</version>
+  <version>2.1.0-alpha-4</version>
 
   <parent>
     <groupId>com.icegreen</groupId>
     <artifactId>greenmail-parent</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0-alpha-4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/greenmail-junit5/pom.xml b/greenmail-junit5/pom.xml
index 7b77422ae9..80520bfaba 100644
--- a/greenmail-junit5/pom.xml
+++ b/greenmail-junit5/pom.xml
@@ -8,12 +8,12 @@
 
   <artifactId>greenmail-junit5</artifactId>
   <packaging>jar</packaging>
-  <version>2.1.0-SNAPSHOT</version>
+  <version>2.1.0-alpha-4</version>
 
   <parent>
     <groupId>com.icegreen</groupId>
     <artifactId>greenmail-parent</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0-alpha-4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/greenmail-spring/pom.xml b/greenmail-spring/pom.xml
index 171033b83f..b643bb3bd2 100644
--- a/greenmail-spring/pom.xml
+++ b/greenmail-spring/pom.xml
@@ -1,7 +1,7 @@
 <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 https://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>greenmail-spring</artifactId>
-  <version>2.1.0-SNAPSHOT</version>
+  <version>2.1.0-alpha-4</version>
   <packaging>jar</packaging>
   <name>== GreenMail Spring ==</name>
   <description>GreenMail support for Spring</description>
@@ -9,7 +9,7 @@
   <parent>
     <groupId>com.icegreen</groupId>
     <artifactId>greenmail-parent</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0-alpha-4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/greenmail-standalone/pom.xml b/greenmail-standalone/pom.xml
index f57d91974a..1ab86c95d7 100644
--- a/greenmail-standalone/pom.xml
+++ b/greenmail-standalone/pom.xml
@@ -1,7 +1,7 @@
 <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 https://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>greenmail-standalone</artifactId>
-  <version>2.1.0-SNAPSHOT</version>
+  <version>2.1.0-alpha-4</version>
   <packaging>jar</packaging>
   <name>== Greenmail Standalone ==</name>
   <description>Run GreenMail standalone</description>
@@ -9,7 +9,7 @@
   <parent>
     <groupId>com.icegreen</groupId>
     <artifactId>greenmail-parent</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0-alpha-4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/greenmail-webapp/pom.xml b/greenmail-webapp/pom.xml
index 2cfc3bc8c8..d990ae519e 100644
--- a/greenmail-webapp/pom.xml
+++ b/greenmail-webapp/pom.xml
@@ -1,7 +1,7 @@
 <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 https://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>greenmail-webapp</artifactId>
-  <version>2.1.0-SNAPSHOT</version>
+  <version>2.1.0-alpha-4</version>
   <packaging>war</packaging>
   <name>== Greenmail Webapp ==</name>
   <description>Embedded GreenMail Webapp</description>
@@ -9,7 +9,7 @@
   <parent>
     <groupId>com.icegreen</groupId>
     <artifactId>greenmail-parent</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0-alpha-4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/pom.xml b/pom.xml
index 72329b440b..873e669799 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
   <artifactId>greenmail-parent</artifactId>
   <packaging>pom</packaging>
   <!-- This version should get inherited to all subprojects. -->
-  <version>2.1.0-SNAPSHOT</version>
+  <version>2.1.0-alpha-4</version>
 
   <licenses>
     <license>
@@ -31,7 +31,7 @@
     <url>
       https://github.com/greenmail-mail-test/greenmail
     </url>
-    <tag>release-2.1.0-alpha-3</tag>
+    <tag>release-2.1.0-alpha-4</tag>
   </scm>
 
   <issueManagement>
@@ -371,32 +371,32 @@
       <dependency>
         <groupId>com.icegreen</groupId>
         <artifactId>greenmail</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0-alpha-4</version>
       </dependency>
       <dependency>
         <groupId>com.icegreen</groupId>
         <artifactId>greenmail-standalone</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0-alpha-4</version>
       </dependency>
       <dependency>
         <groupId>com.icegreen</groupId>
         <artifactId>greenmail-webapp</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0-alpha-4</version>
       </dependency>
       <dependency>
         <groupId>com.icegreen</groupId>
         <artifactId>greenmail-spring</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0-alpha-4</version>
       </dependency>
       <dependency>
         <groupId>com.icegreen</groupId>
         <artifactId>greenmail-junit4</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0-alpha-4</version>
       </dependency>
       <dependency>
         <groupId>com.icegreen</groupId>
         <artifactId>greenmail-junit5</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0-alpha-4</version>
       </dependency>
 
       <!-- Third party -->