diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index b26b8c9..9c613d7 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -113,9 +113,9 @@ jobs:
     - name: Sets env vars for pull to main 
       if: ${{ github.base_ref == 'main' }}
       run: |
-        IMAGE_TAG=`mvn help:evaluate -Dexpression=project.version -q -DforceStdout | sed "s/-.*$/-IZGW-SNAPSHOT-${{github.run_number}}/"` 
+        IMAGE_TAG=`mvn help:evaluate -Dexpression=project.version -q -DforceStdout | sed "s/-.*$/-v2tofhir-SNAPSHOT-${{github.run_number}}/"` 
         echo IMAGE_TAG=$IMAGE_TAG >> $GITHUB_ENV
-        IMAGE_BRANCH_TAG=`mvn help:evaluate -Dexpression=project.version -q -DforceStdout | sed "s/-.*$/-IZGW-SNAPSHOT/"`
+        IMAGE_BRANCH_TAG=`mvn help:evaluate -Dexpression=project.version -q -DforceStdout | sed "s/-.*$/-v2tofhir-SNAPSHOT/"`
         echo IMAGE_BRANCH_TAG=$IMAGE_BRANCH_TAG >> $GITHUB_ENV
         mvn versions:set -DnewVersion=$IMAGE_BRANCH_TAG -f pom.xml
 
@@ -128,9 +128,9 @@ jobs:
     - name: Sets env vars for pull to main 
       if: ${{ github.ref_name == 'main' }}
       run: |
-        IMAGE_TAG=`mvn help:evaluate -Dexpression=project.version -q -DforceStdout | sed "s/-.*$/-IZGW-RELEASE-${{github.run_number}}/"` 
+        IMAGE_TAG=`mvn help:evaluate -Dexpression=project.version -q -DforceStdout | sed "s/-.*$/-v2tofhir-RELEASE-${{github.run_number}}/"` 
         echo IMAGE_TAG=$IMAGE_TAG >> $GITHUB_ENV
-        IMAGE_BRANCH_TAG=`mvn help:evaluate -Dexpression=project.version -q -DforceStdout | sed "s/-.*$/-IZGW-RELEASE/"`
+        IMAGE_BRANCH_TAG=`mvn help:evaluate -Dexpression=project.version -q -DforceStdout | sed "s/-.*$/-v2tofhir-RELEASE/"`
         echo IMAGE_BRANCH_TAG=$IMAGE_BRANCH_TAG >> $GITHUB_ENV
         mvn versions:set -DnewVersion=$IMAGE_BRANCH_TAG -f pom.xml
         if [ ${{ github.event_name }} == 'push' ]