diff --git a/.github/workflows/build-and-publish-develop.yml b/.github/workflows/build-and-publish-develop.yml
index 72754eb..0798cf5 100644
--- a/.github/workflows/build-and-publish-develop.yml
+++ b/.github/workflows/build-and-publish-develop.yml
@@ -61,6 +61,11 @@ jobs:
           mvn -B package \
             -P homelab \
             --settings=${{ github.workspace }}/.mvn/settings.xml
+      - name: Extract Maven project version
+        id: project-version
+        run: echo ::set-output name=version::$(mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec)
+      - name: Show extracted Maven project version
+        run: echo ${{ steps.project-version.outputs.version }}
       - name: Prepare
         run: |
           platform=${{ matrix.platform }}
@@ -119,12 +124,12 @@ jobs:
           images: ${{ env.REGISTRY_IMAGE }}
           # generate Docker tags based on the following events/attributes
           tags: |
-            type=schedule,{{date 'YYYYMMDD'}}
             type=ref,event=branch
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
             type=sha
+            type=sha,prefix={{branch}}-
+            type=raw,value={{branch}}-{{date 'YYYYMMDD'}}
+            type=raw,value={{branch}}-${{ steps.project-version.outputs.version }}
+            type=raw,value=${{ steps.project-version.outputs.version }}
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
diff --git a/Dockerfile b/Dockerfile
index d9647e0..3c4bb40 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,4 +20,6 @@ COPY --chown=1001 target/*.jar /app/app.jar
 COPY --chown=1001 script/entrypoint.sh /opt/scripts/entrypoint.sh
 RUN chmod 0740 /opt/scripts/entrypoint.sh
 
-CMD /opt/scripts/entrypoint.sh
\ No newline at end of file
+CMD /opt/scripts/entrypoint.sh
+
+EXPOSE 8100
\ No newline at end of file