diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml
index 26263f5..5192536 100644
--- a/.github/workflows/publish-docker.yml
+++ b/.github/workflows/publish-docker.yml
@@ -15,11 +15,13 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: docker login
-      env:
-        DOCKER_USER: ${{secrets.DOCKER_USER}}
-        DOCKER_PASSWORD: ${{secrets.DOCKER_PASSWORD}}
-      run: docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
-    - name: docker build
-      run: docker build . --file Dockerfile --tag dnlbauer/pdfact-service:$(date +%s)
-    - name: docker push
-      run: docker push ${{secrets.DOCKER_USER}}/pdfact-service
+      uses: docker/login-action@v2
+      with:
+        username: ${{secrets.DOCKER_USER}}
+        password: ${{secrets.DOCKER_PASSWORD}}
+    - name: docker build and push
+      uses: docker/build-and-push@v2
+      with:
+        context: .
+        push: true
+        tags: ${{secrets.DOCKER_USER}}/pdfact-service:latest , ${{secrets.DOCKER_USER}}/pdfact-service:$(date +%s)