diff --git a/manifests/base/webhook/manifests.yaml b/manifests/base/webhook/manifests.yaml
index def2a79962..721773af05 100644
--- a/manifests/base/webhook/manifests.yaml
+++ b/manifests/base/webhook/manifests.yaml
@@ -10,9 +10,9 @@ webhooks:
     service:
       name: webhook-service
       namespace: system
-      path: /validate-trainer-v1alpha1-clustertrainingruntime
+      path: /validate-trainer-kubeflow-org-v1alpha1-clustertrainingruntime
   failurePolicy: Fail
-  name: validator.clustertrainingruntime.kubeflow.org
+  name: validator.clustertrainingruntime.trainer.kubeflow.org
   rules:
   - apiGroups:
     - trainer.kubeflow.org
@@ -30,9 +30,9 @@ webhooks:
     service:
       name: webhook-service
       namespace: system
-      path: /validate-trainer-v1alpha1-trainingruntime
+      path: /validate-trainer-kubeflow-org-v1alpha1-trainingruntime
   failurePolicy: Fail
-  name: validator.trainingruntime.kubeflow.org
+  name: validator.trainingruntime.trainer.kubeflow.org
   rules:
   - apiGroups:
     - trainer.kubeflow.org
@@ -50,9 +50,9 @@ webhooks:
     service:
       name: webhook-service
       namespace: system
-      path: /validate-trainer-v1alpha1-trainjob
+      path: /validate-trainer-kubeflow-org-v1alpha1-trainjob
   failurePolicy: Fail
-  name: validator.trainjob.kubeflow.org
+  name: validator.trainjob.trainer.kubeflow.org
   rules:
   - apiGroups:
     - trainer.kubeflow.org
diff --git a/pkg/webhooks/clustertrainingruntime_webhook.go b/pkg/webhooks/clustertrainingruntime_webhook.go
index dd938a5144..6d1780e748 100644
--- a/pkg/webhooks/clustertrainingruntime_webhook.go
+++ b/pkg/webhooks/clustertrainingruntime_webhook.go
@@ -40,7 +40,7 @@ func setupWebhookForClusterTrainingRuntime(mgr ctrl.Manager, run map[string]runt
 		Complete()
 }
 
-// +kubebuilder:webhook:path=/validate-trainer-v1alpha1-clustertrainingruntime,mutating=false,failurePolicy=fail,sideEffects=None,groups=trainer.kubeflow.org,resources=clustertrainingruntimes,verbs=create;update,versions=v1alpha1,name=validator.clustertrainingruntime.kubeflow.org,admissionReviewVersions=v1
+// +kubebuilder:webhook:path=/validate-trainer-kubeflow-org-v1alpha1-clustertrainingruntime,mutating=false,failurePolicy=fail,sideEffects=None,groups=trainer.kubeflow.org,resources=clustertrainingruntimes,verbs=create;update,versions=v1alpha1,name=validator.clustertrainingruntime.trainer.kubeflow.org,admissionReviewVersions=v1
 
 var _ webhook.CustomValidator = (*ClusterTrainingRuntimeWebhook)(nil)
 
diff --git a/pkg/webhooks/trainingruntime_webhook.go b/pkg/webhooks/trainingruntime_webhook.go
index 45b39940a6..e0edf99f8a 100644
--- a/pkg/webhooks/trainingruntime_webhook.go
+++ b/pkg/webhooks/trainingruntime_webhook.go
@@ -42,7 +42,7 @@ func setupWebhookForTrainingRuntime(mgr ctrl.Manager, run map[string]runtime.Run
 		Complete()
 }
 
-// +kubebuilder:webhook:path=/validate-trainer-v1alpha1-trainingruntime,mutating=false,failurePolicy=fail,sideEffects=None,groups=trainer.kubeflow.org,resources=trainingruntimes,verbs=create;update,versions=v1alpha1,name=validator.trainingruntime.kubeflow.org,admissionReviewVersions=v1
+// +kubebuilder:webhook:path=/validate-trainer-kubeflow-org-v1alpha1-trainingruntime,mutating=false,failurePolicy=fail,sideEffects=None,groups=trainer.kubeflow.org,resources=trainingruntimes,verbs=create;update,versions=v1alpha1,name=validator.trainingruntime.trainer.kubeflow.org,admissionReviewVersions=v1
 
 var _ webhook.CustomValidator = (*TrainingRuntimeWebhook)(nil)
 
diff --git a/pkg/webhooks/trainjob_webhook.go b/pkg/webhooks/trainjob_webhook.go
index 8723058008..935fba213d 100644
--- a/pkg/webhooks/trainjob_webhook.go
+++ b/pkg/webhooks/trainjob_webhook.go
@@ -39,7 +39,7 @@ func setupWebhookForTrainJob(mgr ctrl.Manager, run map[string]runtime.Runtime) e
 		Complete()
 }
 
-// +kubebuilder:webhook:path=/validate-trainer-v1alpha1-trainjob,mutating=false,failurePolicy=fail,sideEffects=None,groups=trainer.kubeflow.org,resources=trainjobs,verbs=create;update,versions=v1alpha1,name=validator.trainjob.kubeflow.org,admissionReviewVersions=v1
+// +kubebuilder:webhook:path=/validate-trainer-kubeflow-org-v1alpha1-trainjob,mutating=false,failurePolicy=fail,sideEffects=None,groups=trainer.kubeflow.org,resources=trainjobs,verbs=create;update,versions=v1alpha1,name=validator.trainjob.trainer.kubeflow.org,admissionReviewVersions=v1
 
 var _ webhook.CustomValidator = (*TrainJobWebhook)(nil)