diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml
index 9e00449..fe55cc8 100644
--- a/.gitea/workflows/release.yml
+++ b/.gitea/workflows/release.yml
@@ -2,7 +2,7 @@ name: Release
 
 on:
   release:
-    types: [created]
+    types: [published]
 
 jobs:
   build:
@@ -15,15 +15,29 @@ jobs:
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v1
 
-    - name: Login to DockerHub
-      uses: docker/login-action@v1
+    - name: Docker meta
+      id: meta
+      uses: docker/metadata-action@v4
       with:
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
+        images: git.dws.rip/${{ github.repository }}
+        tags: |
+          type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }}
+          type=semver,pattern={{version}},enable=${{ startsWith(github.ref, 'refs/tags/v') }}
+          type=semver,pattern={{major}}.{{minor}},enable=${{ startsWith(github.ref, 'refs/tags/v') }}
+          type=sha,format=long
+          type=ref,event=pr
 
-    - name: Build and push Docker image
-      uses: docker/build-push-action@v2
+    - name: Login to Gitea Container Registry
+      uses: docker/login-action@v2
+      with:
+        registry: git.dws.rip
+        username: ${{ github.actor }}
+        password: ${{ secrets.GLOBAL_KEY }}
+
+    - name: Build and push
+      uses: docker/build-push-action@v4
       with:
         context: .
-        push: true
-        tags: ${{ secrets.DOCKER_USERNAME }}/foldsite:${{ github.ref_name }}
\ No newline at end of file
+        push: ${{ github.event_name != 'pull_request' }}
+        tags: ${{ steps.meta.outputs.tags }}
+        labels: ${{ steps.meta.outputs.labels }} 
\ No newline at end of file