diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index a76037e0d..6e013983d 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -21,12 +21,24 @@ jobs:
           ls ${{ github.workspace }}
           echo "🍏 This job's status is ${{ job.status }}."
 
-      - uses: mr-smithers-excellent/docker-build-push@v6
-        name: Build & push Docker image
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      # -
+      #   name: Set up QEMU
+      #   uses: docker/setup-qemu-action@v3
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      -
+        name: Login to Docker Hub
+        uses: docker/login-action@v3
         with:
-          image: barrymatheney/spring-petclinic:tagname
-          tags: v1, latest
-          # registry: hub.docker.com
-          dockerfile: Dockerfile
           username: ${{ vars.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
\ No newline at end of file
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      - 
+        name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          push: true
+          tags: user/app:latest