diff --git a/charts/metrics-server/Chart.yaml b/charts/metrics-server/Chart.yaml
index c18068656..449f5d48a 100644
--- a/charts/metrics-server/Chart.yaml
+++ b/charts/metrics-server/Chart.yaml
@@ -33,9 +33,5 @@ annotations:
       description: "Added ability to set the scheduler name."
     - kind: added
       description: "Added support for common labels."
-    - kind: changed
-      description: "Changed default secure port to 10250."
-    - kind: changed
-      description: "Updated registry location to registry.k8s.io."
     - kind: changed
       description: "Updated Metrics Server image to v0.6.2."
diff --git a/charts/metrics-server/README.md b/charts/metrics-server/README.md
index 6fbe8b843..ba75e8e90 100644
--- a/charts/metrics-server/README.md
+++ b/charts/metrics-server/README.md
@@ -37,7 +37,7 @@ The following table lists the configurable parameters of the _Metrics Server_ ch
 | `rbac.create`                        | If `true`, create the RBAC resources.                                                                                                                                                                                                                            | `true`                                     |
 | `rbac.pspEnabled`                    | If `true`, create a pod security policy resource.                                                                                                                                                                                                                | `false`                                    |
 | `apiService.create`                  | If `true`, create the `v1beta1.metrics.k8s.io` API service. You typically want this enabled! If you disable API service creation you have to manage it outside of this chart for e.g horizontal pod autoscaling to work with this release.                       | `true`                                     |
-| `apiService.annotations`             | Annotations to add to the API service                                                                                                                                                                                                                            | `{}`                                       |
+| `apiService.annotations`             | Annotations to add to the API service.                                                                                                                                                                                                                           | `{}`                                       |
 | `apiService.insecureSkipTLSVerify`   | Specifies whether to skip TLS verification                                                                                                                                                                                                                       | `true`                                     |
 | `apiService.caBundle`                | The PEM encoded CA bundle for TLS verification                                                                                                                                                                                                                   | `""`                                       |
 | `commonLabels`                       | Labels to add to each object of the chart.                                                                                                                                                                                                                       | `{}`                                       |
diff --git a/skaffold.yaml b/skaffold.yaml
index 67863002a..340cb82c7 100644
--- a/skaffold.yaml
+++ b/skaffold.yaml
@@ -7,32 +7,38 @@ build:
     useDockerCLI: true
     useBuildkit: true
   artifacts:
-  - image: gcr.io/k8s-staging-metrics-server/metrics-server
-    docker:
-      dockerfile: Dockerfile
-      buildArgs:
-        ARCH: "amd64"
-        GIT_TAG: "devel"
-deploy:
-  kustomize:
-    paths:
-    - manifests/test
+    - image: gcr.io/k8s-staging-metrics-server/metrics-server
+      docker:
+        dockerfile: Dockerfile
+        buildArgs:
+          ARCH: "amd64"
+          GIT_TAG: "devel"
+
 profiles:
+  - name: test
+    deploy:
+      kustomize:
+        paths:
+          - manifests/test
   - name: test-ha
     deploy:
       kustomize:
         paths:
-        - manifests/test-ha
+          - manifests/test-ha
   - name: helm
     deploy:
       helm:
         releases:
           - name: metrics-server
+            namespace: kube-system
             artifactOverrides:
               imageKey: gcr.io/k8s-staging-metrics-server/metrics-server
             chartPath: charts/metrics-server
             setValueTemplates:
               image.repository: "{{.IMAGE_REPO}}"
               image.tag: "{{.IMAGE_TAG}}"
+            setValues:
+              podLabels: { k8s-app: metrics-server }
+              containerPort: 4443
             valuesFiles:
               - charts/metrics-server/ci/ci-values.yaml
diff --git a/test/test-e2e.sh b/test/test-e2e.sh
index c3dd4eaa0..6c9913c40 100755
--- a/test/test-e2e.sh
+++ b/test/test-e2e.sh
@@ -3,12 +3,12 @@
 set -e
 
 : ${NODE_IMAGE:?Need to set NODE_IMAGE to test}
-: ${SKAFFOLD_PROFILE:-""}
+: ${SKAFFOLD_PROFILE:="test"}
 
 
 KIND_VERSION=0.14.0
 SKAFFOLD_VERSION=1.38.0
-HELM_VERSION=3.7.1
+HELM_VERSION=3.10.2
 
 delete_cluster() {
   ${KIND} delete cluster --name=e2e &> /dev/null || true
@@ -22,9 +22,10 @@ setup_helm() {
   if ! [[ $(${HELM} version |grep Version |awk -F'Version:' '{print $2}' |awk -F',' '{print $1}') == "\"v${HELM_VERSION}\"" ]] ; then
       echo "helm not found or bad version, downloading binary"
       mkdir -p _output
-      wget https://get.helm.sh/helm-v${HELM_VERSION}-linux-amd64.tar.gz
-      tar -zxvf helm-v${HELM_VERSION}-linux-amd64.tar.gz
-      mv linux-amd64/helm _output/helm
+      curl -Lo /tmp/helm.tar.gz "https://get.helm.sh/helm-v${HELM_VERSION}-linux-amd64.tar.gz"
+      tar -xzf /tmp/helm.tar.gz -C /tmp
+      rm -f /tmp/helm.tar.gz
+      mv -f /tmp/linux-amd64/helm _output/helm
       chmod +x _output/helm
       HELM=_output/helm
   fi