diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 56851d1..7661921 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -16,7 +16,7 @@ jobs:
         id: docker_meta
         uses: crazy-max/ghaction-docker-meta@v2
         with:
-          images: ${{ secrets.DOCKERHUB_USERNAME }}/email2signal,ghcr.io/${{ github.actor }}/email2signal
+          images: ${{ secrets.DOCKERHUB_USERNAME }}/docker-network-graph,ghcr.io/${{ github.repository_owner }}/docker-network-graph
           tags: |
             type=ref,event=branch
             type=semver,pattern={{version}}
@@ -28,6 +28,7 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
       - name: Cache Docker layers
+        if: github.event_name != 'pull_request'
         uses: actions/cache@v2
         with:
           path: /tmp/.buildx-cache
@@ -44,8 +45,8 @@ jobs:
         uses: docker/login-action@v1 
         with:
           registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.CR_PAT }}
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build and push
         uses: docker/build-push-action@v2
         with: