diff --git a/charts/inbox-agent/templates/operator/deployment.yaml b/charts/inbox-agent/templates/operator/deployment.yaml
index 54ade6d..0086a92 100644
--- a/charts/inbox-agent/templates/operator/deployment.yaml
+++ b/charts/inbox-agent/templates/operator/deployment.yaml
@@ -57,12 +57,18 @@ spec:
         securityContext:
           {{- toYaml .Values.operator.securityContext | nindent 10 }}
         args:
-          - operator
-          - --v={{ .Values.logLevel }}
-          - --secure-port=8443
-          - --audit-log-path=-
-          - --tls-cert-file=/var/serving-cert/tls.crt
-          - --tls-private-key-file=/var/serving-cert/tls.key
+        - operator
+        - --v={{ .Values.logLevel }}
+        - --secure-port=8443
+        - --audit-log-path=-
+        - --tls-cert-file=/var/serving-cert/tls.crt
+        - --tls-private-key-file=/var/serving-cert/tls.key
+      {{- if .Values.inboxServer.jmapEndpoint }}
+        - --jmapEndpoint={{ .Values.inboxServer.jmapEndpoint }}
+      {{- end }}
+      {{- if .Values.inboxServer.webadminEndpoint }}
+        - --webadminEndpoint={{ .Values.inboxServer.webadminEndpoint }}
+      {{- end }}
         ports:
         - containerPort: 8443
         env:
diff --git a/charts/inbox-agent/templates/webhook/deployment.yaml b/charts/inbox-agent/templates/webhook/deployment.yaml
index 5821ae4..dfb3c61 100644
--- a/charts/inbox-agent/templates/webhook/deployment.yaml
+++ b/charts/inbox-agent/templates/webhook/deployment.yaml
@@ -58,8 +58,14 @@ spec:
         securityContext:
           {{- toYaml .Values.operator.securityContext | nindent 10 }}
         args:
-          - webhook
-          - --webhook-name={{ include "inbox-agent.fullname" . }}
+        - webhook
+        - --webhook-name={{ include "inbox-agent.fullname" . }}
+      {{- if .Values.inboxServer.jmapEndpoint }}
+        - --jmapEndpoint={{ .Values.inboxServer.jmapEndpoint }}
+      {{- end }}
+      {{- if .Values.inboxServer.webadminEndpoint }}
+        - --webadminEndpoint={{ .Values.inboxServer.webadminEndpoint }}
+      {{- end }}
         env:
         - name: POD_NAME
           valueFrom: