diff --git a/.github/workflows/build-and-push-docker.yml b/.github/workflows/build-and-push-docker.yml
index ad9f6f315..c5b875e5d 100644
--- a/.github/workflows/build-and-push-docker.yml
+++ b/.github/workflows/build-and-push-docker.yml
@@ -65,8 +65,8 @@ jobs:
           flavor: |
             suffix=${{ matrix.builds.suffix }},onlatest=true
           images: |
-            chrisbenincasa/tunarr
-            ghcr.io/chrisbenincasa/tunarr
+            docker.io/${{ github.repository_owner }}/tunarr
+            ghcr.io/${{ github.repository_owner }}/tunarr
           tags: |
             # Update version tags on proper releases
             type=semver,pattern={{version}}
@@ -81,6 +81,7 @@ jobs:
         uses: docker/setup-buildx-action@v3
 
       - name: Login to DockerHub
+        if: secrets.DOCKERHUB_USERNAME != ''
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
diff --git a/server/src/services/scanner/FileSystemScanner.ts b/server/src/services/scanner/FileSystemScanner.ts
index 99b0a7159..ab7b764e9 100644
--- a/server/src/services/scanner/FileSystemScanner.ts
+++ b/server/src/services/scanner/FileSystemScanner.ts
@@ -278,11 +278,16 @@ export abstract class FileSystemScanner {
       );
       const needsRefresh =
         force ||
+        !existingOfType?.cachePath ||
         !existingOfType?.updatedAt ||
         dayjs
           .duration(dayjs(stat.mtime).diff(existingOfType.updatedAt))
           .asSeconds() > 1;
       if (!needsRefresh) {
+        this.logger.trace(
+          'Artwork up to date; skipping cache refresh (%s)',
+          artworkFilePath,
+        );
         return;
       }