diff --git a/install/helm/agones/templates/crds/_gameserverspecschema.yaml b/install/helm/agones/templates/crds/_gameserverspecschema.yaml
index 5cb6456dbd..25e5f32a24 100644
--- a/install/helm/agones/templates/crds/_gameserverspecschema.yaml
+++ b/install/helm/agones/templates/crds/_gameserverspecschema.yaml
@@ -24,10 +24,12 @@ properties:
     properties:
       labels:
         type: object
-        x-kubernetes-preserve-unknown-fields: true
+        additionalProperties:
+          type: string
       annotations:
         type: object
-        x-kubernetes-preserve-unknown-fields: true
+        additionalProperties:
+          type: string
   {{- end}}
   spec:
     type: object
diff --git a/install/yaml/install.yaml b/install/yaml/install.yaml
index cefb4bd8b0..861747c341 100644
--- a/install/yaml/install.yaml
+++ b/install/yaml/install.yaml
@@ -231,10 +231,12 @@ spec:
                      properties:
                        labels:
                          type: object
-                         x-kubernetes-preserve-unknown-fields: true
+                         additionalProperties:
+                           type: string
                        annotations:
                          type: object
-                         x-kubernetes-preserve-unknown-fields: true
+                         additionalProperties:
+                           type: string
                    spec:
                      type: object
                      required:
@@ -971,10 +973,12 @@ spec:
                       properties:
                         labels:
                           type: object
-                          x-kubernetes-preserve-unknown-fields: true
+                          additionalProperties:
+                            type: string
                         annotations:
                           type: object
-                          x-kubernetes-preserve-unknown-fields: true
+                          additionalProperties:
+                            type: string
                     spec:
                       type: object
                       required: