diff --git a/charts/kubevpn/templates/configmap.yaml b/charts/kubevpn/templates/configmap.yaml
index 0a6976f4..9909f0d5 100644
--- a/charts/kubevpn/templates/configmap.yaml
+++ b/charts/kubevpn/templates/configmap.yaml
@@ -4,8 +4,15 @@ metadata:
   name: {{ include "kubevpn.fullname" . }}
   namespace: {{ include "kubevpn.namespace" . }}
 data:
+  {{- $existingConfigmap := (lookup "v1" "ConfigMap" (include "kubevpn.namespace" .) (include "kubevpn.fullname" .)) }}
+  {{- if $existingConfigmap }}
+    {{- range $key, $value := $existingConfigmap.data }}
+  {{ $key }}: {{ $value | quote }}
+    {{- end }}
+  {{- else }}
   DHCP: ""
   DHCP6: ""
   ENVOY_CONFIG: ""
   IPv4_POOLS: "{{ .Values.cidr.pod }} {{ .Values.cidr.service }}"
   REF_COUNT: "0"
+  {{- end }}
\ No newline at end of file
diff --git a/charts/kubevpn/templates/mutatingwebhookconfiguration.yaml b/charts/kubevpn/templates/mutatingwebhookconfiguration.yaml
index dfb13830..faef6daa 100644
--- a/charts/kubevpn/templates/mutatingwebhookconfiguration.yaml
+++ b/charts/kubevpn/templates/mutatingwebhookconfiguration.yaml
@@ -8,7 +8,12 @@ webhooks:
       - v1
       - v1beta1
     clientConfig:
+      {{- $secret := (lookup "v1" "Secret" (include "kubevpn.namespace" .) (include "kubevpn.fullname" .)) }}
+      {{- if $secret }}
+      caBundle: {{ index $secret.data "tls_crt"  }}
+      {{- else }}
       caBundle: {{ .Values.tls.crt }}
+      {{- end }}
       service:
         name: {{ include "kubevpn.fullname" . }}
         namespace: {{ include "kubevpn.namespace" . }}
diff --git a/charts/kubevpn/templates/secret.yaml b/charts/kubevpn/templates/secret.yaml
index b7d939dc..a46930cb 100644
--- a/charts/kubevpn/templates/secret.yaml
+++ b/charts/kubevpn/templates/secret.yaml
@@ -4,7 +4,16 @@ metadata:
   name: {{ include "kubevpn.fullname" . }}
   namespace: {{ include "kubevpn.namespace" . }}
 type: Opaque
+{{- $secret := (lookup "v1" "Secret" (include "kubevpn.namespace" .) (include "kubevpn.fullname" .)) }}
+{{- if $secret }}
+data:
+  {{- range $key, $value := $secret.data }}
+  {{ $key }}: {{ $value | quote }}
+  {{- end }}
+{{- else }}
 stringData:
   tls_crt: {{ .Values.tls.crt }}
   tls_key: {{ .Values.tls.key }}
   tls_server_name: {{ include "kubevpn.fullname" . }}.{{ include "kubevpn.namespace" . }}
+{{- end }}
+