diff --git a/.gitea/workflows/cron.yaml b/.gitea/workflows/cron.yaml
index 7730389..543f9fe 100644
--- a/.gitea/workflows/cron.yaml
+++ b/.gitea/workflows/cron.yaml
@@ -7,38 +7,47 @@ on:
 jobs:
   hadolint:
     runs-on: ubuntu-latest
+    continue-on-error: true
     steps:
-      - name: Checkout
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
-      - name: Hadolint
-        uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5 # v3.3.0
-        continue-on-error: true
+      - uses: actions/checkout@df4cb1c069e1874edd31b4111f1884172cec0e10 # v6
+      - uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5 # v3.3.0
+        with:
+          dockerfile: Dockerfile
+
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@df4cb1c069e1874edd31b4111f1884172cec0e10 # v6
+      - uses: docker/setup-buildx-action@d7f5e7f509e9e45cece5cec9e8c9e4f5afdd7de9 # v4
+      - run: docker build -t ci-image:${{ github.sha }} .
+      - run: bash tests/test.sh ci-image:${{ github.sha }}
 
   build-push:
+    needs: [test]
     runs-on: ubuntu-latest
-    needs: hadolint
     steps:
-      - name: Checkout
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4
-      - name: Login to Docker Hub
-        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4
+      - uses: actions/checkout@df4cb1c069e1874edd31b4111f1884172cec0e10 # v6
+        with:
+          fetch-depth: 0
+      - uses: docker/setup-buildx-action@d7f5e7f509e9e45cece5cec9e8c9e4f5afdd7de9 # v4
+      - uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Docker metadata
-        id: meta
+      - id: get-latest-tag
+        run: |
+          TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "")
+          echo "tag=$TAG" >> $GITHUB_OUTPUT
+      - id: meta
         uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6
         with:
           images: jcabillot/docker-dynhost
           tags: |
-            type=raw,value=latest
-            type=sha,format=long
-      - name: Build and push
-        uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7.2.0
+            type=raw,value=${{ steps.get-latest-tag.outputs.tag }}-latest,enable=${{ steps.get-latest-tag.outputs.tag != '' }}
+      - uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7.2.0
         with:
           context: .
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
+          pull: true
diff --git a/.gitea/workflows/main.yaml b/.gitea/workflows/main.yaml
index 49e523a..c816502 100644
--- a/.gitea/workflows/main.yaml
+++ b/.gitea/workflows/main.yaml
@@ -1,4 +1,4 @@
-name: Main CI
+name: Main Release
 
 on:
   push:
@@ -7,61 +7,42 @@ on:
 jobs:
   hadolint:
     runs-on: ubuntu-latest
+    continue-on-error: true
     steps:
-      - name: Checkout
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
-      - name: Hadolint
-        uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5 # v3.3.0
-        continue-on-error: true
-
-  build-push:
-    runs-on: ubuntu-latest
-    needs: hadolint
-    steps:
-      - name: Checkout
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4
-      - name: Login to Docker Hub
-        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4
+      - uses: actions/checkout@df4cb1c069e1874edd31b4111f1884172cec0e10 # v6
+      - uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5 # v3.3.0
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Docker metadata
-        id: meta
-        uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6
-        with:
-          images: jcabillot/docker-dynhost
-          tags: |
-            type=sha,format=long
-      - name: Build and push
-        uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7.2.0
-        with:
-          context: .
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
+          dockerfile: Dockerfile
 
   test:
     runs-on: ubuntu-latest
-    needs: build-push
     steps:
-      - name: Checkout
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
-      - name: Run tests
-        run: bash tests/test.sh jcabillot/docker-dynhost:${{ github.sha }}
+      - uses: actions/checkout@df4cb1c069e1874edd31b4111f1884172cec0e10 # v6
+      - uses: docker/setup-buildx-action@d7f5e7f509e9e45cece5cec9e8c9e4f5afdd7de9 # v4
+      - run: docker build -t ci-image:${{ github.sha }} .
+      - run: bash tests/test.sh ci-image:${{ github.sha }}
+
+  build:
+    needs: [test]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@df4cb1c069e1874edd31b4111f1884172cec0e10 # v6
+      - uses: docker/setup-buildx-action@d7f5e7f509e9e45cece5cec9e8c9e4f5afdd7de9 # v4
+      - run: docker build -t jcabillot/docker-dynhost:${{ github.sha }} .
 
   tag:
