diff --git a/charts/virtual-kubelet-0.1.3.tgz b/charts/virtual-kubelet-0.1.3.tgz
new file mode 100644
index 000000000..7ec58eb1f
Binary files /dev/null and b/charts/virtual-kubelet-0.1.3.tgz differ
diff --git a/charts/virtual-kubelet-for-aks-0.1.6.tgz b/charts/virtual-kubelet-for-aks-0.1.6.tgz
new file mode 100644
index 000000000..bd6d9be1a
Binary files /dev/null and b/charts/virtual-kubelet-for-aks-0.1.6.tgz differ
diff --git a/charts/virtual-kubelet-for-aks-latest.tgz b/charts/virtual-kubelet-for-aks-latest.tgz
index 30a8e85ad..bd6d9be1a 100644
Binary files a/charts/virtual-kubelet-for-aks-latest.tgz and b/charts/virtual-kubelet-for-aks-latest.tgz differ
diff --git a/charts/virtual-kubelet-for-aks/Chart.yaml b/charts/virtual-kubelet-for-aks/Chart.yaml
index 75338af14..ca157f8e3 100644
--- a/charts/virtual-kubelet-for-aks/Chart.yaml
+++ b/charts/virtual-kubelet-for-aks/Chart.yaml
@@ -1,5 +1,5 @@
 name: virtual-kubelet-for-aks
-version: 0.1.5
+version: 0.1.6
 description: a Helm chart to install virtual kubelet in an AKS or ACS cluster.
 sources:
   - https://github.com/virtual-kubelet/virtual-kubelet
diff --git a/charts/virtual-kubelet-for-aks/templates/NOTES.txt b/charts/virtual-kubelet-for-aks/templates/NOTES.txt
index 8a27ac8e2..94a7e22b8 100644
--- a/charts/virtual-kubelet-for-aks/templates/NOTES.txt
+++ b/charts/virtual-kubelet-for-aks/templates/NOTES.txt
@@ -2,4 +2,11 @@ The virtual kubelet is getting deployed on your cluster.
 
 To verify that virtual kubelet has started, run:
 
-  kubectl --namespace={{ .Release.Namespace }} get pods -l "app={{ template "fullname" . }}"
\ No newline at end of file
+  kubectl --namespace={{ .Release.Namespace }} get pods -l "app={{ template "fullname" . }}"
+
+{{- if (not .Values.env.apiserverCert) and (not .Values.env.apiserverKey) }}
+
+Note: 
+TLS key pair not provided for VK HTTP listener. A key pair was generated for you. This generated key pair is not suitable for production use.
+
+{{- end }}
\ No newline at end of file
diff --git a/charts/virtual-kubelet-for-aks/templates/secrets.yaml b/charts/virtual-kubelet-for-aks/templates/secrets.yaml
index 46252b3e0..26e616500 100644
--- a/charts/virtual-kubelet-for-aks/templates/secrets.yaml
+++ b/charts/virtual-kubelet-for-aks/templates/secrets.yaml
@@ -4,6 +4,16 @@ metadata:
   name: {{ template "fullname" . }}
 type: Opaque
 data:
-  cert.pem: {{ (default "TUlTU0lORw==" .Values.env.apiserverCert) | quote }}
-  key.pem: {{ (default "TUlTU0lORw==" .Values.env.apiserverKey) | quote }}
-  clientSecret: {{ default "" .Values.env.azureClientKey | b64enc | quote }}
+  {{- if (not .Values.env.apiserverCert) and (not .Values.env.apiserverKey) }}
+  {{- $ca := genCA "virtual-kubelet-ca" 3650 }}
+  {{- $cn := printf "%s-virtual-kubelet-apiserver" .Release.Name }}
+  {{- $altName1 := printf "%s-virtual-kubelet-apiserver.%s" .Release.Name .Release.Namespace }}
+  {{- $altName2 := printf "%s-virtual-kubelet-apiserver.%s.svc" .Release.Name .Release.Namespace }}
+  {{- $cert := genSignedCert $cn nil (list $altName1 $altName2) 3650 $ca }}
+  cert.pem: {{ b64enc $cert.Cert }}
+  key.pem: {{ b64enc $cert.Key }}
+  {{ else }}
+  cert.pem: {{ quote .Values.env.apiserverCert }}
+  key.pem: {{ quote .Values.env.apiserverKey }}
+  {{ end}}
+  clientSecret: {{ default "" .Values.env.azureClientKey | b64enc | quote }}
\ No newline at end of file
diff --git a/charts/virtual-kubelet-latest.tgz b/charts/virtual-kubelet-latest.tgz
index 87a37df24..7ec58eb1f 100644
Binary files a/charts/virtual-kubelet-latest.tgz and b/charts/virtual-kubelet-latest.tgz differ
diff --git a/charts/virtual-kubelet/Chart.yaml b/charts/virtual-kubelet/Chart.yaml
index 1542a2e5f..1ff43f4be 100644
--- a/charts/virtual-kubelet/Chart.yaml
+++ b/charts/virtual-kubelet/Chart.yaml
@@ -1,5 +1,5 @@
 name: virtual-kubelet
