diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 93001dd..b044c97 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -17,22 +17,21 @@ jobs:
       uses: actions/checkout@v4
 
     - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v4
-      with:
-        install: true
+      uses: docker/setup-buildx-action@v2
 
     - name: Log in to Docker Hub
-      uses: docker/login-action@v3
+      uses: docker/login-action@v2
       with:
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_TOKEN }}
 
     - name: Build and push Docker image
-      uses: docker/build-push-action@v2
+      uses: docker/build-push-action@v3
       with:
         context: ./server
-        push: true
-        tags: juli0n21/thumbnails:latest 
+        push: ${{ github.event_name == 'push' }}
+        tags: juli0n21/thumbnails:latest
 
     - name: Logout from Docker Hub
-      run: docker logout
+      if: always()
+      run: docker logout
\ No newline at end of file