diff --git a/charts/aws-vpc-cni/Chart.yaml b/charts/aws-vpc-cni/Chart.yaml
index 6e6badf2b2..1fa7fa63df 100644
--- a/charts/aws-vpc-cni/Chart.yaml
+++ b/charts/aws-vpc-cni/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: aws-vpc-cni
-version: 1.1.5
-appVersion: "v1.7.5"
+version: 1.1.7
+appVersion: "v1.8.0"
 description: A Helm chart for the AWS VPC CNI
 icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
 home: https://github.com/aws/amazon-vpc-cni-k8s
diff --git a/charts/aws-vpc-cni/templates/daemonset.yaml b/charts/aws-vpc-cni/templates/daemonset.yaml
index b66f3cbeed..ebe61e9633 100644
--- a/charts/aws-vpc-cni/templates/daemonset.yaml
+++ b/charts/aws-vpc-cni/templates/daemonset.yaml
@@ -121,10 +121,10 @@ spec:
         configMap:
           name: {{ include "aws-vpc-cni.fullname" . }}
 {{- end }}
-{{- if .Values.cri.hostPath }}
+{{- with .Values.cri.hostPath }}
       - name: cri
         hostPath:
-          path: {{- toYaml .Values.cri.hostPath | nindent 18 }}
+          {{- toYaml . | nindent 10 }}
 {{- else }}
       - name: dockershim
         hostPath:
diff --git a/charts/aws-vpc-cni/values.yaml b/charts/aws-vpc-cni/values.yaml
index 108204b95d..7231818140 100644
--- a/charts/aws-vpc-cni/values.yaml
+++ b/charts/aws-vpc-cni/values.yaml
@@ -8,7 +8,7 @@ nameOverride: aws-node
 
 init:
   image:
-    tag: v1.7.5
+    tag: v1.8.0
     region: us-west-2
     pullPolicy: Always
     # Set to use custom image
@@ -20,7 +20,7 @@ init:
 
 image:
   region: us-west-2
-  tag: v1.7.5
+  tag: v1.8.0
   pullPolicy: Always
   # Set to use custom image
   # override: "repo/org/image:tag"
@@ -49,7 +49,7 @@ env:
 # You can then annotate and label the original aws-node resources and 'adopt' them into a helm release
 originalMatchLabels: false
 
-cniConfig: 
+cniConfig:
   enabled: false
   fileContents: ""