diff --git a/.gitea/workflows/build_push_internal_docker.yml b/.gitea/workflows/build_push_internal_docker.yml
index af8eb23..934bb7d 100644
--- a/.gitea/workflows/build_push_internal_docker.yml
+++ b/.gitea/workflows/build_push_internal_docker.yml
@@ -34,15 +34,13 @@ jobs:
           git clone https://${{ secrets.REGISTRY_DOCKER_PASS }}@${{ vars.REGISTRY_DOCKER }}/${{ secrets.REGISTRY_DOCKER_USER }}/${{ vars.DOCKER_IMAGE_NAME }}
           cd ${{ vars.DOCKER_IMAGE_NAME }}
           docker buildx b . -t ${{ vars.DOCKER_IMAGE_NAME }}
-          export VERSION=$(echo "${{ gitea.ref_name }}" | cut -d '-' -f 1)
-          echo $VERSION
-          docker tag ${{ vars.DOCKER_IMAGE_NAME }} ${{ vars.REGISTRY_DOCKER }}/${{ vars.DOCKER_IMAGE_NAME }}:$VERSION
-          docker tag ${{ vars.DOCKER_IMAGE_NAME }} ${{ vars.REGISTRY_DOCKER }}/${{ vars.DOCKER_IMAGE_NAME }}:latest
       - name: login & push
         run: |
-          echo "${{ secrets.REGISTRY_DOCKER_PASS }}" | docker login -u ${{ secrets.REGISTRY_DOCKER_USER }} --password-stdin ${{ vars.REGISTRY_DOCKER }}
+          echo "${{ secrets.PACKAGE_PUSH_REPO }}" | docker login -u ${{ vars.REPO_GITEA_USER }} --password-stdin ${{ vars.REGISTRY_DOCKER }}
           docker images
           export VERSION=$(echo "${{ gitea.ref_name }}" | cut -d '-' -f 1)
+          docker tag ${{ vars.DOCKER_IMAGE_NAME }} ${{ vars.REGISTRY_DOCKER }}/${{ vars.DOCKER_IMAGE_NAME }}:$VERSION
+          docker tag ${{ vars.DOCKER_IMAGE_NAME }} ${{ vars.REGISTRY_DOCKER }}/${{ vars.DOCKER_IMAGE_NAME }}:latest
           docker push ${{ vars.REGISTRY_DOCKER }}/${{ vars.DOCKER_IMAGE_NAME }}:$VERSION
           docker push ${{ vars.REGISTRY_DOCKER }}/${{ vars.DOCKER_IMAGE_NAME }}:latest
 
diff --git a/.gitea/workflows/build_push_public_docker.yml b/.gitea/workflows/build_push_public_docker.yml
index 97c7ea7..d574b78 100644
--- a/.gitea/workflows/build_push_public_docker.yml
+++ b/.gitea/workflows/build_push_public_docker.yml
@@ -27,12 +27,16 @@ jobs:
 
       - name: clone & build & push
         run: |
-          echo "${{ secrets.REGISTRY_DOCKER_PASS }}" | docker login -u ${{ secrets.REGISTRY_DOCKER_USER }} --password-stdin ${{ vars.REGISTRY_DOCKER }}
           git clone ${{ env.GIT_SERVER }}/${{ env.GIT_REPO }}
           cd ${{ env.GIT_REPO }}
           docker buildx b . -t ${{ env.GIT_REPO }}
-          docker tag ${{ env.GIT_REPO }} ${{ vars.REGISTRY_DOCKER }}/${{ env.GIT_REPO }}
-          docker push ${{ vars.REGISTRY_DOCKER }}/${{ env.GIT_REPO }}:${{ gitea.ref_name }}
+      - name: login & push
+        run: |
+          echo "${{ secrets.REGISTRY_DOCKER_PASS }}" | docker login -u ${{ secrets.REGISTRY_DOCKER_USER }} --password-stdin ${{ vars.REGISTRY_DOCKER }}
+          export VERSION=$(echo "${{ gitea.ref_name }}" | cut -d '-' -f 1)
+          docker tag ${{ env.GIT_REPO }} ${{ vars.REGISTRY_DOCKER }}/${{ env.GIT_REPO }}:$VERSION
+          docker tag ${{ env.GIT_REPO }} ${{ vars.REGISTRY_DOCKER }}/${{ env.GIT_REPO }}:latest
+          docker push ${{ vars.REGISTRY_DOCKER }}/${{ env.GIT_REPO }}:$VERSION
           docker push ${{ vars.REGISTRY_DOCKER }}/${{ env.GIT_REPO }}:latest
 
       - name: Output