diff --git a/ci/install-ci-hub/kustomization.yaml b/ci/install-ci-hub/kustomization.yaml
index 349617ccd..4b18f7771 100644
--- a/ci/install-ci-hub/kustomization.yaml
+++ b/ci/install-ci-hub/kustomization.yaml
@@ -32,7 +32,7 @@ patches:
     apiVersion: apps/v1
     kind: Deployment
     metadata:
-      name: webhook-server
+      name: webhook
       namespace: system
     spec:
       template:
diff --git a/ci/install-ci/kustomization.yaml b/ci/install-ci/kustomization.yaml
index 90fdcba72..7da4dae57 100644
--- a/ci/install-ci/kustomization.yaml
+++ b/ci/install-ci/kustomization.yaml
@@ -35,7 +35,7 @@ patches:
     apiVersion: apps/v1
     kind: Deployment
     metadata:
-      name: webhook-server
+      name: webhook
       namespace: system
     spec:
       template:
diff --git a/ci/prow/e2e-hub-spoke-incluster-build b/ci/prow/e2e-hub-spoke-incluster-build
index 95f9953b7..bf854f094 100755
--- a/ci/prow/e2e-hub-spoke-incluster-build
+++ b/ci/prow/e2e-hub-spoke-incluster-build
@@ -51,9 +51,9 @@ make deploy deploy-hub
 
 kubectl wait --for=condition=Available -n ${OPERATOR_NAMESPACE} \
   deployment/kmm-operator-hub-controller \
-  deployment/kmm-operator-hub-webhook-server \
+  deployment/kmm-operator-hub-webhook \
   deployment/kmm-operator-controller \
-  deployment/kmm-operator-webhook-server \
+  deployment/kmm-operator-webhook \
 
 # Make the ManagedCluster selected by the ManagedClusterModule
 kubectl label managedcluster minikube name=minikube
diff --git a/ci/prow/e2e-incluster-build b/ci/prow/e2e-incluster-build
index 85b123f37..8830a5220 100755
--- a/ci/prow/e2e-incluster-build
+++ b/ci/prow/e2e-incluster-build
@@ -33,7 +33,7 @@ kubectl apply -f ci/kmm-kmod-dockerfile.yaml
 echo "Add Secrets containing the signing key and certificate..."
 kubectl apply -f ci/secret_kmm-kmod-signing.yaml
 
-kubectl wait --for=condition=Available deployment/kmm-operator-controller deployment/kmm-operator-webhook-server -n kmm-operator-system
+kubectl wait --for=condition=Available deployment/kmm-operator-controller deployment/kmm-operator-webhook -n kmm-operator-system
 
 echo "Add an kmm-ci Module that contains a valid mapping..."
 kubectl apply -f ci/module-kmm-ci-build-sign.yaml
diff --git a/ci/prow/operator-upgrade b/ci/prow/operator-upgrade
index bfbd4ffa4..0fef5f2f9 100755
--- a/ci/prow/operator-upgrade
+++ b/ci/prow/operator-upgrade
@@ -47,5 +47,5 @@ make bundle bundle-build bundle-push \
     --timeout 5m0s
 kubectl wait --for=condition=Available -n operators --timeout=1m \
     deployment/kmm-operator-controller \
-    deployment/kmm-operator-webhook-server
+    deployment/kmm-operator-webhook
 
diff --git a/config/deploy-hub/kustomization.yaml b/config/deploy-hub/kustomization.yaml
index 4bef84c05..cb6fbac7b 100644
--- a/config/deploy-hub/kustomization.yaml
+++ b/config/deploy-hub/kustomization.yaml
@@ -15,7 +15,7 @@ resources:
 patches:
 - target:
     kind: Deployment
-    name: webhook-server
+    name: webhook
   patch: |-
     - op: add
       path: /spec/template/spec/containers/0/args/-
diff --git a/config/deploy/kustomization.yaml b/config/deploy/kustomization.yaml
index 0c2e5296c..b99a682b7 100644
--- a/config/deploy/kustomization.yaml
+++ b/config/deploy/kustomization.yaml
@@ -15,7 +15,7 @@ resources:
 patches:
 - target:
     kind: Deployment
-    name: webhook-server
+    name: webhook
   patch: |-
     - op: add
       path: /spec/template/spec/containers/0/args/-
diff --git a/config/webhook-cert/kustomization.yaml b/config/webhook-cert/kustomization.yaml
index d43877bde..493fd40b2 100644
--- a/config/webhook-cert/kustomization.yaml
+++ b/config/webhook-cert/kustomization.yaml
@@ -12,7 +12,7 @@ patches:
     apiVersion: apps/v1
     kind: Deployment
     metadata:
-      name: webhook-server
+      name: webhook
       namespace: system
     spec:
       template:
diff --git a/config/webhook-server/deployment.yaml b/config/webhook-server/deployment.yaml
index d01bf3286..ab59a6305 100644
--- a/config/webhook-server/deployment.yaml
+++ b/config/webhook-server/deployment.yaml
@@ -2,7 +2,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: webhook-server
+  name: webhook
   namespace: system
   labels:
     control-plane: webhook-server
diff --git a/docs/mkdocs/documentation/troubleshooting.md b/docs/mkdocs/documentation/troubleshooting.md
index 2cd9d59a5..21fa8e2c3 100644
--- a/docs/mkdocs/documentation/troubleshooting.md
+++ b/docs/mkdocs/documentation/troubleshooting.md
@@ -15,8 +15,8 @@ In the commands below, the value of `$namespace` depends on your [installation m
 
 | Component | Command                                                                     |
 |-----------|-----------------------------------------------------------------------------|
-| KMM       | `kubectl logs -fn "$namespace" deployments/kmm-operator-webhook-server`     |
-| KMM-Hub   | `kubectl logs -fn "$namespace" deployments/kmm-operator-hub-webhook-server` |
+| KMM       | `kubectl logs -fn "$namespace" deployments/kmm-operator-webhook`     |
+| KMM-Hub   | `kubectl logs -fn "$namespace" deployments/kmm-operator-hub-webhook` |
 
 ## Observing events