diff --git a/charts/kubeware-provider/templates/webhook-server/service.yaml b/charts/kubeware-provider/templates/webhook-server/monitoring/service.yaml
similarity index 82%
rename from charts/kubeware-provider/templates/webhook-server/service.yaml
rename to charts/kubeware-provider/templates/webhook-server/monitoring/service.yaml
index 1c4a8a9..0f5f4d9 100644
--- a/charts/kubeware-provider/templates/webhook-server/service.yaml
+++ b/charts/kubeware-provider/templates/webhook-server/monitoring/service.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "kubeware-provider.webhookServiceName" . }}
+  name: {{ include "kubeware-provider.fullname" . }}
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "kubeware-provider.labels" . | nindent 4 }}
@@ -16,12 +16,11 @@ metadata:
     {{- end }}
   {{- end }}
 spec:
-  selector:
-    app.kubernetes.io/component: webhook-server
-    {{- include "kubeware-provider.selectorLabels" . | nindent 4 }}
   ports:
   - name: https
-    port: 443
+    port: 8443
     protocol: TCP
-    targetPort: 9443
+    targetPort: https
+  selector:
+    {{- include "kubeware-provider.selectorLabels" . | nindent 4 }}
 {{ end }}
diff --git a/charts/kubeware-provider/templates/webhook-server/servicemonitor.yaml b/charts/kubeware-provider/templates/webhook-server/monitoring/servicemonitor.yaml
similarity index 100%
rename from charts/kubeware-provider/templates/webhook-server/servicemonitor.yaml
rename to charts/kubeware-provider/templates/webhook-server/monitoring/servicemonitor.yaml
diff --git a/charts/kubeware-provider/templates/webhook-server/webhook_service.yaml b/charts/kubeware-provider/templates/webhook-server/webhook_service.yaml
new file mode 100644
index 0000000..f3ebe8b
--- /dev/null
+++ b/charts/kubeware-provider/templates/webhook-server/webhook_service.yaml
@@ -0,0 +1,17 @@
+{{- if or .Values.apiserver.enableMutatingWebhook .Values.apiserver.enableValidatingWebhook }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "kubeware-provider.webhookServiceName" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "kubeware-provider.labels" . | nindent 4 }}
+spec:
+  selector:
+    app.kubernetes.io/component: webhook-server
+    {{- include "kubeware-provider.selectorLabels" . | nindent 4 }}
+  ports:
+  - port: 443
+    protocol: TCP
+    targetPort: 9443
+{{ end }}