diff --git a/CHANGELOG.md b/CHANGELOG.md
index 96c3f6d..4cf784c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+
+## [0.4.0] - 2024-04-05
 ### Changed
 - Extracted common code to [Cucumber Query](https://github.com/cucumber/query/tree/main) ([#31](https://github.com/cucumber/cucumber-junit-xml-formatter/pull/31), M.P. Korstanje)
 
@@ -26,7 +28,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Java implementation ([#3](https://github.com/cucumber/junit-xml-formatter/pull/3) M.P. Korstanje)
 
-[Unreleased]: https://github.com/cucumber/junit-xml-formatter/compare/v0.3.0...HEAD
+[Unreleased]: https://github.com/cucumber/junit-xml-formatter/compare/v0.4.0...HEAD
+[0.4.0]: https://github.com/cucumber/junit-xml-formatter/compare/v0.3.0...v0.4.0
 [0.3.0]: https://github.com/cucumber/junit-xml-formatter/compare/v0.2.1...v0.3.0
 [0.2.1]: https://github.com/cucumber/junit-xml-formatter/compare/v0.2.0...v0.2.1
 [0.2.0]: https://github.com/cucumber/junit-xml-formatter/compare/v0.1.0...v0.2.0
diff --git a/java/pom.xml b/java/pom.xml
index 583fd54..dd77e89 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -9,7 +9,7 @@
     </parent>
 
     <artifactId>junit-xml-formatter</artifactId>
-    <version>0.3.1-SNAPSHOT</version>
+    <version>0.4.0</version>
     <packaging>jar</packaging>
     <name>JUnit XML Formatter</name>
     <description>Renders Cucumber Messages as JUnit XML</description>
@@ -17,14 +17,14 @@
 
     <properties>
         <project.Automatic-Module-Name>io.cucumber.junitxmlformatter</project.Automatic-Module-Name>
-        <project.build.outputTimestamp>1711217894</project.build.outputTimestamp>
+        <project.build.outputTimestamp>1712323884</project.build.outputTimestamp>
     </properties>
 
     <scm>
         <connection>scm:git:git://github.com/cucumber/junit-xml-formatter.git</connection>
         <developerConnection>scm:git:git@github.com:cucumber/junit-xml-formatter.git</developerConnection>
         <url>git://github.com/cucumber/junit-xml-formatter.git</url>
-        <tag>HEAD</tag>
+        <tag>v0.4.0</tag>
     </scm>
 
     <dependencyManagement>