+    needs: [build]
     runs-on: ubuntu-latest
-    needs: test
-    if: github.event_name == 'push'
     steps:
-      - name: Checkout
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
-      - name: Bump version and push tag
-        uses: anothrNick/github-tag-action@4ed44965e0db8dab2b466a16da04aec3cc312fd8 # v1.75.0
+      - uses: actions/checkout@df4cb1c069e1874edd31b4111f1884172cec0e10 # v6
+        with:
+          fetch-depth: 0
+      - name: Configure git auth
+        run: |
+          git remote set-url origin "https://x-access-token:${{ secrets.SA_TOKEN_ACTION_PUSH_TAGS }}@scm.cabillot.eu/perso/docker-dynhost.git"
+      - uses: anothrNick/github-tag-action@4e44965e0db8dab2b466a16da04aec3cc312fd8 # v1.75.0
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.SA_TOKEN_ACTION_PUSH_TAGS }}
           DEFAULT_BUMP: patch
           RELEASE_BRANCHES: master
           WITH_V: true
diff --git a/.gitea/workflows/pr.yaml b/.gitea/workflows/pr.yaml
index 66fedd5..118fc24 100644
--- a/.gitea/workflows/pr.yaml
+++ b/.gitea/workflows/pr.yaml
@@ -2,24 +2,21 @@ name: PR Checks
 
 on:
   pull_request:
+    branches: [master]
 
 jobs:
   hadolint:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
-      - name: Hadolint
-        uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5 # v3.3.0
-        continue-on-error: true
+      - uses: actions/checkout@df4cb1c069e1874edd31b4111f1884172cec0e10 # v6
+      - uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5 # v3.3.0
+        with:
+          dockerfile: Dockerfile
 
   build-test:
     runs-on: ubuntu-latest
-    needs: hadolint
     steps:
-      - name: Checkout
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
-      - name: Build image
-        run: docker build -t ci-image:${{ github.sha }} .
-      - name: Run tests
-        run: bash tests/test.sh ci-image:${{ github.sha }}
+      - uses: actions/checkout@df4cb1c069e1874edd31b4111f1884172cec0e10 # v6
+      - uses: docker/setup-buildx-action@d7f5e7f509e9e45cece5cec9e8c9e4f5afdd7de9 # v4
+      - run: docker build -t ci-image:${{ github.sha }} .
+      - run: bash tests/test.sh ci-image:${{ github.sha }}
diff --git a/.gitea/workflows/tag.yaml b/.gitea/workflows/tag.yaml
index 786e4ce..36cb523 100644
--- a/.gitea/workflows/tag.yaml
+++ b/.gitea/workflows/tag.yaml
@@ -2,44 +2,47 @@ name: Tag Release
 
 on:
   push:
-    tags:
-      - '*'
+    tags: ['*']
 
 jobs:
   hadolint:
     runs-on: ubuntu-latest
+    continue-on-error: true
     steps:
-      - name: Checkout
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
-      - name: Hadolint
-        uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5 # v3.3.0
-        continue-on-error: true
+      - uses: actions/checkout@df4cb1c069e1874edd31b4111f1884172cec0e10 # v6
+      - uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5 # v3.3.0
+        with:
+          dockerfile: Dockerfile
+
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@df4cb1c069e1874edd31b4111f1884172cec0e10 # v6
+      - uses: docker/setup-buildx-action@d7f5e7f509e9e45cece5cec9e8c9e4f5afdd7de9 # v4
+      - run: docker build -t ci-image:${{ github.sha }} .
+      - run: bash tests/test.sh ci-image:${{ github.sha }}
 
   build-push:
+    needs: [test]
     runs-on: ubuntu-latest
-    needs: hadolint
     steps:
-      - name: Checkout
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4
-      - name: Login to Docker Hub
-        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4
+      - uses: actions/checkout@df4cb1c069e1874edd31b4111f1884172cec0e10 # v6
+      - uses: docker/setup-buildx-action@d7f5e7f509e9e45cece5cec9e8c9e4f5afdd7de9 # v4
+      - uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Docker metadata
-        id: meta
+      - id: meta
         uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6
         with:
           images: jcabillot/docker-dynhost
           tags: |
-            type=semver,pattern={{version}}
             type=ref,event=tag
-      - name: Build and push
-        uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7.2.0
+            type=ref,event=tag,suffix=-latest
+      - uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7.2.0
         with:
           context: .
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
+          pull: true