diff --git a/core-services/image-mirroring/knative/mapping_knative_v0_21_quay b/core-services/image-mirroring/knative/mapping_knative_v0_21_quay
index 51ffc12795b97..45277f410dcb0 100644
--- a/core-services/image-mirroring/knative/mapping_knative_v0_21_quay
+++ b/core-services/image-mirroring/knative/mapping_knative_v0_21_quay
@@ -11,17 +11,13 @@ registry.ci.openshift.org/openshift/knative-v0.21.0:knative-eventing-test-record
 registry.ci.openshift.org/openshift/knative-v0.21.0:knative-eventing-test-request-sender quay.io/openshift-knative/request-sender:v0.21.0
 registry.ci.openshift.org/openshift/knative-v0.21.0:knative-eventing-test-request-sender quay.io/openshift-knative/request-sender:v0.21
 registry.ci.openshift.org/openshift/knative-v0.21.0:knative-eventing-test-wathola-fetcher quay.io/openshift-knative/wathola-fetcher:v0.21.0
+registry.ci.openshift.org/openshift/knative-v0.21.0:knative-eventing-test-wathola-fetcher quay.io/openshift-knative/wathola-fetcher:v0.21
 registry.ci.openshift.org/openshift/knative-v0.21.0:knative-eventing-test-wathola-forwarder quay.io/openshift-knative/wathola-forwarder:v0.21.0
+registry.ci.openshift.org/openshift/knative-v0.21.0:knative-eventing-test-wathola-forwarder quay.io/openshift-knative/wathola-forwarder:v0.21
 registry.ci.openshift.org/openshift/knative-v0.21.0:knative-eventing-test-wathola-receiver quay.io/openshift-knative/wathola-receiver:v0.21.0
+registry.ci.openshift.org/openshift/knative-v0.21.0:knative-eventing-test-wathola-receiver quay.io/openshift-knative/wathola-receiver:v0.21
 registry.ci.openshift.org/openshift/knative-v0.21.0:knative-eventing-test-wathola-sender quay.io/openshift-knative/wathola-sender:v0.21.0
-registry.ci.openshift.org/openshift/knative-v0.21.1:knative-eventing-kafka-test-wathola-fetcher quay.io/openshift-knative/wathola-fetcher:v0.21.1
-registry.ci.openshift.org/openshift/knative-v0.21.1:knative-eventing-kafka-test-wathola-fetcher quay.io/openshift-knative/wathola-fetcher:v0.21
-registry.ci.openshift.org/openshift/knative-v0.21.1:knative-eventing-kafka-test-wathola-forwarder quay.io/openshift-knative/wathola-forwarder:v0.21.1
-registry.ci.openshift.org/openshift/knative-v0.21.1:knative-eventing-kafka-test-wathola-forwarder quay.io/openshift-knative/wathola-forwarder:v0.21
-registry.ci.openshift.org/openshift/knative-v0.21.1:knative-eventing-kafka-test-wathola-receiver quay.io/openshift-knative/wathola-receiver:v0.21.1
-registry.ci.openshift.org/openshift/knative-v0.21.1:knative-eventing-kafka-test-wathola-receiver quay.io/openshift-knative/wathola-receiver:v0.21
-registry.ci.openshift.org/openshift/knative-v0.21.1:knative-eventing-kafka-test-wathola-sender quay.io/openshift-knative/wathola-sender:v0.21.1
-registry.ci.openshift.org/openshift/knative-v0.21.1:knative-eventing-kafka-test-wathola-sender quay.io/openshift-knative/wathola-sender:v0.21
+registry.ci.openshift.org/openshift/knative-v0.21.0:knative-eventing-test-wathola-sender quay.io/openshift-knative/wathola-sender:v0.21
 registry.ci.openshift.org/openshift/knative-v0.21.1:knative-eventing-kafka-test-wathola-kafka-sender quay.io/openshift-knative/wathola-kafka-sender:v0.21.1
 registry.ci.openshift.org/openshift/knative-v0.21.1:knative-eventing-kafka-test-wathola-kafka-sender quay.io/openshift-knative/wathola-kafka-sender:v0.21
 registry.ci.openshift.org/openshift/knative-v0.21.0:knative-serving-test-pizzaplanetv2 quay.io/openshift-knative/pizzaplanetv2:v0.21