diff --git a/images/multus-daemonset-crio-pre1.16.yml b/images/multus-daemonset-crio-pre1.16.yml
index 71e391819..313080f9e 100644
--- a/images/multus-daemonset-crio-pre1.16.yml
+++ b/images/multus-daemonset-crio-pre1.16.yml
@@ -141,7 +141,7 @@ spec:
         - "--cni-bin-dir=/host/usr/libexec/cni"
         - "--multus-conf-file=auto"
         - "--override-network-name=true"
-        - "--rename-conf-file=true"
+        - "--restart-crio=true"
         resources:
           requests:
             cpu: "100m"
@@ -212,6 +212,7 @@ spec:
         - "--cni-bin-dir=/host/usr/libexec/cni"
         - "--multus-conf-file=auto"
         - "--override-network-name=true"
+        - "--restart-crio=true"
         resources:
           requests:
             cpu: "100m"
diff --git a/images/multus-daemonset-crio.yml b/images/multus-daemonset-crio.yml
index 9bef2b927..7aad5ffae 100644
--- a/images/multus-daemonset-crio.yml
+++ b/images/multus-daemonset-crio.yml
@@ -5,7 +5,6 @@ metadata:
   name: network-attachment-definitions.k8s.cni.cncf.io
 spec:
   group: k8s.cni.cncf.io
-  version: v1
   scope: Namespaced
   names:
     plural: network-attachment-definitions
@@ -13,13 +12,19 @@ spec:
     kind: NetworkAttachmentDefinition
     shortNames:
     - net-attach-def
-  validation:
-    openAPIV3Schema:
-      properties:
-        spec:
+  versions:
+    - name: v1
+      served: true
+      storage: true
+      schema:
+        openAPIV3Schema:
+          type: object
           properties:
-            config:
-                 type: string
+            spec:
+              type: object
+              properties:
+                config:
+                  type: string
 ---
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
diff --git a/images/multus-daemonset.yml b/images/multus-daemonset.yml
index f2cad8c46..04d74ec25 100644
--- a/images/multus-daemonset.yml
+++ b/images/multus-daemonset.yml
@@ -5,7 +5,6 @@ metadata:
   name: network-attachment-definitions.k8s.cni.cncf.io
 spec:
   group: k8s.cni.cncf.io
-  version: v1
   scope: Namespaced
   names:
     plural: network-attachment-definitions
@@ -13,13 +12,19 @@ spec:
     kind: NetworkAttachmentDefinition
     shortNames:
     - net-attach-def
-  validation:
-    openAPIV3Schema:
-      properties:
-        spec:
+  versions:
+    - name: v1
+      served: true
+      storage: true
+      schema:
+        openAPIV3Schema:
+          type: object
           properties:
-            config:
-                 type: string
+            spec:
+              type: object
+              properties:
+                config:
+                  type: string
 ---
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1