diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index c5c0631..a7cd457 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -44,18 +44,17 @@ jobs:
             - uses: actions/checkout@v3
 
             - name: Build and Push Image
+              env:
+                  GITEA_REGISTRY: ${{ vars.IMAGE_REGISTRY }}
+                  GITEA_USER: ${{ secrets.CI_REGISTRY_USER }}
+                  GITEA_TOKEN: ${{ secrets.CI_REGISTRY_PASSWORD }}
+                  IMAGE_NAME: ${{ vars.IMAGE_NAME }}
+                  TAG: ${{ startsWith(github.ref, 'refs/tags/') && github.ref_name || 'latest' }}
               run: |
                   sudo apt-get update
                   sudo apt-get install -y docker.io bash
                   cd docker
                   chmod +x ./push-to-gitea.sh
-                  export GITEA_REGISTRY="${GITEA_REGISTRY}"
-                  export GITEA_USER="${CI_REGISTRY_USER}"
-                  export GITEA_TOKEN="${CI_REGISTRY_PASSWORD}"
-                  echo MAGADAGA
-                  echo "${GITEA_REGISTRY}"
-                  echo "${CI_REGISTRY_USER}"
-                  echo "${CI_REGISTRY_PASSWORD}"
                   ./push-to-gitea.sh "${IMAGE_NAME}" "${TAG}"
 
     deploy: