diff --git a/lib/dockerregistry/manifests.go b/lib/dockerregistry/manifests.go
index 4e9643c46..b2c5c3f06 100644
--- a/lib/dockerregistry/manifests.go
+++ b/lib/dockerregistry/manifests.go
@@ -118,8 +118,8 @@ func (t *manifests) getDigest(path string, subtype PathSubType) ([]byte, error)
 //   - (false, err) on verification errors or unknown decisions.
 //
 // Logging
-//   - Error on verification error (includes repo/digest).
-//   - Warn  on deny (includes original path).
+//   - Error on verification error.
+//   - Warn  on deny.
 //   - Debug on skip.
 func (t *manifests) verify(
 	path string,
@@ -127,9 +127,10 @@ func (t *manifests) verify(
 	digest core.Digest,
 	blob store.FileReader,
 ) (bool, error) {
+	l := log.With("path", path, "repo", repo, "digest", digest)
 	decision, err := t.verification(repo, digest, blob)
 	if err != nil {
-		log.With("repo", repo, "digest", digest).Errorf("Error while performing image validation %s", err)
+		l.With("error", err).Error("Error while performing image validation")
 		return false, err
 	}
 
@@ -137,10 +138,10 @@ func (t *manifests) verify(
 	case DecisionAllow:
 		return true, nil
 	case DecisionDeny:
-		log.With("repo", repo, "digest", digest).Warnf("Verification failed %s", path)
+		l.Warn("Verification failed")
 		return false, nil
 	case DecisionSkip:
-		log.With("repo", repo, "digest", digest).Debugf("Verification skipped for %s", path)
+		l.Debug("Verification skipped")
 		return true, nil
 	default:
 		return false, fmt.Errorf("unknown verification decision: %d", decision)
diff --git a/utils/handler/handler.go b/utils/handler/handler.go
index 4e9e7bde7..e6883664e 100644
--- a/utils/handler/handler.go
+++ b/utils/handler/handler.go
@@ -91,13 +91,18 @@ func Wrap(h ErrHandler) http.HandlerFunc {
 			}
 			w.WriteHeader(status)
 			if _, err := w.Write([]byte(errMsg)); err != nil {
-				log.Errorf("Failed to write error response: %s", err)
+				log.With("error", err).Error("Failed to write error response")
 			}
 		} else {
 			status = http.StatusOK
 		}
 		if status >= 400 && status != 404 {
-			log.Infof("%d %s %s %s", status, r.Method, r.URL.Path, errMsg)
+			log.With(
+				"status", status,
+				"method", r.Method,
+				"path", r.URL.Path,
+				"error", errMsg,
+			).Info("Handler returned error response")
 		}
 	}
 }