diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml
index d309876..1d8b8b9 100644
--- a/.github/workflows/publish-docker.yml
+++ b/.github/workflows/publish-docker.yml
@@ -5,7 +5,14 @@ on:
     branches: [ "main" ]
   pull_request:
     branches: [ "main" ]
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
+env:
+  CONTAINER_REGISTRY_USER: dnlbauer
+  IMAGE_NAME: pdfact-service
+  
 jobs:
 
   build:
@@ -20,21 +27,22 @@ jobs:
     - name: docker login
       uses: docker/login-action@v2
       with:
-        username: ${{secrets.DOCKER_USER}}
+        username: ${{env.CONTAINER_REGISTRY_USER}}
         password: ${{secrets.DOCKER_PASSWORD}}
     - name: docker build and push
       uses: docker/build-push-action@v3
       with:
         context: .
         push: true
-        tags: ${{secrets.DOCKER_USER}}/pdfact-service:latest , ${{secrets.DOCKER_USER}}/pdfact-service:${{ steps.tag.outputs.tag }}
+        tags: ${{env.CONTAINER_REGISTRY_USER}}/${{env.IMAGE_NAME}}:latest , ${{env.CONTAINER_REGISTRY_USER}}/${{env.IMAGE_NAME}}:${{ steps.tag.outputs.tag }}
     - name: docker push readme
       uses: christian-korneck/update-container-description-action@v1
+      if: ${{ github.event_name != 'pull_request' }}
       env:
-        DOCKER_USER: ${{secrets.DOCKER_USER}}
+        DOCKER_USER: ${{env.CONTAINER_REGISTRY_USER}}
         DOCKER_PASS: ${{secrets.DOCKER_PASSWORD}}
       with:
-        destination_container_repo: dnlbauer/pdfact-service
+        destination_container_repo: ${{env.CONTAINER_REGISTRY_USER}}/${{env.IMAGE_NAME}}
         provider: dockerhub
         short_description: 'Analyze pdf files with pdfact using a simple web API.'
         readme_file: 'README.md'