diff --git a/CHANGELOG.md b/CHANGELOG.md
index e885a3813..2cac3bfe5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 ## Unreleased
-(None)
+- Use apiextensions.k8s.io/v1 for eniconfigs.crd.k8s.amazonaws.com
+  [#693](https://github.com/pulumi/pulumi-eks/pull/693)
 
 ## 0.37.1 (Released February 10, 2020)
 - Ensure Schema is part of the Provider for the GetSchema option
diff --git a/examples/aws-profile/index.ts b/examples/aws-profile/index.ts
index 40f34521c..1a6b44e15 100644
--- a/examples/aws-profile/index.ts
+++ b/examples/aws-profile/index.ts
@@ -28,6 +28,7 @@ const kubeconfigOpts: eks.KubeconfigOptions = {profileName: profileName};
 const cluster = new eks.Cluster(`${projectName}`, {
     providerCredentialOpts: kubeconfigOpts,
     deployDashboard: false,
+    version: "1.22", // Force 1.22 to test fix for https://github.com/pulumi/pulumi-eks/issues/679
 }, {provider: awsProvider});
 
 // Export the cluster kubeconfig.
diff --git a/nodejs/eks/cni/aws-k8s-cni.yaml b/nodejs/eks/cni/aws-k8s-cni.yaml
index fbd8af882..3aec8a00f 100644
--- a/nodejs/eks/cni/aws-k8s-cni.yaml
+++ b/nodejs/eks/cni/aws-k8s-cni.yaml
@@ -185,18 +185,27 @@ spec:
           name: run-dir
 
 ---
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: eniconfigs.crd.k8s.amazonaws.com
+  labels:
+    app.kubernetes.io/name: aws-node
+    app.kubernetes.io/instance: aws-vpc-cni
+    k8s-app: aws-node
 spec:
-  group: crd.k8s.amazonaws.com
-  names:
-    kind: ENIConfig
-    plural: eniconfigs
-    singular: eniconfig
   scope: Cluster
+  group: crd.k8s.amazonaws.com
+  preserveUnknownFields: false
   versions:
     - name: v1alpha1
       served: true
       storage: true
+      schema:
+        openAPIV3Schema:
+          type: object
+          x-kubernetes-preserve-unknown-fields: true
+  names:
+    plural: eniconfigs
+    singular: eniconfig
+    kind: ENIConfig