diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4bc2d03613..278a4b8a36 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## v1.6.4-rc1
+## v1.6.4
 * Bug - [Use docker/CRI to discover pods at node init](https://github.com/aws/amazon-vpc-cni-k8s/pull/1118) (#1118, @fawadkhaliq)
 
 ## v1.6.3
diff --git a/config/v1.6/aws-k8s-cni-cn.yaml b/config/v1.6/aws-k8s-cni-cn.yaml
index b73d5bfefd..a11418def4 100644
--- a/config/v1.6/aws-k8s-cni-cn.yaml
+++ b/config/v1.6/aws-k8s-cni-cn.yaml
@@ -77,6 +77,7 @@ spec:
                     operator: In
                     values:
                       - amd64
+                      - arm64  
                   - key: "eks.amazonaws.com/compute-type"
                     operator: NotIn
                     values:
@@ -86,7 +87,7 @@ spec:
       tolerations:
         - operator: Exists
       containers:
-        - image: 961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni:v1.6.3
+        - image: 961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni:v1.6.4
           imagePullPolicy: Always
           ports:
             - containerPort: 61678
diff --git a/config/v1.6/aws-k8s-cni-us-gov-east-1.yaml b/config/v1.6/aws-k8s-cni-us-gov-east-1.yaml
index 4e2d41eae7..bf8ca1694e 100644
--- a/config/v1.6/aws-k8s-cni-us-gov-east-1.yaml
+++ b/config/v1.6/aws-k8s-cni-us-gov-east-1.yaml
@@ -90,6 +90,7 @@ spec:
                     operator: In
                     values:
                       - amd64
+                      - arm64  
                   - key: "eks.amazonaws.com/compute-type"
                     operator: NotIn
                     values:
@@ -99,7 +100,7 @@ spec:
       tolerations:
         - operator: Exists
       containers:
-        - image: 151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon-k8s-cni:v1.6.3
+        - image: 151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon-k8s-cni:v1.6.4
           imagePullPolicy: Always
           ports:
             - containerPort: 61678
diff --git a/config/v1.6/aws-k8s-cni-us-gov-west-1.yaml b/config/v1.6/aws-k8s-cni-us-gov-west-1.yaml
index 24e3e9f269..17ecaed460 100644
--- a/config/v1.6/aws-k8s-cni-us-gov-west-1.yaml
+++ b/config/v1.6/aws-k8s-cni-us-gov-west-1.yaml
@@ -90,6 +90,7 @@ spec:
                     operator: In
                     values:
                       - amd64
+                      - arm64  
                   - key: "eks.amazonaws.com/compute-type"
                     operator: NotIn
                     values:
@@ -99,7 +100,7 @@ spec:
       tolerations:
         - operator: Exists
       containers:
-        - image: 013241004608.dkr.ecr.us-gov-west-1.amazonaws.com/amazon-k8s-cni:v1.6.3
+        - image: 013241004608.dkr.ecr.us-gov-west-1.amazonaws.com/amazon-k8s-cni:v1.6.4
           imagePullPolicy: Always
           ports:
             - containerPort: 61678
diff --git a/config/v1.6/aws-k8s-cni.yaml b/config/v1.6/aws-k8s-cni.yaml
index 88f171989f..bbfd184a7a 100644
--- a/config/v1.6/aws-k8s-cni.yaml
+++ b/config/v1.6/aws-k8s-cni.yaml
@@ -77,6 +77,7 @@ spec:
                     operator: In
                     values:
                       - amd64
+                      - arm64  
                   - key: "eks.amazonaws.com/compute-type"
                     operator: NotIn
                     values:
@@ -90,6 +91,7 @@ spec:
                     operator: In
                     values:
                       - amd64
+                      - arm64  
                   - key: "eks.amazonaws.com/compute-type"
                     operator: NotIn
                     values:
@@ -99,7 +101,7 @@ spec:
       tolerations:
         - operator: Exists
       containers:
-        - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.6.4-rc1
+        - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.6.4
           imagePullPolicy: Always
           ports:
             - containerPort: 61678
diff --git a/config/v1.6/cni-metrics-helper-cn.yaml b/config/v1.6/cni-metrics-helper-cn.yaml
index f7d0d30503..e8ee79b289 100644
--- a/config/v1.6/cni-metrics-helper-cn.yaml
+++ b/config/v1.6/cni-metrics-helper-cn.yaml
@@ -75,7 +75,7 @@ spec:
     spec:
       serviceAccountName: cni-metrics-helper
       containers:
-      - image: 961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/cni-metrics-helper:v1.6.3
+      - image: 961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/cni-metrics-helper:v1.6.4
         imagePullPolicy: Always
         name: cni-metrics-helper
         env:
diff --git a/config/v1.6/cni-metrics-helper-us-east-1.yaml b/config/v1.6/cni-metrics-helper-us-east-1.yaml
index c887a01286..a6f619d13a 100644
--- a/config/v1.6/cni-metrics-helper-us-east-1.yaml
+++ b/config/v1.6/cni-metrics-helper-us-east-1.yaml
@@ -75,7 +75,7 @@ spec:
     spec:
       serviceAccountName: cni-metrics-helper
       containers:
-      - image: 151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/cni-metrics-helper:v1.6.3
+      - image: 151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/cni-metrics-helper:v1.6.4
         imagePullPolicy: Always
         name: cni-metrics-helper
         env:
diff --git a/config/v1.6/cni-metrics-helper-us-gov-west-1.yaml b/config/v1.6/cni-metrics-helper-us-gov-west-1.yaml
index ba90096378..a1ee1dbe89 100644
--- a/config/v1.6/cni-metrics-helper-us-gov-west-1.yaml
+++ b/config/v1.6/cni-metrics-helper-us-gov-west-1.yaml
@@ -75,7 +75,7 @@ spec:
     spec:
       serviceAccountName: cni-metrics-helper
       containers:
-      - image: 013241004608.dkr.ecr.us-gov-west-1.amazonaws.com/cni-metrics-helper:v1.6.3
+      - image: 013241004608.dkr.ecr.us-gov-west-1.amazonaws.com/cni-metrics-helper:v1.6.4
         imagePullPolicy: Always
         name: cni-metrics-helper
         env:
diff --git a/config/v1.6/cni-metrics-helper.yaml b/config/v1.6/cni-metrics-helper.yaml
index 5b9d035918..21aa91eab7 100644
--- a/config/v1.6/cni-metrics-helper.yaml
+++ b/config/v1.6/cni-metrics-helper.yaml
@@ -75,7 +75,7 @@ spec:
     spec:
       serviceAccountName: cni-metrics-helper
       containers:
-      - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/cni-metrics-helper:v1.6.3
+      - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/cni-metrics-helper:v1.6.4
         imagePullPolicy: Always
         name: cni-metrics-helper
         env: