diff --git a/adventure-editor/pom.xml b/adventure-editor/pom.xml
index 282cd9a63aa..542d52eb86c 100644
--- a/adventure-editor/pom.xml
+++ b/adventure-editor/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>forge</artifactId>
         <groupId>forge</groupId>
-        <version>2.0.04-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/forge-ai/pom.xml b/forge-ai/pom.xml
index 6e5457aa5b0..b51460f8ce7 100644
--- a/forge-ai/pom.xml
+++ b/forge-ai/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>forge</artifactId>
         <groupId>forge</groupId>
-        <version>2.0.04-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>forge-ai</artifactId>
diff --git a/forge-core/pom.xml b/forge-core/pom.xml
index fa3907f3c4d..24740c37a5c 100644
--- a/forge-core/pom.xml
+++ b/forge-core/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>forge</artifactId>
         <groupId>forge</groupId>
-        <version>2.0.04-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>forge-core</artifactId>
diff --git a/forge-game/pom.xml b/forge-game/pom.xml
index 72c5a0a9451..bfa81cdef44 100644
--- a/forge-game/pom.xml
+++ b/forge-game/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>forge</artifactId>
         <groupId>forge</groupId>
-        <version>2.0.04-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>forge-game</artifactId>
diff --git a/forge-gui-android/pom.xml b/forge-gui-android/pom.xml
index 21be0bed93e..ea16b164d85 100644
--- a/forge-gui-android/pom.xml
+++ b/forge-gui-android/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>forge</artifactId>
         <groupId>forge</groupId>
-        <version>2.0.04-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>forge-gui-android</artifactId>
@@ -66,7 +66,7 @@
                         <configuration>
                             <!-- generate versionName from revision property to snapshot-version property  -->
                             <name>snapshot-version</name>
-                            <value>2.0.03-SNAPSHOT</value>
+                            <value>${revision}</value>
                             <regex>-SNAPSHOT</regex>
                             <replacement>-SNAPSHOT-${month.date}</replacement>
                             <failIfNoMatch>false</failIfNoMatch>
diff --git a/forge-gui-desktop/pom.xml b/forge-gui-desktop/pom.xml
index 0557fb73970..dfe902e6b9a 100644
--- a/forge-gui-desktop/pom.xml
+++ b/forge-gui-desktop/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>forge</artifactId>
         <groupId>forge</groupId>
-        <version>2.0.04-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>forge-gui-desktop</artifactId>
@@ -49,7 +49,7 @@
                         <configuration>
                             <!-- generate versionName from revision property to snapshot-version property  -->
                             <name>snapshot-version</name>
-                            <value>2.0.03-SNAPSHOT</value>
+                            <value>${revision}</value>
                             <regex>-SNAPSHOT</regex>
                             <replacement>-SNAPSHOT-${month.date}</replacement>
                             <failIfNoMatch>false</failIfNoMatch>
diff --git a/forge-gui-ios/pom.xml b/forge-gui-ios/pom.xml
index 32262ec83a5..e72343d5356 100644
--- a/forge-gui-ios/pom.xml
+++ b/forge-gui-ios/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <artifactId>forge</artifactId>
         <groupId>forge</groupId>
-        <version>2.0.04-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>forge-gui-ios</artifactId>
@@ -35,7 +35,7 @@
                 <filtering>true</filtering>
             </resource>
         </resources>
-        <finalName>forge-ios-2.0.03-SNAPSHOT</finalName>
+        <finalName>forge-ios-${revision}</finalName>
     </build>
 
     <dependencies>
diff --git a/forge-gui-mobile-dev/pom.xml b/forge-gui-mobile-dev/pom.xml
index e049f2db036..bf7c57c2260 100644
--- a/forge-gui-mobile-dev/pom.xml
+++ b/forge-gui-mobile-dev/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <artifactId>forge</artifactId>
         <groupId>forge</groupId>
-        <version>2.0.04-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>forge-gui-mobile-dev</artifactId>
@@ -45,7 +45,7 @@
                         <configuration>
                             <!-- generate versionName from revision property to snapshot-version property  -->
                             <name>snapshot-version</name>
-                            <value>2.0.03-SNAPSHOT</value>
+                            <value>${revision}</value>
                             <regex>-SNAPSHOT</regex>
                             <replacement>-SNAPSHOT-${month.date}</replacement>
                             <failIfNoMatch>false</failIfNoMatch>
diff --git a/forge-gui-mobile/pom.xml b/forge-gui-mobile/pom.xml
index 2b389f9fd15..3dd42d225a6 100644
--- a/forge-gui-mobile/pom.xml
+++ b/forge-gui-mobile/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>forge</artifactId>
         <groupId>forge</groupId>
-        <version>2.0.04-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>forge-gui-mobile</artifactId>
diff --git a/forge-gui/pom.xml b/forge-gui/pom.xml
index 8283d3e8547..5175be1b6c9 100644
--- a/forge-gui/pom.xml
+++ b/forge-gui/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>forge</artifactId>
         <groupId>forge</groupId>
-        <version>2.0.04-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>forge-gui</artifactId>
diff --git a/forge-installer/pom.xml b/forge-installer/pom.xml
index 7633b9e5d2a..90ed2806e94 100644
--- a/forge-installer/pom.xml
+++ b/forge-installer/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>forge</artifactId>
         <groupId>forge</groupId>
-        <version>2.0.04-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>forge-installer</artifactId>
@@ -39,7 +39,7 @@
                         <configuration>
                             <!-- generate versionName from revision property to snapshot-version property  -->
                             <name>snapshot-version</name>
-                            <value>2.0.03-SNAPSHOT</value>
+                            <value>${revision}</value>
                             <regex>-SNAPSHOT</regex>
                             <replacement>-SNAPSHOT-${month.date}</replacement>
                             <failIfNoMatch>false</failIfNoMatch>
diff --git a/forge-lda/pom.xml b/forge-lda/pom.xml
index 946fbad17f1..7cc9377a9d1 100644
--- a/forge-lda/pom.xml
+++ b/forge-lda/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>forge</artifactId>
 		<groupId>forge</groupId>
-		<version>2.0.04-SNAPSHOT</version>
+		<version>${revision}</version>
 	</parent>
 
     <artifactId>forge-lda</artifactId>
@@ -28,7 +28,7 @@
                 <filtering>true</filtering>
             </resource>
         </resources>
-        <finalName>forge-lda-2.0.03-SNAPSHOT</finalName>
+        <finalName>forge-lda-${revision}</finalName>
     </build>
 
     <dependencies>
diff --git a/pom.xml b/pom.xml
index 22c42fe75bc..3e64a5287f5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <artifactId>forge</artifactId>
     <packaging>pom</packaging>
     <name>Forge Parent</name>
-    <version>2.0.04-SNAPSHOT</version>
+    <version>${revision}</version>
 
     <description>
         Forge lets you play the card game Magic: The Gathering against a computer opponent using all of the rules.
@@ -26,11 +26,11 @@
         <configSourceDirectory>src/main/config</configSourceDirectory>
         <maven.compiler.release>17</maven.compiler.release>
         <!-- version code - maj.min.rev ie 2.0.00 -->
-        <versionCode>2.0.03</versionCode>
+        <versionCode>2.0.04</versionCode>
         <!-- set snapshotName to blank for release -->
         <snapshotName>-SNAPSHOT</snapshotName>
         <!-- revision will be the global version string -->
-        <revision>2.0.03-SNAPSHOT</revision>
+        <revision>${versionCode}${snapshotName}</revision>
     </properties>
 
     <licenses>
@@ -332,6 +332,31 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>flatten-maven-plugin</artifactId>
+                <version>1.6.0</version>
+                <configuration>
+                    <updatePomFile>true</updatePomFile>
+                    <flattenMode>resolveCiFriendliesOnly</flattenMode>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>flatten</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>flatten</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>flatten.clean</id>
+                        <phase>clean</phase>
+                        <goals>
+                            <goal>clean</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>