diff --git a/charts/virtual-kubelet/templates/deployment.yaml b/charts/virtual-kubelet/templates/deployment.yaml
index ceb5930ec..f3ae1bf26 100644
--- a/charts/virtual-kubelet/templates/deployment.yaml
+++ b/charts/virtual-kubelet/templates/deployment.yaml
@@ -14,6 +14,8 @@ spec:
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         env:
+        - name: KUBELET_PORT
+          value: "10250"
         - name: AZURE_AUTH_LOCATION
           value: /etc/virtual-kubelet/credentials.json
         - name: ACI_RESOURCE_GROUP
diff --git a/vkubelet/apiserver.go b/vkubelet/apiserver.go
index 2fce034e8..f3ddd0711 100644
--- a/vkubelet/apiserver.go
+++ b/vkubelet/apiserver.go
@@ -1,6 +1,7 @@
 package vkubelet
 
 import (
+	"fmt"
 	"io"
 	"log"
 	"net/http"
@@ -9,16 +10,17 @@ import (
 )
 var p Provider
 
-func ApiserverStart(provider Provider) error {
+func ApiserverStart(provider Provider) {
 	p = provider
 	http.HandleFunc("/", ApiServerHandler)
 	certFilePath := os.Getenv("APISERVER_CERT_LOCATION")
 	keyFilePath := os.Getenv("APISERVER_KEY_LOCATION")
-	err := http.ListenAndServeTLS(":10250", certFilePath, keyFilePath, nil)
+	port := os.Getenv("KUBELET_PORT")
+	addr := fmt.Sprintf(":%s", port)
+	err := http.ListenAndServeTLS(addr, certFilePath, keyFilePath, nil)
 	if err != nil {
-		log.Fatal(err)
+		log.Println(err)
 	}
-	return err
 }
 
 func ApiServerHandler(w http.ResponseWriter, req *http.Request) {
@@ -32,7 +34,7 @@ func ApiServerHandler(w http.ResponseWriter, req *http.Request) {
 				podsLogs, err := p.GetContainerLogs(namespace, pod, container)
 				if err != nil {
 					io.WriteString(w, err.Error())
-					log.Fatal(err)
+					log.Println(err)
 				} else {
 					io.WriteString(w, podsLogs)
 				}