-version: 0.1.2
+version: 0.1.3
 description: a Helm chart to install virtual kubelet inside a Kubernetes cluster.
 sources:
   - https://github.com/virtual-kubelet/virtual-kubelet
diff --git a/charts/virtual-kubelet/templates/NOTES.txt b/charts/virtual-kubelet/templates/NOTES.txt
index 7d7983c02..dd159ca76 100644
--- a/charts/virtual-kubelet/templates/NOTES.txt
+++ b/charts/virtual-kubelet/templates/NOTES.txt
@@ -19,3 +19,10 @@ To update, run:
     --set env.azureClientId=<YOUR-AZURECLIENTID-HERE>,env.azureClientKey=<YOUR-AZURECLIENTKEY-HERE>,env.azureTenantId=<YOUR-AZURETENANTID-HERE>,env.azureSubscriptionId=<YOUR-AZURESUBSCRIPTIONID-HERE>,env.aciResourceGroup=<YOUR-ACIRESOURCEGROUP-HERE>,ev.aciOsType=<Linux|Windows>,rbac.install=<false|true>
 
 {{- end }}
+
+{{- if (not .Values.env.apiserverCert) and (not .Values.env.apiserverKey) }}
+
+Note: 
+TLS key pair not provided for VK HTTP listener. A key pair was generated for you. This generated key pair is not suitable for production use.
+
+{{- end }}
\ No newline at end of file
diff --git a/charts/virtual-kubelet/templates/secrets.yaml b/charts/virtual-kubelet/templates/secrets.yaml
index bb25d6d74..2231caf6c 100644
--- a/charts/virtual-kubelet/templates/secrets.yaml
+++ b/charts/virtual-kubelet/templates/secrets.yaml
@@ -5,8 +5,18 @@ metadata:
 type: Opaque
 data:
   credentials.json: {{ printf "{ \"clientId\": \"%s\", \"clientSecret\": \"%s\", \"subscriptionId\": \"%s\", \"tenantId\": \"%s\", \"activeDirectoryEndpointUrl\": \"https://login.microsoftonline.com/\", \"resourceManagerEndpointUrl\": \"https://management.azure.com/\", \"activeDirectoryGraphResourceId\": \"https://graph.windows.net/\", \"sqlManagementEndpointUrl\": \"database.windows.net\", \"galleryEndpointUrl\": \"https://gallery.azure.com/\", \"managementEndpointUrl\": \"https://management.core.windows.net/\" }" (default "MISSING" .Values.env.azureClientId) (default "MISSING" .Values.env.azureClientKey) (default "MISSING" .Values.env.azureSubscriptionId) (default "MISSING" .Values.env.azureTenantId) | b64enc | quote }}
-  cert.pem: {{ (default "TUlTU0lORw==" .Values.env.apiserverCert) | quote }}
-  key.pem: {{ (default "TUlTU0lORw==" .Values.env.apiserverKey) | quote }}
+  {{- if (not .Values.env.apiserverCert) and (not .Values.env.apiserverKey) }}
+  {{- $ca := genCA "virtual-kubelet-ca" 3650 }}
+  {{- $cn := printf "%s-virtual-kubelet-apiserver" .Release.Name }}
+  {{- $altName1 := printf "%s-virtual-kubelet-apiserver.%s" .Release.Name .Release.Namespace }}
+  {{- $altName2 := printf "%s-virtual-kubelet-apiserver.%s.svc" .Release.Name .Release.Namespace }}
+  {{- $cert := genSignedCert $cn nil (list $altName1 $altName2) 3650 $ca }}
+  cert.pem: {{ b64enc $cert.Cert }}
+  key.pem: {{ b64enc $cert.Key }}
+  {{ else }}
+  cert.pem: {{ quote .Values.env.apiserverCert }}
+  key.pem: {{ quote .Values.env.apiserverKey }}
+  {{ end}}
   {{ if .Values.loganalytics.enabled }}
   loganalytics.json: {{ printf "{\"workspaceID\": \"%s\",\"workspaceKey\": \"%s\"}" (required "workspaceID is required for loganalytics" .Values.loganalytics.workspaceID ) (required "workspaceKey is required for loganalytics" .Values.loganalytics.workspaceKey ) }}
   {{ end }}