diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml
index e2252895..67506c65 100644
--- a/.forgejo/workflows/build.yml
+++ b/.forgejo/workflows/build.yml
@@ -3,15 +3,15 @@ name: Build
 on:
   push:
     tags:
-      - "v[0-9]+.[0-9]+.[0-9]+"
-      - "v[0-9]+.[0-9]+.[0-9]+*"
+      - "discipline[0-9]+.[0-9]+.[0-9]+"
+      - "discipline[0-9]+.[0-9]+.[0-9]+*"
   workflow_dispatch:
 
 env:
   REGISTRY: ${{ vars.CONTAINER_REGISTRY }}
   REGISTRY_USERNAME: ${{ vars.CONTAINER_REGISTRY_USERNAME }}
   REGISTRY_PASSWORD: ${{ secrets.CONTAINER_REGISTRY_PASSWORD }}
-  CONTAINER_IMAGE_NAME: ${{ vars.CONTAINER_REGISTRY }}/${{ vars.CONTAINER_IMAGE_OWNER }}/${{ vars.CONTAINER_IMAGE_NAME }}
+  CONTAINER_IMAGE_NAME: ${{ vars.CONTAINER_REGISTRY }}/${{ vars.CONTAINER_IMAGE_OWNER }}
   IMAGE_VERSION: build
 
 jobs:
@@ -29,7 +29,7 @@ jobs:
       - name: Tag Version
         run: |
           if [[ "${{ github.event_name }}" == "push" ]]; then
-            echo "IMAGE_VERSION=${{ github.ref_name }}" | sed 's/v//g' >> $GITHUB_ENV
+            echo "IMAGE_VERSION=${{ github.ref_name }}" | sed 's/discipline//g' >> $GITHUB_ENV
           else
             echo "IMAGE_VERSION=${{ env.IMAGE_VERSION }}-${{ github.run_number }}" >> $GITHUB_ENV
           fi
@@ -45,5 +45,5 @@ jobs:
           platforms: linux/amd64
           context: .
           file: ./BMA.EHR.Discipline.Service/Dockerfile
-          tags: ${{ env.CONTAINER_IMAGE_NAME }}:latest,${{ env.CONTAINER_IMAGE_NAME }}:${{ env.IMAGE_VERSION }}
+          tags: ${{ env.CONTAINER_IMAGE_NAME }}/hrms-discipline:latest,${{ env.CONTAINER_IMAGE_NAME }}/hrms-discipline:${{ env.IMAGE_VERSION }}
           push: true