diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml
index d30392f..33c4939 100644
--- a/.gitea/workflows/deploy.yaml
+++ b/.gitea/workflows/deploy.yaml
@@ -9,9 +9,11 @@ on:
     - main
 
 jobs:
-  login:
+  build-and-deploy:
     runs-on: ubuntu-latest
     steps:
+    - name: Checkout code
+      uses: actions/checkout@v3
 
     - name: Login to Registry (scoped)
       uses: docker/login-action@v4
@@ -19,34 +21,22 @@ jobs:
         registry: ${{ secrets.DOCKER_REGISTRY }}
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_TOKEN }}
-        scope: 'hacecalor/fichajes@push'
-
-  build-and-deploy:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v3
 
     - name: Build Docker image
       run: docker build -t fichajes .
 
     - name: Tag Docker image
-      run: docker tag fichajes hacecalor/fichajes:${{ github.run_number }}
+      run: docker tag fichajes ${{ secrets.DOCKER_REGISTRY }}/hacecalor/fichajes:${{ github.run_number }}
 
     - name: Push Docker image to registry
-      uses: docker/build-push-action@v2
-      with:
-        push: true
-        tags: ${{ secrets.DOCKER_REGISTRY }}/hacecalor/fichajes:${{ github.run_number }}
+      run: docker push ${{ secrets.DOCKER_REGISTRY }}/hacecalor/fichajes:${{ github.run_number }}
 
-    - name: Connect to remote host
+    - name: Connect to remote host and deploy
       uses: appleboy/ssh-action@v1
       with:
         host: ${{ secrets.REMOTE_HOST }}
         username: ${{ secrets.REMOTE_USER }}
         password: ${{ secrets.REMOTE_PASSWORD }}
-
-    - name: Pull and run docker compose
-      run: |
-        docker pull
-        docker-compose up -d
+        script: |
+          docker pull
+          docker-compose up -d