diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 22ae029e..59efd5ac 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -77,6 +77,7 @@ jobs:
       uses: mathieudutour/github-tag-action@v6.2
       with:
         github_token: ${{ secrets.GITHUB_TOKEN }}
+        custom_tag: ${{ env.RELEASE_VERSION }}
 
     - name: Create Release
       id: create_release
diff --git a/pom.xml b/pom.xml
index fd59ada1..483d3a69 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>ch.bfh</groupId>
 	<artifactId>mobile-access-gateway</artifactId>
-	<version>0.0.20</version>
+	<version>0.0.21</version>
 	<description>FHIR Gateway supporting the PMIR and MHD server actors and uses XDS/PIXV3 to communicate with an XDS Affinity Domain</description>
 	<packaging>jar</packaging>