diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml
index 556a902..c2fc596 100644
--- a/.gitea/workflows/release.yml
+++ b/.gitea/workflows/release.yml
@@ -3,32 +3,30 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - master
       - main
+  # schedule:
+  #   - cron: '0 9 * * 0'
 
 jobs:
-  # test:
-  #   name: Test
-  #   uses: ./.gitea/workflows/ci.yml@main
+
+  tag:
+    name: Tag release
+    uses: https://git.tainton.uk/actions/gha-workflows/.gitea/workflows/release-with-tag.yaml@main
 
   create_release:
     name: Create Release
-    # needs: test
-    uses: https://git.tainton.uk/actions/gha-workflows/.gitea/workflows/create-release.yml@main
+    needs: tag
+    uses: https://git.tainton.uk/actions/gha-workflows/.gitea/workflows/create-release-preexisting-tag.yaml@main
+    with:
+      tag: ${{ needs.tag.outputs.tag_name }}
+      body: ${{ needs.tag.outputs.changelog }}
     secrets:
       ACTIONS_TOKEN: ${{ secrets.ACTIONS_TOKEN }}
 
-  print_release:
-    name: Print Release
-    runs-on: ubuntu-latest
-    needs: create_release
-    steps:
-      - run: echo "Created release ${{ needs.create_release.outputs.release_name }}."
-
-  publish:
+  create_docker:
     name: Publish Docker Images
     runs-on: ubuntu-latest
-    needs: create_release
+    needs: [tag, create_release]
     steps:
       - name: Update Docker configuration
         continue-on-error: true
@@ -50,7 +48,7 @@ jobs:
         uses: actions/checkout@v4.2.2
         with:
           fetch-depth: 0
-          ref: ${{ needs.create_release.outputs.release_name }}
+          ref: ${{ needs.tag.outputs.tag_name }}
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -73,7 +71,7 @@ jobs:
         id: meta
         uses: docker/metadata-action@v5
         with:
-          tags: type=semver,pattern=v{{version}},value=${{ needs.create_release.outputs.release_name }}
+          tags: type=semver,pattern=v{{version}},value=${{ needs.tag.outputs.tag_name }}
           images: |
             ghcr.io/${{ vars.GHCR_USERNAME }}/${{ steps.split.outputs.repo }}
             ${{ vars.PACKAGES_REGISTRY_URL }}/${{ gitea.repository }}