diff --git a/kubernetes-model-generator/openapi/generator/tools/generator/openapi.go b/kubernetes-model-generator/openapi/generator/tools/generator/openapi.go
index 004f7fe8552..c1eb83b05be 100644
--- a/kubernetes-model-generator/openapi/generator/tools/generator/openapi.go
+++ b/kubernetes-model-generator/openapi/generator/tools/generator/openapi.go
@@ -1,5 +1,6 @@
-////go:build ignore
-//// +build ignore
+//go:build ignore
+// +build ignore
+
 /**
  * Copyright (C) 2015 Red Hat, Inc.
  *
diff --git a/kubernetes-model-generator/openshift-model-machineconfiguration/pom.xml b/kubernetes-model-generator/openshift-model-machineconfiguration/pom.xml
index 0246c28c278..5b212cf47db 100644
--- a/kubernetes-model-generator/openshift-model-machineconfiguration/pom.xml
+++ b/kubernetes-model-generator/openshift-model-machineconfiguration/pom.xml
@@ -43,6 +43,10 @@
       <groupId>io.fabric8</groupId>
       <artifactId>kubernetes-model-core</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.fabric8</groupId>
+      <artifactId>openshift-model-config</artifactId>
+    </dependency>
   </dependencies>
 
   <profiles>
@@ -56,18 +60,11 @@
             <configuration >
               <settings combine.self="append">
                 <schemas>
-                  <schema>${openapi.schema.openshift-latest}</schema>
+                  <schema>${openapi.schema.openshift-generated}</schema>
                 </schemas>
-                <packageMappings combine.self="append">
-                  <io.k8s.api>io.fabric8.kubernetes.api.model</io.k8s.api>
-                  <io.openshift.machineconfiguration>io.fabric8.openshift.api.model.machineconfiguration</io.openshift.machineconfiguration>
-                </packageMappings>
                 <includeGenerationRegexes>
                   <includeGenerationRegex>^io\.openshift\.machineconfiguration\..*$</includeGenerationRegex>
                 </includeGenerationRegexes>
-                <refToJavaTypeMappings>
-                  <io.k8s.apimachinery.pkg.apis.meta.v1.LabelSelectorRequirement_v2>io.fabric8.kubernetes.api.model.LabelSelectorRequirement</io.k8s.apimachinery.pkg.apis.meta.v1.LabelSelectorRequirement_v2>
-                </refToJavaTypeMappings>
               </settings>
             </configuration>
           </plugin>
diff --git a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPoolStatusCertExpirys.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/CertExpiry.java
similarity index 89%
rename from kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPoolStatusCertExpirys.java
rename to kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/CertExpiry.java
index 8503fe46629..5cac4c7ce1b 100644
--- a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPoolStatusCertExpirys.java
+++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/CertExpiry.java
@@ -53,7 +53,7 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class MachineConfigPoolStatusCertExpirys implements Editable<MachineConfigPoolStatusCertExpirysBuilder> , KubernetesResource
+public class CertExpiry implements Editable<CertExpiryBuilder> , KubernetesResource
 {
 
     @JsonProperty("bundle")
@@ -69,10 +69,10 @@ public class MachineConfigPoolStatusCertExpirys implements Editable<MachineConfi
      * No args constructor for use in serialization
      * 
      */
-    public MachineConfigPoolStatusCertExpirys() {
+    public CertExpiry() {
     }
 
-    public MachineConfigPoolStatusCertExpirys(String bundle, String expiry, String subject) {
+    public CertExpiry(String bundle, String expiry, String subject) {
         super();
         this.bundle = bundle;
         this.expiry = expiry;
@@ -110,12 +110,12 @@ public void setSubject(String subject) {
     }
 
     @JsonIgnore
-    public MachineConfigPoolStatusCertExpirysBuilder edit() {
-        return new MachineConfigPoolStatusCertExpirysBuilder(this);
+    public CertExpiryBuilder edit() {
+        return new CertExpiryBuilder(this);
     }
 
     @JsonIgnore
-    public MachineConfigPoolStatusCertExpirysBuilder toBuilder() {
+    public CertExpiryBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/KubeletConfigStatusConditions.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ContainerRuntimeConfigCondition.java
similarity index 84%
rename from kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/KubeletConfigStatusConditions.java
rename to kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ContainerRuntimeConfigCondition.java
index 64329c02ef2..83c55a95c52 100644
--- a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/KubeletConfigStatusConditions.java
+++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ContainerRuntimeConfigCondition.java
@@ -55,12 +55,11 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class KubeletConfigStatusConditions implements Editable<KubeletConfigStatusConditionsBuilder> , KubernetesResource
+public class ContainerRuntimeConfigCondition implements Editable<ContainerRuntimeConfigConditionBuilder> , KubernetesResource
 {
 
     @JsonProperty("lastTransitionTime")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object lastTransitionTime;
+    private String lastTransitionTime;
     @JsonProperty("message")
     private String message;
     @JsonProperty("reason")
@@ -76,10 +75,10 @@ public class KubeletConfigStatusConditions implements Editable<KubeletConfigStat
      * No args constructor for use in serialization
      * 
      */
-    public KubeletConfigStatusConditions() {
+    public ContainerRuntimeConfigCondition() {
     }
 
-    public KubeletConfigStatusConditions(Object lastTransitionTime, String message, String reason, String status, String type) {
+    public ContainerRuntimeConfigCondition(String lastTransitionTime, String message, String reason, String status, String type) {
         super();
         this.lastTransitionTime = lastTransitionTime;
         this.message = message;
@@ -89,13 +88,12 @@ public KubeletConfigStatusConditions(Object lastTransitionTime, String message,
     }
 
     @JsonProperty("lastTransitionTime")
-    public Object getLastTransitionTime() {
+    public String getLastTransitionTime() {
         return lastTransitionTime;
     }
 
     @JsonProperty("lastTransitionTime")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setLastTransitionTime(Object lastTransitionTime) {
+    public void setLastTransitionTime(String lastTransitionTime) {
         this.lastTransitionTime = lastTransitionTime;
     }
 
@@ -140,12 +138,12 @@ public void setType(String type) {
     }
 
     @JsonIgnore
-    public KubeletConfigStatusConditionsBuilder edit() {
-        return new KubeletConfigStatusConditionsBuilder(this);
+    public ContainerRuntimeConfigConditionBuilder edit() {
+        return new ContainerRuntimeConfigConditionBuilder(this);
     }
 
     @JsonIgnore
-    public KubeletConfigStatusConditionsBuilder toBuilder() {
+    public ContainerRuntimeConfigConditionBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ContainerRuntimeConfigSpec.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ContainerRuntimeConfigSpec.java
index 789606e9170..2b853cb5233 100644
--- a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ContainerRuntimeConfigSpec.java
+++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ContainerRuntimeConfigSpec.java
@@ -56,9 +56,9 @@ public class ContainerRuntimeConfigSpec implements Editable<ContainerRuntimeConf
 {
 
     @JsonProperty("containerRuntimeConfig")
-    private ContainerRuntimeConfigSpecContainerRuntimeConfig containerRuntimeConfig;
+    private ContainerRuntimeConfiguration containerRuntimeConfig;
     @JsonProperty("machineConfigPoolSelector")
-    private ContainerRuntimeConfigSpecMachineConfigPoolSelector machineConfigPoolSelector;
+    private LabelSelector machineConfigPoolSelector;
     @JsonIgnore
     private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
 
@@ -69,29 +69,29 @@ public class ContainerRuntimeConfigSpec implements Editable<ContainerRuntimeConf
     public ContainerRuntimeConfigSpec() {
     }
 
-    public ContainerRuntimeConfigSpec(ContainerRuntimeConfigSpecContainerRuntimeConfig containerRuntimeConfig, ContainerRuntimeConfigSpecMachineConfigPoolSelector machineConfigPoolSelector) {
+    public ContainerRuntimeConfigSpec(ContainerRuntimeConfiguration containerRuntimeConfig, LabelSelector machineConfigPoolSelector) {
         super();
         this.containerRuntimeConfig = containerRuntimeConfig;
         this.machineConfigPoolSelector = machineConfigPoolSelector;
     }
 
     @JsonProperty("containerRuntimeConfig")
-    public ContainerRuntimeConfigSpecContainerRuntimeConfig getContainerRuntimeConfig() {
+    public ContainerRuntimeConfiguration getContainerRuntimeConfig() {
         return containerRuntimeConfig;
     }
 
     @JsonProperty("containerRuntimeConfig")
-    public void setContainerRuntimeConfig(ContainerRuntimeConfigSpecContainerRuntimeConfig containerRuntimeConfig) {
+    public void setContainerRuntimeConfig(ContainerRuntimeConfiguration containerRuntimeConfig) {
         this.containerRuntimeConfig = containerRuntimeConfig;
     }
 
     @JsonProperty("machineConfigPoolSelector")
-    public ContainerRuntimeConfigSpecMachineConfigPoolSelector getMachineConfigPoolSelector() {
+    public LabelSelector getMachineConfigPoolSelector() {
         return machineConfigPoolSelector;
     }
 
     @JsonProperty("machineConfigPoolSelector")
-    public void setMachineConfigPoolSelector(ContainerRuntimeConfigSpecMachineConfigPoolSelector machineConfigPoolSelector) {
+    public void setMachineConfigPoolSelector(LabelSelector machineConfigPoolSelector) {
         this.machineConfigPoolSelector = machineConfigPoolSelector;
     }
 
diff --git a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ContainerRuntimeConfigStatus.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ContainerRuntimeConfigStatus.java
index 116108721ef..557dce45f16 100644
--- a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ContainerRuntimeConfigStatus.java
+++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ContainerRuntimeConfigStatus.java
@@ -59,7 +59,7 @@ public class ContainerRuntimeConfigStatus implements Editable<ContainerRuntimeCo
 
     @JsonProperty("conditions")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ContainerRuntimeConfigStatusConditions> conditions = new ArrayList<>();
+    private List<ContainerRuntimeConfigCondition> conditions = new ArrayList<>();
     @JsonProperty("observedGeneration")
     private Long observedGeneration;
     @JsonIgnore
@@ -72,7 +72,7 @@ public class ContainerRuntimeConfigStatus implements Editable<ContainerRuntimeCo
     public ContainerRuntimeConfigStatus() {
     }
 
-    public ContainerRuntimeConfigStatus(List<ContainerRuntimeConfigStatusConditions> conditions, Long observedGeneration) {
+    public ContainerRuntimeConfigStatus(List<ContainerRuntimeConfigCondition> conditions, Long observedGeneration) {
         super();
         this.conditions = conditions;
         this.observedGeneration = observedGeneration;
@@ -80,12 +80,12 @@ public ContainerRuntimeConfigStatus(List<ContainerRuntimeConfigStatusConditions>
 
     @JsonProperty("conditions")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ContainerRuntimeConfigStatusConditions> getConditions() {
+    public List<ContainerRuntimeConfigCondition> getConditions() {
         return conditions;
     }
 
     @JsonProperty("conditions")
-    public void setConditions(List<ContainerRuntimeConfigStatusConditions> conditions) {
+    public void setConditions(List<ContainerRuntimeConfigCondition> conditions) {
         this.conditions = conditions;
     }
 
diff --git a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ContainerRuntimeConfigSpecContainerRuntimeConfig.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ContainerRuntimeConfiguration.java
similarity index 78%
rename from kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ContainerRuntimeConfigSpecContainerRuntimeConfig.java
rename to kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ContainerRuntimeConfiguration.java
index 61724f9ea6b..1e38e02bfa3 100644
--- a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ContainerRuntimeConfigSpecContainerRuntimeConfig.java
+++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ContainerRuntimeConfiguration.java
@@ -21,6 +21,7 @@
 import io.fabric8.kubernetes.api.model.ObjectReference;
 import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
 import io.fabric8.kubernetes.api.model.PodTemplateSpec;
+import io.fabric8.kubernetes.api.model.Quantity;
 import io.fabric8.kubernetes.api.model.ResourceRequirements;
 import io.sundr.builder.annotations.Buildable;
 import io.sundr.builder.annotations.BuildableReference;
@@ -55,7 +56,7 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class ContainerRuntimeConfigSpecContainerRuntimeConfig implements Editable<ContainerRuntimeConfigSpecContainerRuntimeConfigBuilder> , KubernetesResource
+public class ContainerRuntimeConfiguration implements Editable<ContainerRuntimeConfigurationBuilder> , KubernetesResource
 {
 
     @JsonProperty("defaultRuntime")
@@ -63,11 +64,9 @@ public class ContainerRuntimeConfigSpecContainerRuntimeConfig implements Editabl
     @JsonProperty("logLevel")
     private String logLevel;
     @JsonProperty("logSizeMax")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object logSizeMax;
+    private Quantity logSizeMax;
     @JsonProperty("overlaySize")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object overlaySize;
+    private Quantity overlaySize;
     @JsonProperty("pidsLimit")
     private Long pidsLimit;
     @JsonIgnore
@@ -77,10 +76,10 @@ public class ContainerRuntimeConfigSpecContainerRuntimeConfig implements Editabl
      * No args constructor for use in serialization
      * 
      */
-    public ContainerRuntimeConfigSpecContainerRuntimeConfig() {
+    public ContainerRuntimeConfiguration() {
     }
 
-    public ContainerRuntimeConfigSpecContainerRuntimeConfig(String defaultRuntime, String logLevel, Object logSizeMax, Object overlaySize, Long pidsLimit) {
+    public ContainerRuntimeConfiguration(String defaultRuntime, String logLevel, Quantity logSizeMax, Quantity overlaySize, Long pidsLimit) {
         super();
         this.defaultRuntime = defaultRuntime;
         this.logLevel = logLevel;
@@ -110,24 +109,22 @@ public void setLogLevel(String logLevel) {
     }
 
     @JsonProperty("logSizeMax")
-    public Object getLogSizeMax() {
+    public Quantity getLogSizeMax() {
         return logSizeMax;
     }
 
     @JsonProperty("logSizeMax")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setLogSizeMax(Object logSizeMax) {
+    public void setLogSizeMax(Quantity logSizeMax) {
         this.logSizeMax = logSizeMax;
     }
 
     @JsonProperty("overlaySize")
-    public Object getOverlaySize() {
+    public Quantity getOverlaySize() {
         return overlaySize;
     }
 
     @JsonProperty("overlaySize")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setOverlaySize(Object overlaySize) {
+    public void setOverlaySize(Quantity overlaySize) {
         this.overlaySize = overlaySize;
     }
 
@@ -142,12 +139,12 @@ public void setPidsLimit(Long pidsLimit) {
     }
 
     @JsonIgnore
-    public ContainerRuntimeConfigSpecContainerRuntimeConfigBuilder edit() {
-        return new ContainerRuntimeConfigSpecContainerRuntimeConfigBuilder(this);
+    public ContainerRuntimeConfigurationBuilder edit() {
+        return new ContainerRuntimeConfigurationBuilder(this);
     }
 
     @JsonIgnore
-    public ContainerRuntimeConfigSpecContainerRuntimeConfigBuilder toBuilder() {
+    public ContainerRuntimeConfigurationBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ControllerConfigStatusControllerCertificates.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ControllerCertificate.java
similarity index 88%
rename from kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ControllerConfigStatusControllerCertificates.java
rename to kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ControllerCertificate.java
index fdf6cceb9b7..b8bee4dadf6 100644
--- a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ControllerConfigStatusControllerCertificates.java
+++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ControllerCertificate.java
@@ -55,7 +55,7 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class ControllerConfigStatusControllerCertificates implements Editable<ControllerConfigStatusControllerCertificatesBuilder> , KubernetesResource
+public class ControllerCertificate implements Editable<ControllerCertificateBuilder> , KubernetesResource
 {
 
     @JsonProperty("bundleFile")
@@ -75,10 +75,10 @@ public class ControllerConfigStatusControllerCertificates implements Editable<Co
      * No args constructor for use in serialization
      * 
      */
-    public ControllerConfigStatusControllerCertificates() {
+    public ControllerCertificate() {
     }
 
-    public ControllerConfigStatusControllerCertificates(String bundleFile, String notAfter, String notBefore, String signer, String subject) {
+    public ControllerCertificate(String bundleFile, String notAfter, String notBefore, String signer, String subject) {
         super();
         this.bundleFile = bundleFile;
         this.notAfter = notAfter;
@@ -138,12 +138,12 @@ public void setSubject(String subject) {
     }
 
     @JsonIgnore
-    public ControllerConfigStatusControllerCertificatesBuilder edit() {
-        return new ControllerConfigStatusControllerCertificatesBuilder(this);
+    public ControllerCertificateBuilder edit() {
+        return new ControllerCertificateBuilder(this);
     }
 
     @JsonIgnore
-    public ControllerConfigStatusControllerCertificatesBuilder toBuilder() {
+    public ControllerCertificateBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ControllerConfigSpec.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ControllerConfigSpec.java
index edeafbaa012..8d39faa60eb 100644
--- a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ControllerConfigSpec.java
+++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ControllerConfigSpec.java
@@ -24,6 +24,9 @@
 import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
 import io.fabric8.kubernetes.api.model.PodTemplateSpec;
 import io.fabric8.kubernetes.api.model.ResourceRequirements;
+import io.fabric8.openshift.api.model.config.v1.DNS;
+import io.fabric8.openshift.api.model.config.v1.Infrastructure;
+import io.fabric8.openshift.api.model.config.v1.ProxyStatus;
 import io.sundr.builder.annotations.Buildable;
 import io.sundr.builder.annotations.BuildableReference;
 import lombok.EqualsAndHashCode;
@@ -79,44 +82,40 @@ public class ControllerConfigSpec implements Editable<ControllerConfigSpecBuilde
 {
 
     @JsonProperty("additionalTrustBundle")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object additionalTrustBundle;
+    private String additionalTrustBundle;
     @JsonProperty("baseOSContainerImage")
     private String baseOSContainerImage;
     @JsonProperty("baseOSExtensionsContainerImage")
     private String baseOSExtensionsContainerImage;
     @JsonProperty("cloudProviderCAData")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object cloudProviderCAData;
+    private String cloudProviderCAData;
     @JsonProperty("cloudProviderConfig")
     private String cloudProviderConfig;
     @JsonProperty("clusterDNSIP")
     private String clusterDNSIP;
     @JsonProperty("dns")
-    private ControllerConfigSpecDns dns;
+    private DNS dns;
     @JsonProperty("etcdDiscoveryDomain")
     private String etcdDiscoveryDomain;
     @JsonProperty("imageRegistryBundleData")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ControllerConfigSpecImageRegistryBundleData> imageRegistryBundleData = new ArrayList<>();
+    private List<ImageRegistryBundle> imageRegistryBundleData = new ArrayList<>();
     @JsonProperty("imageRegistryBundleUserData")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ControllerConfigSpecImageRegistryBundleUserData> imageRegistryBundleUserData = new ArrayList<>();
+    private List<ImageRegistryBundle> imageRegistryBundleUserData = new ArrayList<>();
     @JsonProperty("images")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private Map<String, String> images = new LinkedHashMap<>();
     @JsonProperty("infra")
-    private ControllerConfigSpecInfra infra;
+    private Infrastructure infra;
     @JsonProperty("internalRegistryPullSecret")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object internalRegistryPullSecret;
+    private String internalRegistryPullSecret;
     @JsonProperty("ipFamilies")
     private String ipFamilies;
     @JsonProperty("kubeAPIServerServingCAData")
     private String kubeAPIServerServingCAData;
     @JsonProperty("network")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object network;
+    private NetworkInfo network;
     @JsonProperty("networkType")
     private String networkType;
     @JsonProperty("osImageURL")
@@ -124,10 +123,9 @@ public class ControllerConfigSpec implements Editable<ControllerConfigSpecBuilde
     @JsonProperty("platform")
     private String platform;
     @JsonProperty("proxy")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object proxy;
+    private ProxyStatus proxy;
     @JsonProperty("pullSecret")
-    private ControllerConfigSpecPullSecret pullSecret;
+    private ObjectReference pullSecret;
     @JsonProperty("releaseImage")
     private String releaseImage;
     @JsonProperty("rootCAData")
@@ -142,7 +140,7 @@ public class ControllerConfigSpec implements Editable<ControllerConfigSpecBuilde
     public ControllerConfigSpec() {
     }
 
-    public ControllerConfigSpec(Object additionalTrustBundle, String baseOSContainerImage, String baseOSExtensionsContainerImage, Object cloudProviderCAData, String cloudProviderConfig, String clusterDNSIP, ControllerConfigSpecDns dns, String etcdDiscoveryDomain, List<ControllerConfigSpecImageRegistryBundleData> imageRegistryBundleData, List<ControllerConfigSpecImageRegistryBundleUserData> imageRegistryBundleUserData, Map<String, String> images, ControllerConfigSpecInfra infra, Object internalRegistryPullSecret, String ipFamilies, String kubeAPIServerServingCAData, Object network, String networkType, String osImageURL, String platform, Object proxy, ControllerConfigSpecPullSecret pullSecret, String releaseImage, String rootCAData) {
+    public ControllerConfigSpec(String additionalTrustBundle, String baseOSContainerImage, String baseOSExtensionsContainerImage, String cloudProviderCAData, String cloudProviderConfig, String clusterDNSIP, DNS dns, String etcdDiscoveryDomain, List<ImageRegistryBundle> imageRegistryBundleData, List<ImageRegistryBundle> imageRegistryBundleUserData, Map<String, String> images, Infrastructure infra, String internalRegistryPullSecret, String ipFamilies, String kubeAPIServerServingCAData, NetworkInfo network, String networkType, String osImageURL, String platform, ProxyStatus proxy, ObjectReference pullSecret, String releaseImage, String rootCAData) {
         super();
         this.additionalTrustBundle = additionalTrustBundle;
         this.baseOSContainerImage = baseOSContainerImage;
@@ -170,13 +168,12 @@ public ControllerConfigSpec(Object additionalTrustBundle, String baseOSContainer
     }
 
     @JsonProperty("additionalTrustBundle")
-    public Object getAdditionalTrustBundle() {
+    public String getAdditionalTrustBundle() {
         return additionalTrustBundle;
     }
 
     @JsonProperty("additionalTrustBundle")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setAdditionalTrustBundle(Object additionalTrustBundle) {
+    public void setAdditionalTrustBundle(String additionalTrustBundle) {
         this.additionalTrustBundle = additionalTrustBundle;
     }
 
@@ -201,13 +198,12 @@ public void setBaseOSExtensionsContainerImage(String baseOSExtensionsContainerIm
     }
 
     @JsonProperty("cloudProviderCAData")
-    public Object getCloudProviderCAData() {
+    public String getCloudProviderCAData() {
         return cloudProviderCAData;
     }
 
     @JsonProperty("cloudProviderCAData")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setCloudProviderCAData(Object cloudProviderCAData) {
+    public void setCloudProviderCAData(String cloudProviderCAData) {
         this.cloudProviderCAData = cloudProviderCAData;
     }
 
@@ -232,12 +228,12 @@ public void setClusterDNSIP(String clusterDNSIP) {
     }
 
     @JsonProperty("dns")
-    public ControllerConfigSpecDns getDns() {
+    public DNS getDns() {
         return dns;
     }
 
     @JsonProperty("dns")
-    public void setDns(ControllerConfigSpecDns dns) {
+    public void setDns(DNS dns) {
         this.dns = dns;
     }
 
@@ -253,23 +249,23 @@ public void setEtcdDiscoveryDomain(String etcdDiscoveryDomain) {
 
     @JsonProperty("imageRegistryBundleData")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ControllerConfigSpecImageRegistryBundleData> getImageRegistryBundleData() {
+    public List<ImageRegistryBundle> getImageRegistryBundleData() {
         return imageRegistryBundleData;
     }
 
     @JsonProperty("imageRegistryBundleData")
-    public void setImageRegistryBundleData(List<ControllerConfigSpecImageRegistryBundleData> imageRegistryBundleData) {
+    public void setImageRegistryBundleData(List<ImageRegistryBundle> imageRegistryBundleData) {
         this.imageRegistryBundleData = imageRegistryBundleData;
     }
 
     @JsonProperty("imageRegistryBundleUserData")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ControllerConfigSpecImageRegistryBundleUserData> getImageRegistryBundleUserData() {
+    public List<ImageRegistryBundle> getImageRegistryBundleUserData() {
         return imageRegistryBundleUserData;
     }
 
     @JsonProperty("imageRegistryBundleUserData")
-    public void setImageRegistryBundleUserData(List<ControllerConfigSpecImageRegistryBundleUserData> imageRegistryBundleUserData) {
+    public void setImageRegistryBundleUserData(List<ImageRegistryBundle> imageRegistryBundleUserData) {
         this.imageRegistryBundleUserData = imageRegistryBundleUserData;
     }
 
@@ -285,23 +281,22 @@ public void setImages(Map<String, String> images) {
     }
 
     @JsonProperty("infra")
-    public ControllerConfigSpecInfra getInfra() {
+    public Infrastructure getInfra() {
         return infra;
     }
 
     @JsonProperty("infra")
-    public void setInfra(ControllerConfigSpecInfra infra) {
+    public void setInfra(Infrastructure infra) {
         this.infra = infra;
     }
 
     @JsonProperty("internalRegistryPullSecret")
-    public Object getInternalRegistryPullSecret() {
+    public String getInternalRegistryPullSecret() {
         return internalRegistryPullSecret;
     }
 
     @JsonProperty("internalRegistryPullSecret")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setInternalRegistryPullSecret(Object internalRegistryPullSecret) {
+    public void setInternalRegistryPullSecret(String internalRegistryPullSecret) {
         this.internalRegistryPullSecret = internalRegistryPullSecret;
     }
 
@@ -326,13 +321,12 @@ public void setKubeAPIServerServingCAData(String kubeAPIServerServingCAData) {
     }
 
     @JsonProperty("network")
-    public Object getNetwork() {
+    public NetworkInfo getNetwork() {
         return network;
     }
 
     @JsonProperty("network")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setNetwork(Object network) {
+    public void setNetwork(NetworkInfo network) {
         this.network = network;
     }
 
@@ -367,23 +361,22 @@ public void setPlatform(String platform) {
     }
 
     @JsonProperty("proxy")
-    public Object getProxy() {
+    public ProxyStatus getProxy() {
         return proxy;
     }
 
     @JsonProperty("proxy")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setProxy(Object proxy) {
+    public void setProxy(ProxyStatus proxy) {
         this.proxy = proxy;
     }
 
     @JsonProperty("pullSecret")
-    public ControllerConfigSpecPullSecret getPullSecret() {
+    public ObjectReference getPullSecret() {
         return pullSecret;
     }
 
     @JsonProperty("pullSecret")
-    public void setPullSecret(ControllerConfigSpecPullSecret pullSecret) {
+    public void setPullSecret(ObjectReference pullSecret) {
         this.pullSecret = pullSecret;
     }
 
diff --git a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ControllerConfigStatus.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ControllerConfigStatus.java
index 4a8b441cc6f..d2dd15ade7a 100644
--- a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ControllerConfigStatus.java
+++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ControllerConfigStatus.java
@@ -60,10 +60,10 @@ public class ControllerConfigStatus implements Editable<ControllerConfigStatusBu
 
     @JsonProperty("conditions")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ControllerConfigStatusConditions> conditions = new ArrayList<>();
+    private List<ControllerConfigStatusCondition> conditions = new ArrayList<>();
     @JsonProperty("controllerCertificates")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ControllerConfigStatusControllerCertificates> controllerCertificates = new ArrayList<>();
+    private List<ControllerCertificate> controllerCertificates = new ArrayList<>();
     @JsonProperty("observedGeneration")
     private Long observedGeneration;
     @JsonIgnore
@@ -76,7 +76,7 @@ public class ControllerConfigStatus implements Editable<ControllerConfigStatusBu
     public ControllerConfigStatus() {
     }
 
-    public ControllerConfigStatus(List<ControllerConfigStatusConditions> conditions, List<ControllerConfigStatusControllerCertificates> controllerCertificates, Long observedGeneration) {
+    public ControllerConfigStatus(List<ControllerConfigStatusCondition> conditions, List<ControllerCertificate> controllerCertificates, Long observedGeneration) {
         super();
         this.conditions = conditions;
         this.controllerCertificates = controllerCertificates;
@@ -85,23 +85,23 @@ public ControllerConfigStatus(List<ControllerConfigStatusConditions> conditions,
 
     @JsonProperty("conditions")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ControllerConfigStatusConditions> getConditions() {
+    public List<ControllerConfigStatusCondition> getConditions() {
         return conditions;
     }
 
     @JsonProperty("conditions")
-    public void setConditions(List<ControllerConfigStatusConditions> conditions) {
+    public void setConditions(List<ControllerConfigStatusCondition> conditions) {
         this.conditions = conditions;
     }
 
     @JsonProperty("controllerCertificates")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ControllerConfigStatusControllerCertificates> getControllerCertificates() {
+    public List<ControllerCertificate> getControllerCertificates() {
         return controllerCertificates;
     }
 
     @JsonProperty("controllerCertificates")
-    public void setControllerCertificates(List<ControllerConfigStatusControllerCertificates> controllerCertificates) {
+    public void setControllerCertificates(List<ControllerCertificate> controllerCertificates) {
         this.controllerCertificates = controllerCertificates;
     }
 
diff --git a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ControllerConfigStatusConditions.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ControllerConfigStatusCondition.java
similarity index 84%
rename from kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ControllerConfigStatusConditions.java
rename to kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ControllerConfigStatusCondition.java
index 6c32611d75a..efe24f69c5f 100644
--- a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ControllerConfigStatusConditions.java
+++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ControllerConfigStatusCondition.java
@@ -55,12 +55,11 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class ControllerConfigStatusConditions implements Editable<ControllerConfigStatusConditionsBuilder> , KubernetesResource
+public class ControllerConfigStatusCondition implements Editable<ControllerConfigStatusConditionBuilder> , KubernetesResource
 {
 
     @JsonProperty("lastTransitionTime")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object lastTransitionTime;
+    private String lastTransitionTime;
     @JsonProperty("message")
     private String message;
     @JsonProperty("reason")
@@ -76,10 +75,10 @@ public class ControllerConfigStatusConditions implements Editable<ControllerConf
      * No args constructor for use in serialization
      * 
      */
-    public ControllerConfigStatusConditions() {
+    public ControllerConfigStatusCondition() {
     }
 
-    public ControllerConfigStatusConditions(Object lastTransitionTime, String message, String reason, String status, String type) {
+    public ControllerConfigStatusCondition(String lastTransitionTime, String message, String reason, String status, String type) {
         super();
         this.lastTransitionTime = lastTransitionTime;
         this.message = message;
@@ -89,13 +88,12 @@ public ControllerConfigStatusConditions(Object lastTransitionTime, String messag
     }
 
     @JsonProperty("lastTransitionTime")
-    public Object getLastTransitionTime() {
+    public String getLastTransitionTime() {
         return lastTransitionTime;
     }
 
     @JsonProperty("lastTransitionTime")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setLastTransitionTime(Object lastTransitionTime) {
+    public void setLastTransitionTime(String lastTransitionTime) {
         this.lastTransitionTime = lastTransitionTime;
     }
 
@@ -140,12 +138,12 @@ public void setType(String type) {
     }
 
     @JsonIgnore
-    public ControllerConfigStatusConditionsBuilder edit() {
-        return new ControllerConfigStatusConditionsBuilder(this);
+    public ControllerConfigStatusConditionBuilder edit() {
+        return new ControllerConfigStatusConditionBuilder(this);
     }
 
     @JsonIgnore
-    public ControllerConfigStatusConditionsBuilder toBuilder() {
+    public ControllerConfigStatusConditionBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ControllerConfigSpecImageRegistryBundleData.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ImageRegistryBundle.java
similarity index 87%
rename from kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ControllerConfigSpecImageRegistryBundleData.java
rename to kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ImageRegistryBundle.java
index 44fa73703d0..f09b5ed3c31 100644
--- a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ControllerConfigSpecImageRegistryBundleData.java
+++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ImageRegistryBundle.java
@@ -52,7 +52,7 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class ControllerConfigSpecImageRegistryBundleData implements Editable<ControllerConfigSpecImageRegistryBundleDataBuilder> , KubernetesResource
+public class ImageRegistryBundle implements Editable<ImageRegistryBundleBuilder> , KubernetesResource
 {
 
     @JsonProperty("data")
@@ -66,10 +66,10 @@ public class ControllerConfigSpecImageRegistryBundleData implements Editable<Con
      * No args constructor for use in serialization
      * 
      */
-    public ControllerConfigSpecImageRegistryBundleData() {
+    public ImageRegistryBundle() {
     }
 
-    public ControllerConfigSpecImageRegistryBundleData(String data, String file) {
+    public ImageRegistryBundle(String data, String file) {
         super();
         this.data = data;
         this.file = file;
@@ -96,12 +96,12 @@ public void setFile(String file) {
     }
 
     @JsonIgnore
-    public ControllerConfigSpecImageRegistryBundleDataBuilder edit() {
-        return new ControllerConfigSpecImageRegistryBundleDataBuilder(this);
+    public ImageRegistryBundleBuilder edit() {
+        return new ImageRegistryBundleBuilder(this);
     }
 
     @JsonIgnore
-    public ControllerConfigSpecImageRegistryBundleDataBuilder toBuilder() {
+    public ImageRegistryBundleBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPoolStatusConditions.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/KubeletConfigCondition.java
similarity index 84%
rename from kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPoolStatusConditions.java
rename to kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/KubeletConfigCondition.java
index c122c1a17d0..97957937ea2 100644
--- a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPoolStatusConditions.java
+++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/KubeletConfigCondition.java
@@ -55,12 +55,11 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class MachineConfigPoolStatusConditions implements Editable<MachineConfigPoolStatusConditionsBuilder> , KubernetesResource
+public class KubeletConfigCondition implements Editable<KubeletConfigConditionBuilder> , KubernetesResource
 {
 
     @JsonProperty("lastTransitionTime")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object lastTransitionTime;
+    private String lastTransitionTime;
     @JsonProperty("message")
     private String message;
     @JsonProperty("reason")
@@ -76,10 +75,10 @@ public class MachineConfigPoolStatusConditions implements Editable<MachineConfig
      * No args constructor for use in serialization
      * 
      */
-    public MachineConfigPoolStatusConditions() {
+    public KubeletConfigCondition() {
     }
 
-    public MachineConfigPoolStatusConditions(Object lastTransitionTime, String message, String reason, String status, String type) {
+    public KubeletConfigCondition(String lastTransitionTime, String message, String reason, String status, String type) {
         super();
         this.lastTransitionTime = lastTransitionTime;
         this.message = message;
@@ -89,13 +88,12 @@ public MachineConfigPoolStatusConditions(Object lastTransitionTime, String messa
     }
 
     @JsonProperty("lastTransitionTime")
-    public Object getLastTransitionTime() {
+    public String getLastTransitionTime() {
         return lastTransitionTime;
     }
 
     @JsonProperty("lastTransitionTime")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setLastTransitionTime(Object lastTransitionTime) {
+    public void setLastTransitionTime(String lastTransitionTime) {
         this.lastTransitionTime = lastTransitionTime;
     }
 
@@ -140,12 +138,12 @@ public void setType(String type) {
     }
 
     @JsonIgnore
-    public MachineConfigPoolStatusConditionsBuilder edit() {
-        return new MachineConfigPoolStatusConditionsBuilder(this);
+    public KubeletConfigConditionBuilder edit() {
+        return new KubeletConfigConditionBuilder(this);
     }
 
     @JsonIgnore
-    public MachineConfigPoolStatusConditionsBuilder toBuilder() {
+    public KubeletConfigConditionBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/KubeletConfigSpec.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/KubeletConfigSpec.java
index 1359e95f9c8..262d98f0765 100644
--- a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/KubeletConfigSpec.java
+++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/KubeletConfigSpec.java
@@ -22,6 +22,7 @@
 import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
 import io.fabric8.kubernetes.api.model.PodTemplateSpec;
 import io.fabric8.kubernetes.api.model.ResourceRequirements;
+import io.fabric8.openshift.api.model.config.v1.TLSSecurityProfile;
 import io.sundr.builder.annotations.Buildable;
 import io.sundr.builder.annotations.BuildableReference;
 import lombok.EqualsAndHashCode;
@@ -66,9 +67,9 @@ public class KubeletConfigSpec implements Editable<KubeletConfigSpecBuilder> , K
     @JsonProperty("logLevel")
     private Integer logLevel;
     @JsonProperty("machineConfigPoolSelector")
-    private KubeletConfigSpecMachineConfigPoolSelector machineConfigPoolSelector;
+    private LabelSelector machineConfigPoolSelector;
     @JsonProperty("tlsSecurityProfile")
-    private KubeletConfigSpecTlsSecurityProfile tlsSecurityProfile;
+    private TLSSecurityProfile tlsSecurityProfile;
     @JsonIgnore
     private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
 
@@ -79,7 +80,7 @@ public class KubeletConfigSpec implements Editable<KubeletConfigSpecBuilder> , K
     public KubeletConfigSpec() {
     }
 
-    public KubeletConfigSpec(Boolean autoSizingReserved, Object kubeletConfig, Integer logLevel, KubeletConfigSpecMachineConfigPoolSelector machineConfigPoolSelector, KubeletConfigSpecTlsSecurityProfile tlsSecurityProfile) {
+    public KubeletConfigSpec(Boolean autoSizingReserved, Object kubeletConfig, Integer logLevel, LabelSelector machineConfigPoolSelector, TLSSecurityProfile tlsSecurityProfile) {
         super();
         this.autoSizingReserved = autoSizingReserved;
         this.kubeletConfig = kubeletConfig;
@@ -120,22 +121,22 @@ public void setLogLevel(Integer logLevel) {
     }
 
     @JsonProperty("machineConfigPoolSelector")
-    public KubeletConfigSpecMachineConfigPoolSelector getMachineConfigPoolSelector() {
+    public LabelSelector getMachineConfigPoolSelector() {
         return machineConfigPoolSelector;
     }
 
     @JsonProperty("machineConfigPoolSelector")
-    public void setMachineConfigPoolSelector(KubeletConfigSpecMachineConfigPoolSelector machineConfigPoolSelector) {
+    public void setMachineConfigPoolSelector(LabelSelector machineConfigPoolSelector) {
         this.machineConfigPoolSelector = machineConfigPoolSelector;
     }
 
     @JsonProperty("tlsSecurityProfile")
-    public KubeletConfigSpecTlsSecurityProfile getTlsSecurityProfile() {
+    public TLSSecurityProfile getTlsSecurityProfile() {
         return tlsSecurityProfile;
     }
 
     @JsonProperty("tlsSecurityProfile")
-    public void setTlsSecurityProfile(KubeletConfigSpecTlsSecurityProfile tlsSecurityProfile) {
+    public void setTlsSecurityProfile(TLSSecurityProfile tlsSecurityProfile) {
         this.tlsSecurityProfile = tlsSecurityProfile;
     }
 
diff --git a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/KubeletConfigSpecTlsSecurityProfile.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/KubeletConfigSpecTlsSecurityProfile.java
deleted file mode 100644
index 5e996d618f7..00000000000
--- a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/KubeletConfigSpecTlsSecurityProfile.java
+++ /dev/null
@@ -1,172 +0,0 @@
-
-package io.fabric8.openshift.api.model.machineconfiguration.v1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "custom",
-    "intermediate",
-    "modern",
-    "old",
-    "type"
-})
-@ToString
-@EqualsAndHashCode
-@Accessors(prefix = {
-    "_",
-    ""
-})
-@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
-    @BuildableReference(ObjectMeta.class),
-    @BuildableReference(LabelSelector.class),
-    @BuildableReference(Container.class),
-    @BuildableReference(PodTemplateSpec.class),
-    @BuildableReference(ResourceRequirements.class),
-    @BuildableReference(IntOrString.class),
-    @BuildableReference(ObjectReference.class),
-    @BuildableReference(LocalObjectReference.class),
-    @BuildableReference(PersistentVolumeClaim.class)
-})
-@Generated("jsonschema2pojo")
-public class KubeletConfigSpecTlsSecurityProfile implements Editable<KubeletConfigSpecTlsSecurityProfileBuilder> , KubernetesResource
-{
-
-    @JsonProperty("custom")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object custom;
-    @JsonProperty("intermediate")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object intermediate;
-    @JsonProperty("modern")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object modern;
-    @JsonProperty("old")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object old;
-    @JsonProperty("type")
-    private String type;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public KubeletConfigSpecTlsSecurityProfile() {
-    }
-
-    public KubeletConfigSpecTlsSecurityProfile(Object custom, Object intermediate, Object modern, Object old, String type) {
-        super();
-        this.custom = custom;
-        this.intermediate = intermediate;
-        this.modern = modern;
-        this.old = old;
-        this.type = type;
-    }
-
-    @JsonProperty("custom")
-    public Object getCustom() {
-        return custom;
-    }
-
-    @JsonProperty("custom")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setCustom(Object custom) {
-        this.custom = custom;
-    }
-
-    @JsonProperty("intermediate")
-    public Object getIntermediate() {
-        return intermediate;
-    }
-
-    @JsonProperty("intermediate")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setIntermediate(Object intermediate) {
-        this.intermediate = intermediate;
-    }
-
-    @JsonProperty("modern")
-    public Object getModern() {
-        return modern;
-    }
-
-    @JsonProperty("modern")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setModern(Object modern) {
-        this.modern = modern;
-    }
-
-    @JsonProperty("old")
-    public Object getOld() {
-        return old;
-    }
-
-    @JsonProperty("old")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setOld(Object old) {
-        this.old = old;
-    }
-
-    @JsonProperty("type")
-    public String getType() {
-        return type;
-    }
-
-    @JsonProperty("type")
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    @JsonIgnore
-    public KubeletConfigSpecTlsSecurityProfileBuilder edit() {
-        return new KubeletConfigSpecTlsSecurityProfileBuilder(this);
-    }
-
-    @JsonIgnore
-    public KubeletConfigSpecTlsSecurityProfileBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/KubeletConfigStatus.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/KubeletConfigStatus.java
index cc8e1e05d74..e91d3dd260b 100644
--- a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/KubeletConfigStatus.java
+++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/KubeletConfigStatus.java
@@ -59,7 +59,7 @@ public class KubeletConfigStatus implements Editable<KubeletConfigStatusBuilder>
 
     @JsonProperty("conditions")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<KubeletConfigStatusConditions> conditions = new ArrayList<>();
+    private List<KubeletConfigCondition> conditions = new ArrayList<>();
     @JsonProperty("observedGeneration")
     private Long observedGeneration;
     @JsonIgnore
@@ -72,7 +72,7 @@ public class KubeletConfigStatus implements Editable<KubeletConfigStatusBuilder>
     public KubeletConfigStatus() {
     }
 
-    public KubeletConfigStatus(List<KubeletConfigStatusConditions> conditions, Long observedGeneration) {
+    public KubeletConfigStatus(List<KubeletConfigCondition> conditions, Long observedGeneration) {
         super();
         this.conditions = conditions;
         this.observedGeneration = observedGeneration;
@@ -80,12 +80,12 @@ public KubeletConfigStatus(List<KubeletConfigStatusConditions> conditions, Long
 
     @JsonProperty("conditions")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<KubeletConfigStatusConditions> getConditions() {
+    public List<KubeletConfigCondition> getConditions() {
         return conditions;
     }
 
     @JsonProperty("conditions")
-    public void setConditions(List<KubeletConfigStatusConditions> conditions) {
+    public void setConditions(List<KubeletConfigCondition> conditions) {
         this.conditions = conditions;
     }
 
diff --git a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ContainerRuntimeConfigStatusConditions.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPoolCondition.java
similarity index 83%
rename from kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ContainerRuntimeConfigStatusConditions.java
rename to kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPoolCondition.java
index 92b6f809e5e..a881df82439 100644
--- a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ContainerRuntimeConfigStatusConditions.java
+++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPoolCondition.java
@@ -55,12 +55,11 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class ContainerRuntimeConfigStatusConditions implements Editable<ContainerRuntimeConfigStatusConditionsBuilder> , KubernetesResource
+public class MachineConfigPoolCondition implements Editable<MachineConfigPoolConditionBuilder> , KubernetesResource
 {
 
     @JsonProperty("lastTransitionTime")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object lastTransitionTime;
+    private String lastTransitionTime;
     @JsonProperty("message")
     private String message;
     @JsonProperty("reason")
@@ -76,10 +75,10 @@ public class ContainerRuntimeConfigStatusConditions implements Editable<Containe
      * No args constructor for use in serialization
      * 
      */
-    public ContainerRuntimeConfigStatusConditions() {
+    public MachineConfigPoolCondition() {
     }
 
-    public ContainerRuntimeConfigStatusConditions(Object lastTransitionTime, String message, String reason, String status, String type) {
+    public MachineConfigPoolCondition(String lastTransitionTime, String message, String reason, String status, String type) {
         super();
         this.lastTransitionTime = lastTransitionTime;
         this.message = message;
@@ -89,13 +88,12 @@ public ContainerRuntimeConfigStatusConditions(Object lastTransitionTime, String
     }
 
     @JsonProperty("lastTransitionTime")
-    public Object getLastTransitionTime() {
+    public String getLastTransitionTime() {
         return lastTransitionTime;
     }
 
     @JsonProperty("lastTransitionTime")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setLastTransitionTime(Object lastTransitionTime) {
+    public void setLastTransitionTime(String lastTransitionTime) {
         this.lastTransitionTime = lastTransitionTime;
     }
 
@@ -140,12 +138,12 @@ public void setType(String type) {
     }
 
     @JsonIgnore
-    public ContainerRuntimeConfigStatusConditionsBuilder edit() {
-        return new ContainerRuntimeConfigStatusConditionsBuilder(this);
+    public MachineConfigPoolConditionBuilder edit() {
+        return new MachineConfigPoolConditionBuilder(this);
     }
 
     @JsonIgnore
-    public ContainerRuntimeConfigStatusConditionsBuilder toBuilder() {
+    public MachineConfigPoolConditionBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPoolSpec.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPoolSpec.java
index 3a9962db119..37150c8eb1d 100644
--- a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPoolSpec.java
+++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPoolSpec.java
@@ -1,7 +1,9 @@
 
 package io.fabric8.openshift.api.model.machineconfiguration.v1;
 
+import java.util.ArrayList;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 import javax.annotation.Generated;
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
@@ -35,7 +37,8 @@
     "machineConfigSelector",
     "maxUnavailable",
     "nodeSelector",
-    "paused"
+    "paused",
+    "pinnedImageSets"
 })
 @ToString
 @EqualsAndHashCode
@@ -59,16 +62,18 @@ public class MachineConfigPoolSpec implements Editable<MachineConfigPoolSpecBuil
 {
 
     @JsonProperty("configuration")
-    private MachineConfigPoolSpecConfiguration configuration;
+    private MachineConfigPoolStatusConfiguration configuration;
     @JsonProperty("machineConfigSelector")
-    private MachineConfigPoolSpecMachineConfigSelector machineConfigSelector;
+    private LabelSelector machineConfigSelector;
     @JsonProperty("maxUnavailable")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object maxUnavailable;
+    private IntOrString maxUnavailable;
     @JsonProperty("nodeSelector")
-    private MachineConfigPoolSpecNodeSelector nodeSelector;
+    private LabelSelector nodeSelector;
     @JsonProperty("paused")
     private Boolean paused;
+    @JsonProperty("pinnedImageSets")
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    private List<PinnedImageSetRef> pinnedImageSets = new ArrayList<>();
     @JsonIgnore
     private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
 
@@ -79,53 +84,53 @@ public class MachineConfigPoolSpec implements Editable<MachineConfigPoolSpecBuil
     public MachineConfigPoolSpec() {
     }
 
-    public MachineConfigPoolSpec(MachineConfigPoolSpecConfiguration configuration, MachineConfigPoolSpecMachineConfigSelector machineConfigSelector, Object maxUnavailable, MachineConfigPoolSpecNodeSelector nodeSelector, Boolean paused) {
+    public MachineConfigPoolSpec(MachineConfigPoolStatusConfiguration configuration, LabelSelector machineConfigSelector, IntOrString maxUnavailable, LabelSelector nodeSelector, Boolean paused, List<PinnedImageSetRef> pinnedImageSets) {
         super();
         this.configuration = configuration;
         this.machineConfigSelector = machineConfigSelector;
         this.maxUnavailable = maxUnavailable;
         this.nodeSelector = nodeSelector;
         this.paused = paused;
+        this.pinnedImageSets = pinnedImageSets;
     }
 
     @JsonProperty("configuration")
-    public MachineConfigPoolSpecConfiguration getConfiguration() {
+    public MachineConfigPoolStatusConfiguration getConfiguration() {
         return configuration;
     }
 
     @JsonProperty("configuration")
-    public void setConfiguration(MachineConfigPoolSpecConfiguration configuration) {
+    public void setConfiguration(MachineConfigPoolStatusConfiguration configuration) {
         this.configuration = configuration;
     }
 
     @JsonProperty("machineConfigSelector")
-    public MachineConfigPoolSpecMachineConfigSelector getMachineConfigSelector() {
+    public LabelSelector getMachineConfigSelector() {
         return machineConfigSelector;
     }
 
     @JsonProperty("machineConfigSelector")
-    public void setMachineConfigSelector(MachineConfigPoolSpecMachineConfigSelector machineConfigSelector) {
+    public void setMachineConfigSelector(LabelSelector machineConfigSelector) {
         this.machineConfigSelector = machineConfigSelector;
     }
 
     @JsonProperty("maxUnavailable")
-    public Object getMaxUnavailable() {
+    public IntOrString getMaxUnavailable() {
         return maxUnavailable;
     }
 
     @JsonProperty("maxUnavailable")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setMaxUnavailable(Object maxUnavailable) {
+    public void setMaxUnavailable(IntOrString maxUnavailable) {
         this.maxUnavailable = maxUnavailable;
     }
 
     @JsonProperty("nodeSelector")
-    public MachineConfigPoolSpecNodeSelector getNodeSelector() {
+    public LabelSelector getNodeSelector() {
         return nodeSelector;
     }
 
     @JsonProperty("nodeSelector")
-    public void setNodeSelector(MachineConfigPoolSpecNodeSelector nodeSelector) {
+    public void setNodeSelector(LabelSelector nodeSelector) {
         this.nodeSelector = nodeSelector;
     }
 
@@ -139,6 +144,17 @@ public void setPaused(Boolean paused) {
         this.paused = paused;
     }
 
+    @JsonProperty("pinnedImageSets")
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    public List<PinnedImageSetRef> getPinnedImageSets() {
+        return pinnedImageSets;
+    }
+
+    @JsonProperty("pinnedImageSets")
+    public void setPinnedImageSets(List<PinnedImageSetRef> pinnedImageSets) {
+        this.pinnedImageSets = pinnedImageSets;
+    }
+
     @JsonIgnore
     public MachineConfigPoolSpecBuilder edit() {
         return new MachineConfigPoolSpecBuilder(this);
diff --git a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPoolStatus.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPoolStatus.java
index f5b414bcde5..1930b15b735 100644
--- a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPoolStatus.java
+++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPoolStatus.java
@@ -39,6 +39,7 @@
     "degradedMachineCount",
     "machineCount",
     "observedGeneration",
+    "poolSynchronizersStatus",
     "readyMachineCount",
     "unavailableMachineCount",
     "updatedMachineCount"
@@ -66,10 +67,10 @@ public class MachineConfigPoolStatus implements Editable<MachineConfigPoolStatus
 
     @JsonProperty("certExpirys")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<MachineConfigPoolStatusCertExpirys> certExpirys = new ArrayList<>();
+    private List<CertExpiry> certExpirys = new ArrayList<>();
     @JsonProperty("conditions")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<MachineConfigPoolStatusConditions> conditions = new ArrayList<>();
+    private List<MachineConfigPoolCondition> conditions = new ArrayList<>();
     @JsonProperty("configuration")
     private MachineConfigPoolStatusConfiguration configuration;
     @JsonProperty("degradedMachineCount")
@@ -78,6 +79,9 @@ public class MachineConfigPoolStatus implements Editable<MachineConfigPoolStatus
     private Integer machineCount;
     @JsonProperty("observedGeneration")
     private Long observedGeneration;
+    @JsonProperty("poolSynchronizersStatus")
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    private List<PoolSynchronizerStatus> poolSynchronizersStatus = new ArrayList<>();
     @JsonProperty("readyMachineCount")
     private Integer readyMachineCount;
     @JsonProperty("unavailableMachineCount")
@@ -94,7 +98,7 @@ public class MachineConfigPoolStatus implements Editable<MachineConfigPoolStatus
     public MachineConfigPoolStatus() {
     }
 
-    public MachineConfigPoolStatus(List<MachineConfigPoolStatusCertExpirys> certExpirys, List<MachineConfigPoolStatusConditions> conditions, MachineConfigPoolStatusConfiguration configuration, Integer degradedMachineCount, Integer machineCount, Long observedGeneration, Integer readyMachineCount, Integer unavailableMachineCount, Integer updatedMachineCount) {
+    public MachineConfigPoolStatus(List<CertExpiry> certExpirys, List<MachineConfigPoolCondition> conditions, MachineConfigPoolStatusConfiguration configuration, Integer degradedMachineCount, Integer machineCount, Long observedGeneration, List<PoolSynchronizerStatus> poolSynchronizersStatus, Integer readyMachineCount, Integer unavailableMachineCount, Integer updatedMachineCount) {
         super();
         this.certExpirys = certExpirys;
         this.conditions = conditions;
@@ -102,6 +106,7 @@ public MachineConfigPoolStatus(List<MachineConfigPoolStatusCertExpirys> certExpi
         this.degradedMachineCount = degradedMachineCount;
         this.machineCount = machineCount;
         this.observedGeneration = observedGeneration;
+        this.poolSynchronizersStatus = poolSynchronizersStatus;
         this.readyMachineCount = readyMachineCount;
         this.unavailableMachineCount = unavailableMachineCount;
         this.updatedMachineCount = updatedMachineCount;
@@ -109,23 +114,23 @@ public MachineConfigPoolStatus(List<MachineConfigPoolStatusCertExpirys> certExpi
 
     @JsonProperty("certExpirys")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<MachineConfigPoolStatusCertExpirys> getCertExpirys() {
+    public List<CertExpiry> getCertExpirys() {
         return certExpirys;
     }
 
     @JsonProperty("certExpirys")
-    public void setCertExpirys(List<MachineConfigPoolStatusCertExpirys> certExpirys) {
+    public void setCertExpirys(List<CertExpiry> certExpirys) {
         this.certExpirys = certExpirys;
     }
 
     @JsonProperty("conditions")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<MachineConfigPoolStatusConditions> getConditions() {
+    public List<MachineConfigPoolCondition> getConditions() {
         return conditions;
     }
 
     @JsonProperty("conditions")
-    public void setConditions(List<MachineConfigPoolStatusConditions> conditions) {
+    public void setConditions(List<MachineConfigPoolCondition> conditions) {
         this.conditions = conditions;
     }
 
@@ -169,6 +174,17 @@ public void setObservedGeneration(Long observedGeneration) {
         this.observedGeneration = observedGeneration;
     }
 
+    @JsonProperty("poolSynchronizersStatus")
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    public List<PoolSynchronizerStatus> getPoolSynchronizersStatus() {
+        return poolSynchronizersStatus;
+    }
+
+    @JsonProperty("poolSynchronizersStatus")
+    public void setPoolSynchronizersStatus(List<PoolSynchronizerStatus> poolSynchronizersStatus) {
+        this.poolSynchronizersStatus = poolSynchronizersStatus;
+    }
+
     @JsonProperty("readyMachineCount")
     public Integer getReadyMachineCount() {
         return readyMachineCount;
diff --git a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPoolStatusConfiguration.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPoolStatusConfiguration.java
index d3425b2a98f..d11c5a66046 100644
--- a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPoolStatusConfiguration.java
+++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPoolStatusConfiguration.java
@@ -77,7 +77,7 @@ public class MachineConfigPoolStatusConfiguration implements Editable<MachineCon
     private String resourceVersion;
     @JsonProperty("source")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<MachineConfigPoolStatusCSource> source = new ArrayList<>();
+    private List<ObjectReference> source = new ArrayList<>();
     @JsonProperty("uid")
     private String uid;
     @JsonIgnore
@@ -90,7 +90,7 @@ public class MachineConfigPoolStatusConfiguration implements Editable<MachineCon
     public MachineConfigPoolStatusConfiguration() {
     }
 
-    public MachineConfigPoolStatusConfiguration(String apiVersion, String fieldPath, String kind, String name, String namespace, String resourceVersion, List<MachineConfigPoolStatusCSource> source, String uid) {
+    public MachineConfigPoolStatusConfiguration(String apiVersion, String fieldPath, String kind, String name, String namespace, String resourceVersion, List<ObjectReference> source, String uid) {
         super();
         this.apiVersion = apiVersion;
         this.fieldPath = fieldPath;
@@ -164,12 +164,12 @@ public void setResourceVersion(String resourceVersion) {
 
     @JsonProperty("source")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<MachineConfigPoolStatusCSource> getSource() {
+    public List<ObjectReference> getSource() {
         return source;
     }
 
     @JsonProperty("source")
-    public void setSource(List<MachineConfigPoolStatusCSource> source) {
+    public void setSource(List<ObjectReference> source) {
         this.source = source;
     }
 
diff --git a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigSpec.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigSpec.java
index 9a290cbbb96..1e0f5f9f69a 100644
--- a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigSpec.java
+++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigSpec.java
@@ -73,8 +73,8 @@ public class MachineConfigSpec implements Editable<MachineConfigSpecBuilder> , K
     @JsonProperty("fips")
     private Boolean fips;
     @JsonProperty("kernelArguments")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object kernelArguments;
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    private List<String> kernelArguments = new ArrayList<>();
     @JsonProperty("kernelType")
     private String kernelType;
     @JsonProperty("osImageURL")
@@ -89,7 +89,7 @@ public class MachineConfigSpec implements Editable<MachineConfigSpecBuilder> , K
     public MachineConfigSpec() {
     }
 
-    public MachineConfigSpec(String baseOSExtensionsContainerImage, Object config, List<String> extensions, Boolean fips, Object kernelArguments, String kernelType, String osImageURL) {
+    public MachineConfigSpec(String baseOSExtensionsContainerImage, Object config, List<String> extensions, Boolean fips, List<String> kernelArguments, String kernelType, String osImageURL) {
         super();
         this.baseOSExtensionsContainerImage = baseOSExtensionsContainerImage;
         this.config = config;
@@ -143,13 +143,13 @@ public void setFips(Boolean fips) {
     }
 
     @JsonProperty("kernelArguments")
-    public Object getKernelArguments() {
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    public List<String> getKernelArguments() {
         return kernelArguments;
     }
 
     @JsonProperty("kernelArguments")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setKernelArguments(Object kernelArguments) {
+    public void setKernelArguments(List<String> kernelArguments) {
         this.kernelArguments = kernelArguments;
     }
 
diff --git a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ControllerConfigSpecImageRegistryBundleUserData.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/NetworkInfo.java
similarity index 73%
rename from kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ControllerConfigSpecImageRegistryBundleUserData.java
rename to kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/NetworkInfo.java
index c232daa3ed9..0473f27b817 100644
--- a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ControllerConfigSpecImageRegistryBundleUserData.java
+++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/NetworkInfo.java
@@ -22,6 +22,7 @@
 import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
 import io.fabric8.kubernetes.api.model.PodTemplateSpec;
 import io.fabric8.kubernetes.api.model.ResourceRequirements;
+import io.fabric8.openshift.api.model.config.v1.MTUMigration;
 import io.sundr.builder.annotations.Buildable;
 import io.sundr.builder.annotations.BuildableReference;
 import lombok.EqualsAndHashCode;
@@ -31,8 +32,7 @@
 @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonPropertyOrder({
-    "data",
-    "file"
+    "mtuMigration"
 })
 @ToString
 @EqualsAndHashCode
@@ -52,13 +52,11 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class ControllerConfigSpecImageRegistryBundleUserData implements Editable<ControllerConfigSpecImageRegistryBundleUserDataBuilder> , KubernetesResource
+public class NetworkInfo implements Editable<NetworkInfoBuilder> , KubernetesResource
 {
 
-    @JsonProperty("data")
-    private String data;
-    @JsonProperty("file")
-    private String file;
+    @JsonProperty("mtuMigration")
+    private MTUMigration mtuMigration;
     @JsonIgnore
     private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
 
@@ -66,42 +64,31 @@ public class ControllerConfigSpecImageRegistryBundleUserData implements Editable
      * No args constructor for use in serialization
      * 
      */
-    public ControllerConfigSpecImageRegistryBundleUserData() {
+    public NetworkInfo() {
     }
 
-    public ControllerConfigSpecImageRegistryBundleUserData(String data, String file) {
+    public NetworkInfo(MTUMigration mtuMigration) {
         super();
-        this.data = data;
-        this.file = file;
+        this.mtuMigration = mtuMigration;
     }
 
-    @JsonProperty("data")
-    public String getData() {
-        return data;
+    @JsonProperty("mtuMigration")
+    public MTUMigration getMtuMigration() {
+        return mtuMigration;
     }
 
-    @JsonProperty("data")
-    public void setData(String data) {
-        this.data = data;
-    }
-
-    @JsonProperty("file")
-    public String getFile() {
-        return file;
-    }
-
-    @JsonProperty("file")
-    public void setFile(String file) {
-        this.file = file;
+    @JsonProperty("mtuMigration")
+    public void setMtuMigration(MTUMigration mtuMigration) {
+        this.mtuMigration = mtuMigration;
     }
 
     @JsonIgnore
-    public ControllerConfigSpecImageRegistryBundleUserDataBuilder edit() {
-        return new ControllerConfigSpecImageRegistryBundleUserDataBuilder(this);
+    public NetworkInfoBuilder edit() {
+        return new NetworkInfoBuilder(this);
     }
 
     @JsonIgnore
-    public ControllerConfigSpecImageRegistryBundleUserDataBuilder toBuilder() {
+    public NetworkInfoBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ControllerConfigSpecDns.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/PinnedImageSetRef.java
similarity index 68%
rename from kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ControllerConfigSpecDns.java
rename to kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/PinnedImageSetRef.java
index d15009328b8..836597c7447 100644
--- a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ControllerConfigSpecDns.java
+++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/PinnedImageSetRef.java
@@ -31,9 +31,7 @@
 @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonPropertyOrder({
-    "apiVersion",
-    "kind",
-    "metadata"
+    "name"
 })
 @ToString
 @EqualsAndHashCode
@@ -53,15 +51,11 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class ControllerConfigSpecDns implements Editable<ControllerConfigSpecDnsBuilder> , KubernetesResource
+public class PinnedImageSetRef implements Editable<PinnedImageSetRefBuilder> , KubernetesResource
 {
 
-    @JsonProperty("apiVersion")
-    private String apiVersion;
-    @JsonProperty("kind")
-    private String kind;
-    @JsonProperty("metadata")
-    private ObjectMeta metadata;
+    @JsonProperty("name")
+    private String name;
     @JsonIgnore
     private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
 
@@ -69,53 +63,31 @@ public class ControllerConfigSpecDns implements Editable<ControllerConfigSpecDns
      * No args constructor for use in serialization
      * 
      */
-    public ControllerConfigSpecDns() {
+    public PinnedImageSetRef() {
     }
 
-    public ControllerConfigSpecDns(String apiVersion, String kind, ObjectMeta metadata) {
+    public PinnedImageSetRef(String name) {
         super();
-        this.apiVersion = apiVersion;
-        this.kind = kind;
-        this.metadata = metadata;
+        this.name = name;
     }
 
-    @JsonProperty("apiVersion")
-    public String getApiVersion() {
-        return apiVersion;
+    @JsonProperty("name")
+    public String getName() {
+        return name;
     }
 
-    @JsonProperty("apiVersion")
-    public void setApiVersion(String apiVersion) {
-        this.apiVersion = apiVersion;
-    }
-
-    @JsonProperty("kind")
-    public String getKind() {
-        return kind;
-    }
-
-    @JsonProperty("kind")
-    public void setKind(String kind) {
-        this.kind = kind;
-    }
-
-    @JsonProperty("metadata")
-    public ObjectMeta getMetadata() {
-        return metadata;
-    }
-
-    @JsonProperty("metadata")
-    public void setMetadata(ObjectMeta metadata) {
-        this.metadata = metadata;
+    @JsonProperty("name")
+    public void setName(String name) {
+        this.name = name;
     }
 
     @JsonIgnore
-    public ControllerConfigSpecDnsBuilder edit() {
-        return new ControllerConfigSpecDnsBuilder(this);
+    public PinnedImageSetRefBuilder edit() {
+        return new PinnedImageSetRefBuilder(this);
     }
 
     @JsonIgnore
-    public ControllerConfigSpecDnsBuilder toBuilder() {
+    public PinnedImageSetRefBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/PoolSynchronizerStatus.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/PoolSynchronizerStatus.java
new file mode 100644
index 00000000000..e8f9c1920ee
--- /dev/null
+++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/PoolSynchronizerStatus.java
@@ -0,0 +1,192 @@
+
+package io.fabric8.openshift.api.model.machineconfiguration.v1;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import javax.annotation.Generated;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import io.fabric8.kubernetes.api.builder.Editable;
+import io.fabric8.kubernetes.api.model.Container;
+import io.fabric8.kubernetes.api.model.IntOrString;
+import io.fabric8.kubernetes.api.model.KubernetesResource;
+import io.fabric8.kubernetes.api.model.LabelSelector;
+import io.fabric8.kubernetes.api.model.LocalObjectReference;
+import io.fabric8.kubernetes.api.model.ObjectMeta;
+import io.fabric8.kubernetes.api.model.ObjectReference;
+import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
+import io.fabric8.kubernetes.api.model.PodTemplateSpec;
+import io.fabric8.kubernetes.api.model.ResourceRequirements;
+import io.sundr.builder.annotations.Buildable;
+import io.sundr.builder.annotations.BuildableReference;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "availableMachineCount",
+    "machineCount",
+    "observedGeneration",
+    "poolSynchronizerType",
+    "readyMachineCount",
+    "unavailableMachineCount",
+    "updatedMachineCount"
+})
+@ToString
+@EqualsAndHashCode
+@Accessors(prefix = {
+    "_",
+    ""
+})
+@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
+    @BuildableReference(ObjectMeta.class),
+    @BuildableReference(LabelSelector.class),
+    @BuildableReference(Container.class),
+    @BuildableReference(PodTemplateSpec.class),
+    @BuildableReference(ResourceRequirements.class),
+    @BuildableReference(IntOrString.class),
+    @BuildableReference(ObjectReference.class),
+    @BuildableReference(LocalObjectReference.class),
+    @BuildableReference(PersistentVolumeClaim.class)
+})
+@Generated("jsonschema2pojo")
+public class PoolSynchronizerStatus implements Editable<PoolSynchronizerStatusBuilder> , KubernetesResource
+{
+
+    @JsonProperty("availableMachineCount")
+    private Long availableMachineCount;
+    @JsonProperty("machineCount")
+    private Long machineCount;
+    @JsonProperty("observedGeneration")
+    private Long observedGeneration;
+    @JsonProperty("poolSynchronizerType")
+    private String poolSynchronizerType;
+    @JsonProperty("readyMachineCount")
+    private Long readyMachineCount;
+    @JsonProperty("unavailableMachineCount")
+    private Long unavailableMachineCount;
+    @JsonProperty("updatedMachineCount")
+    private Long updatedMachineCount;
+    @JsonIgnore
+    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
+
+    /**
+     * No args constructor for use in serialization
+     * 
+     */
+    public PoolSynchronizerStatus() {
+    }
+
+    public PoolSynchronizerStatus(Long availableMachineCount, Long machineCount, Long observedGeneration, String poolSynchronizerType, Long readyMachineCount, Long unavailableMachineCount, Long updatedMachineCount) {
+        super();
+        this.availableMachineCount = availableMachineCount;
+        this.machineCount = machineCount;
+        this.observedGeneration = observedGeneration;
+        this.poolSynchronizerType = poolSynchronizerType;
+        this.readyMachineCount = readyMachineCount;
+        this.unavailableMachineCount = unavailableMachineCount;
+        this.updatedMachineCount = updatedMachineCount;
+    }
+
+    @JsonProperty("availableMachineCount")
+    public Long getAvailableMachineCount() {
+        return availableMachineCount;
+    }
+
+    @JsonProperty("availableMachineCount")
+    public void setAvailableMachineCount(Long availableMachineCount) {
+        this.availableMachineCount = availableMachineCount;
+    }
+
+    @JsonProperty("machineCount")
+    public Long getMachineCount() {
+        return machineCount;
+    }
+
+    @JsonProperty("machineCount")
+    public void setMachineCount(Long machineCount) {
+        this.machineCount = machineCount;
+    }
+
+    @JsonProperty("observedGeneration")
+    public Long getObservedGeneration() {
+        return observedGeneration;
+    }
+
+    @JsonProperty("observedGeneration")
+    public void setObservedGeneration(Long observedGeneration) {
+        this.observedGeneration = observedGeneration;
+    }
+
+    @JsonProperty("poolSynchronizerType")
+    public String getPoolSynchronizerType() {
+        return poolSynchronizerType;
+    }
+
+    @JsonProperty("poolSynchronizerType")
+    public void setPoolSynchronizerType(String poolSynchronizerType) {
+        this.poolSynchronizerType = poolSynchronizerType;
+    }
+
+    @JsonProperty("readyMachineCount")
+    public Long getReadyMachineCount() {
+        return readyMachineCount;
+    }
+
+    @JsonProperty("readyMachineCount")
+    public void setReadyMachineCount(Long readyMachineCount) {
+        this.readyMachineCount = readyMachineCount;
+    }
+
+    @JsonProperty("unavailableMachineCount")
+    public Long getUnavailableMachineCount() {
+        return unavailableMachineCount;
+    }
+
+    @JsonProperty("unavailableMachineCount")
+    public void setUnavailableMachineCount(Long unavailableMachineCount) {
+        this.unavailableMachineCount = unavailableMachineCount;
+    }
+
+    @JsonProperty("updatedMachineCount")
+    public Long getUpdatedMachineCount() {
+        return updatedMachineCount;
+    }
+
+    @JsonProperty("updatedMachineCount")
+    public void setUpdatedMachineCount(Long updatedMachineCount) {
+        this.updatedMachineCount = updatedMachineCount;
+    }
+
+    @JsonIgnore
+    public PoolSynchronizerStatusBuilder edit() {
+        return new PoolSynchronizerStatusBuilder(this);
+    }
+
+    @JsonIgnore
+    public PoolSynchronizerStatusBuilder toBuilder() {
+        return edit();
+    }
+
+    @JsonAnyGetter
+    public Map<String, Object> getAdditionalProperties() {
+        return this.additionalProperties;
+    }
+
+    @JsonAnySetter
+    public void setAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+    }
+
+    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
+        this.additionalProperties = additionalProperties;
+    }
+
+}
diff --git a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/BuildInputs.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/BuildInputs.java
new file mode 100644
index 00000000000..314f74a2a20
--- /dev/null
+++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/BuildInputs.java
@@ -0,0 +1,210 @@
+
+package io.fabric8.openshift.api.model.machineconfiguration.v1alpha1;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.Generated;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import io.fabric8.kubernetes.api.builder.Editable;
+import io.fabric8.kubernetes.api.model.Container;
+import io.fabric8.kubernetes.api.model.IntOrString;
+import io.fabric8.kubernetes.api.model.KubernetesResource;
+import io.fabric8.kubernetes.api.model.LabelSelector;
+import io.fabric8.kubernetes.api.model.LocalObjectReference;
+import io.fabric8.kubernetes.api.model.ObjectMeta;
+import io.fabric8.kubernetes.api.model.ObjectReference;
+import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
+import io.fabric8.kubernetes.api.model.PodTemplateSpec;
+import io.fabric8.kubernetes.api.model.ResourceRequirements;
+import io.sundr.builder.annotations.Buildable;
+import io.sundr.builder.annotations.BuildableReference;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "baseImagePullSecret",
+    "baseOSExtensionsImagePullspec",
+    "baseOSImagePullspec",
+    "containerFile",
+    "imageBuilder",
+    "releaseVersion",
+    "renderedImagePushSecret",
+    "renderedImagePushspec"
+})
+@ToString
+@EqualsAndHashCode
+@Accessors(prefix = {
+    "_",
+    ""
+})
+@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
+    @BuildableReference(ObjectMeta.class),
+    @BuildableReference(LabelSelector.class),
+    @BuildableReference(Container.class),
+    @BuildableReference(PodTemplateSpec.class),
+    @BuildableReference(ResourceRequirements.class),
+    @BuildableReference(IntOrString.class),
+    @BuildableReference(ObjectReference.class),
+    @BuildableReference(LocalObjectReference.class),
+    @BuildableReference(PersistentVolumeClaim.class)
+})
+@Generated("jsonschema2pojo")
+public class BuildInputs implements Editable<BuildInputsBuilder> , KubernetesResource
+{
+
+    @JsonProperty("baseImagePullSecret")
+    private ImageSecretObjectReference baseImagePullSecret;
+    @JsonProperty("baseOSExtensionsImagePullspec")
+    private String baseOSExtensionsImagePullspec;
+    @JsonProperty("baseOSImagePullspec")
+    private String baseOSImagePullspec;
+    @JsonProperty("containerFile")
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    private List<MachineOSContainerfile> containerFile = new ArrayList<>();
+    @JsonProperty("imageBuilder")
+    private MachineOSImageBuilder imageBuilder;
+    @JsonProperty("releaseVersion")
+    private String releaseVersion;
+    @JsonProperty("renderedImagePushSecret")
+    private ImageSecretObjectReference renderedImagePushSecret;
+    @JsonProperty("renderedImagePushspec")
+    private String renderedImagePushspec;
+    @JsonIgnore
+    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
+
+    /**
+     * No args constructor for use in serialization
+     * 
+     */
+    public BuildInputs() {
+    }
+
+    public BuildInputs(ImageSecretObjectReference baseImagePullSecret, String baseOSExtensionsImagePullspec, String baseOSImagePullspec, List<MachineOSContainerfile> containerFile, MachineOSImageBuilder imageBuilder, String releaseVersion, ImageSecretObjectReference renderedImagePushSecret, String renderedImagePushspec) {
+        super();
+        this.baseImagePullSecret = baseImagePullSecret;
+        this.baseOSExtensionsImagePullspec = baseOSExtensionsImagePullspec;
+        this.baseOSImagePullspec = baseOSImagePullspec;
+        this.containerFile = containerFile;
+        this.imageBuilder = imageBuilder;
+        this.releaseVersion = releaseVersion;
+        this.renderedImagePushSecret = renderedImagePushSecret;
+        this.renderedImagePushspec = renderedImagePushspec;
+    }
+
+    @JsonProperty("baseImagePullSecret")
+    public ImageSecretObjectReference getBaseImagePullSecret() {
+        return baseImagePullSecret;
+    }
+
+    @JsonProperty("baseImagePullSecret")
+    public void setBaseImagePullSecret(ImageSecretObjectReference baseImagePullSecret) {
+        this.baseImagePullSecret = baseImagePullSecret;
+    }
+
+    @JsonProperty("baseOSExtensionsImagePullspec")
+    public String getBaseOSExtensionsImagePullspec() {
+        return baseOSExtensionsImagePullspec;
+    }
+
+    @JsonProperty("baseOSExtensionsImagePullspec")
+    public void setBaseOSExtensionsImagePullspec(String baseOSExtensionsImagePullspec) {
+        this.baseOSExtensionsImagePullspec = baseOSExtensionsImagePullspec;
+    }
+
+    @JsonProperty("baseOSImagePullspec")
+    public String getBaseOSImagePullspec() {
+        return baseOSImagePullspec;
+    }
+
+    @JsonProperty("baseOSImagePullspec")
+    public void setBaseOSImagePullspec(String baseOSImagePullspec) {
+        this.baseOSImagePullspec = baseOSImagePullspec;
+    }
+
+    @JsonProperty("containerFile")
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    public List<MachineOSContainerfile> getContainerFile() {
+        return containerFile;
+    }
+
+    @JsonProperty("containerFile")
+    public void setContainerFile(List<MachineOSContainerfile> containerFile) {
+        this.containerFile = containerFile;
+    }
+
+    @JsonProperty("imageBuilder")
+    public MachineOSImageBuilder getImageBuilder() {
+        return imageBuilder;
+    }
+
+    @JsonProperty("imageBuilder")
+    public void setImageBuilder(MachineOSImageBuilder imageBuilder) {
+        this.imageBuilder = imageBuilder;
+    }
+
+    @JsonProperty("releaseVersion")
+    public String getReleaseVersion() {
+        return releaseVersion;
+    }
+
+    @JsonProperty("releaseVersion")
+    public void setReleaseVersion(String releaseVersion) {
+        this.releaseVersion = releaseVersion;
+    }
+
+    @JsonProperty("renderedImagePushSecret")
+    public ImageSecretObjectReference getRenderedImagePushSecret() {
+        return renderedImagePushSecret;
+    }
+
+    @JsonProperty("renderedImagePushSecret")
+    public void setRenderedImagePushSecret(ImageSecretObjectReference renderedImagePushSecret) {
+        this.renderedImagePushSecret = renderedImagePushSecret;
+    }
+
+    @JsonProperty("renderedImagePushspec")
+    public String getRenderedImagePushspec() {
+        return renderedImagePushspec;
+    }
+
+    @JsonProperty("renderedImagePushspec")
+    public void setRenderedImagePushspec(String renderedImagePushspec) {
+        this.renderedImagePushspec = renderedImagePushspec;
+    }
+
+    @JsonIgnore
+    public BuildInputsBuilder edit() {
+        return new BuildInputsBuilder(this);
+    }
+
+    @JsonIgnore
+    public BuildInputsBuilder toBuilder() {
+        return edit();
+    }
+
+    @JsonAnyGetter
+    public Map<String, Object> getAdditionalProperties() {
+        return this.additionalProperties;
+    }
+
+    @JsonAnySetter
+    public void setAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+    }
+
+    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
+        this.additionalProperties = additionalProperties;
+    }
+
+}
diff --git a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/BuildOutputs.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/BuildOutputs.java
new file mode 100644
index 00000000000..7d293be1922
--- /dev/null
+++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/BuildOutputs.java
@@ -0,0 +1,108 @@
+
+package io.fabric8.openshift.api.model.machineconfiguration.v1alpha1;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import javax.annotation.Generated;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import io.fabric8.kubernetes.api.builder.Editable;
+import io.fabric8.kubernetes.api.model.Container;
+import io.fabric8.kubernetes.api.model.IntOrString;
+import io.fabric8.kubernetes.api.model.KubernetesResource;
+import io.fabric8.kubernetes.api.model.LabelSelector;
+import io.fabric8.kubernetes.api.model.LocalObjectReference;
+import io.fabric8.kubernetes.api.model.ObjectMeta;
+import io.fabric8.kubernetes.api.model.ObjectReference;
+import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
+import io.fabric8.kubernetes.api.model.PodTemplateSpec;
+import io.fabric8.kubernetes.api.model.ResourceRequirements;
+import io.sundr.builder.annotations.Buildable;
+import io.sundr.builder.annotations.BuildableReference;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "currentImagePullSecret"
+})
+@ToString
+@EqualsAndHashCode
+@Accessors(prefix = {
+    "_",
+    ""
+})
+@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
+    @BuildableReference(ObjectMeta.class),
+    @BuildableReference(LabelSelector.class),
+    @BuildableReference(Container.class),
+    @BuildableReference(PodTemplateSpec.class),
+    @BuildableReference(ResourceRequirements.class),
+    @BuildableReference(IntOrString.class),
+    @BuildableReference(ObjectReference.class),
+    @BuildableReference(LocalObjectReference.class),
+    @BuildableReference(PersistentVolumeClaim.class)
+})
+@Generated("jsonschema2pojo")
+public class BuildOutputs implements Editable<BuildOutputsBuilder> , KubernetesResource
+{
+
+    @JsonProperty("currentImagePullSecret")
+    private ImageSecretObjectReference currentImagePullSecret;
+    @JsonIgnore
+    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
+
+    /**
+     * No args constructor for use in serialization
+     * 
+     */
+    public BuildOutputs() {
+    }
+
+    public BuildOutputs(ImageSecretObjectReference currentImagePullSecret) {
+        super();
+        this.currentImagePullSecret = currentImagePullSecret;
+    }
+
+    @JsonProperty("currentImagePullSecret")
+    public ImageSecretObjectReference getCurrentImagePullSecret() {
+        return currentImagePullSecret;
+    }
+
+    @JsonProperty("currentImagePullSecret")
+    public void setCurrentImagePullSecret(ImageSecretObjectReference currentImagePullSecret) {
+        this.currentImagePullSecret = currentImagePullSecret;
+    }
+
+    @JsonIgnore
+    public BuildOutputsBuilder edit() {
+        return new BuildOutputsBuilder(this);
+    }
+
+    @JsonIgnore
+    public BuildOutputsBuilder toBuilder() {
+        return edit();
+    }
+
+    @JsonAnyGetter
+    public Map<String, Object> getAdditionalProperties() {
+        return this.additionalProperties;
+    }
+
+    @JsonAnySetter
+    public void setAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+    }
+
+    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
+        this.additionalProperties = additionalProperties;
+    }
+
+}
diff --git a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/ImageSecretObjectReference.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/ImageSecretObjectReference.java
new file mode 100644
index 00000000000..c60f1e89cdd
--- /dev/null
+++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/ImageSecretObjectReference.java
@@ -0,0 +1,108 @@
+
+package io.fabric8.openshift.api.model.machineconfiguration.v1alpha1;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import javax.annotation.Generated;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import io.fabric8.kubernetes.api.builder.Editable;
+import io.fabric8.kubernetes.api.model.Container;
+import io.fabric8.kubernetes.api.model.IntOrString;
+import io.fabric8.kubernetes.api.model.KubernetesResource;
+import io.fabric8.kubernetes.api.model.LabelSelector;
+import io.fabric8.kubernetes.api.model.LocalObjectReference;
+import io.fabric8.kubernetes.api.model.ObjectMeta;
+import io.fabric8.kubernetes.api.model.ObjectReference;
+import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
+import io.fabric8.kubernetes.api.model.PodTemplateSpec;
+import io.fabric8.kubernetes.api.model.ResourceRequirements;
+import io.sundr.builder.annotations.Buildable;
+import io.sundr.builder.annotations.BuildableReference;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "name"
+})
+@ToString
+@EqualsAndHashCode
+@Accessors(prefix = {
+    "_",
+    ""
+})
+@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
+    @BuildableReference(ObjectMeta.class),
+    @BuildableReference(LabelSelector.class),
+    @BuildableReference(Container.class),
+    @BuildableReference(PodTemplateSpec.class),
+    @BuildableReference(ResourceRequirements.class),
+    @BuildableReference(IntOrString.class),
+    @BuildableReference(ObjectReference.class),
+    @BuildableReference(LocalObjectReference.class),
+    @BuildableReference(PersistentVolumeClaim.class)
+})
+@Generated("jsonschema2pojo")
+public class ImageSecretObjectReference implements Editable<ImageSecretObjectReferenceBuilder> , KubernetesResource
+{
+
+    @JsonProperty("name")
+    private String name;
+    @JsonIgnore
+    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
+
+    /**
+     * No args constructor for use in serialization
+     * 
+     */
+    public ImageSecretObjectReference() {
+    }
+
+    public ImageSecretObjectReference(String name) {
+        super();
+        this.name = name;
+    }
+
+    @JsonProperty("name")
+    public String getName() {
+        return name;
+    }
+
+    @JsonProperty("name")
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @JsonIgnore
+    public ImageSecretObjectReferenceBuilder edit() {
+        return new ImageSecretObjectReferenceBuilder(this);
+    }
+
+    @JsonIgnore
+    public ImageSecretObjectReferenceBuilder toBuilder() {
+        return edit();
+    }
+
+    @JsonAnyGetter
+    public Map<String, Object> getAdditionalProperties() {
+        return this.additionalProperties;
+    }
+
+    @JsonAnySetter
+    public void setAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+    }
+
+    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
+        this.additionalProperties = additionalProperties;
+    }
+
+}
diff --git a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MCOObjectReference.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MCOObjectReference.java
new file mode 100644
index 00000000000..bb5f1b49a68
--- /dev/null
+++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MCOObjectReference.java
@@ -0,0 +1,108 @@
+
+package io.fabric8.openshift.api.model.machineconfiguration.v1alpha1;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import javax.annotation.Generated;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import io.fabric8.kubernetes.api.builder.Editable;
+import io.fabric8.kubernetes.api.model.Container;
+import io.fabric8.kubernetes.api.model.IntOrString;
+import io.fabric8.kubernetes.api.model.KubernetesResource;
+import io.fabric8.kubernetes.api.model.LabelSelector;
+import io.fabric8.kubernetes.api.model.LocalObjectReference;
+import io.fabric8.kubernetes.api.model.ObjectMeta;
+import io.fabric8.kubernetes.api.model.ObjectReference;
+import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
+import io.fabric8.kubernetes.api.model.PodTemplateSpec;
+import io.fabric8.kubernetes.api.model.ResourceRequirements;
+import io.sundr.builder.annotations.Buildable;
+import io.sundr.builder.annotations.BuildableReference;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "name"
+})
+@ToString
+@EqualsAndHashCode
+@Accessors(prefix = {
+    "_",
+    ""
+})
+@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
+    @BuildableReference(ObjectMeta.class),
+    @BuildableReference(LabelSelector.class),
+    @BuildableReference(Container.class),
+    @BuildableReference(PodTemplateSpec.class),
+    @BuildableReference(ResourceRequirements.class),
+    @BuildableReference(IntOrString.class),
+    @BuildableReference(ObjectReference.class),
+    @BuildableReference(LocalObjectReference.class),
+    @BuildableReference(PersistentVolumeClaim.class)
+})
+@Generated("jsonschema2pojo")
+public class MCOObjectReference implements Editable<MCOObjectReferenceBuilder> , KubernetesResource
+{
+
+    @JsonProperty("name")
+    private String name;
+    @JsonIgnore
+    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
+
+    /**
+     * No args constructor for use in serialization
+     * 
+     */
+    public MCOObjectReference() {
+    }
+
+    public MCOObjectReference(String name) {
+        super();
+        this.name = name;
+    }
+
+    @JsonProperty("name")
+    public String getName() {
+        return name;
+    }
+
+    @JsonProperty("name")
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @JsonIgnore
+    public MCOObjectReferenceBuilder edit() {
+        return new MCOObjectReferenceBuilder(this);
+    }
+
+    @JsonIgnore
+    public MCOObjectReferenceBuilder toBuilder() {
+        return edit();
+    }
+
+    @JsonAnyGetter
+    public Map<String, Object> getAdditionalProperties() {
+        return this.additionalProperties;
+    }
+
+    @JsonAnySetter
+    public void setAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+    }
+
+    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
+        this.additionalProperties = additionalProperties;
+    }
+
+}
diff --git a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MachineConfigNode.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MachineConfigNode.java
new file mode 100644
index 00000000000..1593635dde0
--- /dev/null
+++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MachineConfigNode.java
@@ -0,0 +1,203 @@
+
+package io.fabric8.openshift.api.model.machineconfiguration.v1alpha1;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import javax.annotation.Generated;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import io.fabric8.kubernetes.api.builder.Editable;
+import io.fabric8.kubernetes.api.model.Container;
+import io.fabric8.kubernetes.api.model.HasMetadata;
+import io.fabric8.kubernetes.api.model.IntOrString;
+import io.fabric8.kubernetes.api.model.LabelSelector;
+import io.fabric8.kubernetes.api.model.LocalObjectReference;
+import io.fabric8.kubernetes.api.model.ObjectMeta;
+import io.fabric8.kubernetes.api.model.ObjectReference;
+import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
+import io.fabric8.kubernetes.api.model.PodTemplateSpec;
+import io.fabric8.kubernetes.api.model.ResourceRequirements;
+import io.fabric8.kubernetes.model.annotation.Group;
+import io.fabric8.kubernetes.model.annotation.Version;
+import io.sundr.builder.annotations.Buildable;
+import io.sundr.builder.annotations.BuildableReference;
+import io.sundr.transform.annotations.TemplateTransformation;
+import io.sundr.transform.annotations.TemplateTransformations;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "apiVersion",
+    "kind",
+    "metadata",
+    "spec",
+    "status"
+})
+@ToString
+@EqualsAndHashCode
+@Accessors(prefix = {
+    "_",
+    ""
+})
+@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
+    @BuildableReference(ObjectMeta.class),
+    @BuildableReference(LabelSelector.class),
+    @BuildableReference(Container.class),
+    @BuildableReference(PodTemplateSpec.class),
+    @BuildableReference(ResourceRequirements.class),
+    @BuildableReference(IntOrString.class),
+    @BuildableReference(ObjectReference.class),
+    @BuildableReference(LocalObjectReference.class),
+    @BuildableReference(PersistentVolumeClaim.class)
+})
+@TemplateTransformations({
+    @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true)
+})
+@Version("v1alpha1")
+@Group("machineconfiguration.openshift.io")
+@Generated("jsonschema2pojo")
+public class MachineConfigNode implements Editable<MachineConfigNodeBuilder> , HasMetadata
+{
+
+    /**
+     * 
+     * (Required)
+     * 
+     */
+    @JsonProperty("apiVersion")
+    private String apiVersion = "machineconfiguration.openshift.io/v1alpha1";
+    /**
+     * 
+     * (Required)
+     * 
+     */
+    @JsonProperty("kind")
+    private String kind = "MachineConfigNode";
+    @JsonProperty("metadata")
+    private ObjectMeta metadata;
+    @JsonProperty("spec")
+    private MachineConfigNodeSpec spec;
+    @JsonProperty("status")
+    private MachineConfigNodeStatus status;
+    @JsonIgnore
+    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
+
+    /**
+     * No args constructor for use in serialization
+     * 
+     */
+    public MachineConfigNode() {
+    }
+
+    public MachineConfigNode(String apiVersion, String kind, ObjectMeta metadata, MachineConfigNodeSpec spec, MachineConfigNodeStatus status) {
+        super();
+        this.apiVersion = apiVersion;
+        this.kind = kind;
+        this.metadata = metadata;
+        this.spec = spec;
+        this.status = status;
+    }
+
+    /**
+     * 
+     * (Required)
+     * 
+     */
+    @JsonProperty("apiVersion")
+    public String getApiVersion() {
+        return apiVersion;
+    }
+
+    /**
+     * 
+     * (Required)
+     * 
+     */
+    @JsonProperty("apiVersion")
+    public void setApiVersion(String apiVersion) {
+        this.apiVersion = apiVersion;
+    }
+
+    /**
+     * 
+     * (Required)
+     * 
+     */
+    @JsonProperty("kind")
+    public String getKind() {
+        return kind;
+    }
+
+    /**
+     * 
+     * (Required)
+     * 
+     */
+    @JsonProperty("kind")
+    public void setKind(String kind) {
+        this.kind = kind;
+    }
+
+    @JsonProperty("metadata")
+    public ObjectMeta getMetadata() {
+        return metadata;
+    }
+
+    @JsonProperty("metadata")
+    public void setMetadata(ObjectMeta metadata) {
+        this.metadata = metadata;
+    }
+
+    @JsonProperty("spec")
+    public MachineConfigNodeSpec getSpec() {
+        return spec;
+    }
+
+    @JsonProperty("spec")
+    public void setSpec(MachineConfigNodeSpec spec) {
+        this.spec = spec;
+    }
+
+    @JsonProperty("status")
+    public MachineConfigNodeStatus getStatus() {
+        return status;
+    }
+
+    @JsonProperty("status")
+    public void setStatus(MachineConfigNodeStatus status) {
+        this.status = status;
+    }
+
+    @JsonIgnore
+    public MachineConfigNodeBuilder edit() {
+        return new MachineConfigNodeBuilder(this);
+    }
+
+    @JsonIgnore
+    public MachineConfigNodeBuilder toBuilder() {
+        return edit();
+    }
+
+    @JsonAnyGetter
+    public Map<String, Object> getAdditionalProperties() {
+        return this.additionalProperties;
+    }
+
+    @JsonAnySetter
+    public void setAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+    }
+
+    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
+        this.additionalProperties = additionalProperties;
+    }
+
+}
diff --git a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPoolSpecConfiguration.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MachineConfigNodeList.java
similarity index 57%
rename from kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPoolSpecConfiguration.java
rename to kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MachineConfigNodeList.java
index a5c639eb921..34b543d046e 100644
--- a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPoolSpecConfiguration.java
+++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MachineConfigNodeList.java
@@ -1,5 +1,5 @@
 
-package io.fabric8.openshift.api.model.machineconfiguration.v1;
+package io.fabric8.openshift.api.model.machineconfiguration.v1alpha1;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
@@ -17,15 +17,21 @@
 import io.fabric8.kubernetes.api.model.Container;
 import io.fabric8.kubernetes.api.model.IntOrString;
 import io.fabric8.kubernetes.api.model.KubernetesResource;
+import io.fabric8.kubernetes.api.model.KubernetesResourceList;
 import io.fabric8.kubernetes.api.model.LabelSelector;
+import io.fabric8.kubernetes.api.model.ListMeta;
 import io.fabric8.kubernetes.api.model.LocalObjectReference;
 import io.fabric8.kubernetes.api.model.ObjectMeta;
 import io.fabric8.kubernetes.api.model.ObjectReference;
 import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
 import io.fabric8.kubernetes.api.model.PodTemplateSpec;
 import io.fabric8.kubernetes.api.model.ResourceRequirements;
+import io.fabric8.kubernetes.model.annotation.Group;
+import io.fabric8.kubernetes.model.annotation.Version;
 import io.sundr.builder.annotations.Buildable;
 import io.sundr.builder.annotations.BuildableReference;
+import io.sundr.transform.annotations.TemplateTransformation;
+import io.sundr.transform.annotations.TemplateTransformations;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import lombok.experimental.Accessors;
@@ -35,12 +41,8 @@
 @JsonPropertyOrder({
     "apiVersion",
     "kind",
-    "fieldPath",
-    "name",
-    "namespace",
-    "resourceVersion",
-    "source",
-    "uid"
+    "metadata",
+    "items"
 })
 @ToString
 @EqualsAndHashCode
@@ -59,27 +61,34 @@
     @BuildableReference(LocalObjectReference.class),
     @BuildableReference(PersistentVolumeClaim.class)
 })
+@TemplateTransformations({
+    @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true)
+})
+@Version("v1alpha1")
+@Group("machineconfiguration.openshift.io")
 @Generated("jsonschema2pojo")
-public class MachineConfigPoolSpecConfiguration implements Editable<MachineConfigPoolSpecConfigurationBuilder> , KubernetesResource
+public class MachineConfigNodeList implements Editable<MachineConfigNodeListBuilder> , KubernetesResource, KubernetesResourceList<io.fabric8.openshift.api.model.machineconfiguration.v1alpha1.MachineConfigNode>
 {
 
+    /**
+     * 
+     * (Required)
+     * 
+     */
     @JsonProperty("apiVersion")
-    private String apiVersion;
-    @JsonProperty("fieldPath")
-    private String fieldPath;
-    @JsonProperty("kind")
-    private String kind;
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("namespace")
-    private String namespace;
-    @JsonProperty("resourceVersion")
-    private String resourceVersion;
-    @JsonProperty("source")
+    private String apiVersion = "machineconfiguration.openshift.io/v1alpha1";
+    @JsonProperty("items")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<MachineConfigPoolSpecCSource> source = new ArrayList<>();
-    @JsonProperty("uid")
-    private String uid;
+    private List<io.fabric8.openshift.api.model.machineconfiguration.v1alpha1.MachineConfigNode> items = new ArrayList<>();
+    /**
+     * 
+     * (Required)
+     * 
+     */
+    @JsonProperty("kind")
+    private String kind = "MachineConfigNodeList";
+    @JsonProperty("metadata")
+    private ListMeta metadata;
     @JsonIgnore
     private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
 
@@ -87,109 +96,85 @@ public class MachineConfigPoolSpecConfiguration implements Editable<MachineConfi
      * No args constructor for use in serialization
      * 
      */
-    public MachineConfigPoolSpecConfiguration() {
+    public MachineConfigNodeList() {
     }
 
-    public MachineConfigPoolSpecConfiguration(String apiVersion, String fieldPath, String kind, String name, String namespace, String resourceVersion, List<MachineConfigPoolSpecCSource> source, String uid) {
+    public MachineConfigNodeList(String apiVersion, List<io.fabric8.openshift.api.model.machineconfiguration.v1alpha1.MachineConfigNode> items, String kind, ListMeta metadata) {
         super();
         this.apiVersion = apiVersion;
-        this.fieldPath = fieldPath;
+        this.items = items;
         this.kind = kind;
-        this.name = name;
-        this.namespace = namespace;
-        this.resourceVersion = resourceVersion;
-        this.source = source;
-        this.uid = uid;
+        this.metadata = metadata;
     }
 
+    /**
+     * 
+     * (Required)
+     * 
+     */
     @JsonProperty("apiVersion")
     public String getApiVersion() {
         return apiVersion;
     }
 
+    /**
+     * 
+     * (Required)
+     * 
+     */
     @JsonProperty("apiVersion")
     public void setApiVersion(String apiVersion) {
         this.apiVersion = apiVersion;
     }
 
-    @JsonProperty("fieldPath")
-    public String getFieldPath() {
-        return fieldPath;
+    @JsonProperty("items")
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    public List<io.fabric8.openshift.api.model.machineconfiguration.v1alpha1.MachineConfigNode> getItems() {
+        return items;
     }
 
-    @JsonProperty("fieldPath")
-    public void setFieldPath(String fieldPath) {
-        this.fieldPath = fieldPath;
+    @JsonProperty("items")
+    public void setItems(List<io.fabric8.openshift.api.model.machineconfiguration.v1alpha1.MachineConfigNode> items) {
+        this.items = items;
     }
 
+    /**
+     * 
+     * (Required)
+     * 
+     */
     @JsonProperty("kind")
     public String getKind() {
         return kind;
     }
 
+    /**
+     * 
+     * (Required)
+     * 
+     */
     @JsonProperty("kind")
     public void setKind(String kind) {
         this.kind = kind;
     }
 
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("namespace")
-    public String getNamespace() {
-        return namespace;
-    }
-
-    @JsonProperty("namespace")
-    public void setNamespace(String namespace) {
-        this.namespace = namespace;
-    }
-
-    @JsonProperty("resourceVersion")
-    public String getResourceVersion() {
-        return resourceVersion;
-    }
-
-    @JsonProperty("resourceVersion")
-    public void setResourceVersion(String resourceVersion) {
-        this.resourceVersion = resourceVersion;
-    }
-
-    @JsonProperty("source")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<MachineConfigPoolSpecCSource> getSource() {
-        return source;
-    }
-
-    @JsonProperty("source")
-    public void setSource(List<MachineConfigPoolSpecCSource> source) {
-        this.source = source;
-    }
-
-    @JsonProperty("uid")
-    public String getUid() {
-        return uid;
+    @JsonProperty("metadata")
+    public ListMeta getMetadata() {
+        return metadata;
     }
 
-    @JsonProperty("uid")
-    public void setUid(String uid) {
-        this.uid = uid;
+    @JsonProperty("metadata")
+    public void setMetadata(ListMeta metadata) {
+        this.metadata = metadata;
     }
 
     @JsonIgnore
-    public MachineConfigPoolSpecConfigurationBuilder edit() {
-        return new MachineConfigPoolSpecConfigurationBuilder(this);
+    public MachineConfigNodeListBuilder edit() {
+        return new MachineConfigNodeListBuilder(this);
     }
 
     @JsonIgnore
-    public MachineConfigPoolSpecConfigurationBuilder toBuilder() {
+    public MachineConfigNodeListBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPoolSpecMachineConfigSelector.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MachineConfigNodeSpec.java
similarity index 58%
rename from kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPoolSpecMachineConfigSelector.java
rename to kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MachineConfigNodeSpec.java
index 96b325bccc4..a170b664f3f 100644
--- a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPoolSpecMachineConfigSelector.java
+++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MachineConfigNodeSpec.java
@@ -1,5 +1,5 @@
 
-package io.fabric8.openshift.api.model.machineconfiguration.v1;
+package io.fabric8.openshift.api.model.machineconfiguration.v1alpha1;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
@@ -18,7 +18,6 @@
 import io.fabric8.kubernetes.api.model.IntOrString;
 import io.fabric8.kubernetes.api.model.KubernetesResource;
 import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LabelSelectorRequirement;
 import io.fabric8.kubernetes.api.model.LocalObjectReference;
 import io.fabric8.kubernetes.api.model.ObjectMeta;
 import io.fabric8.kubernetes.api.model.ObjectReference;
@@ -34,8 +33,10 @@
 @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonPropertyOrder({
-    "matchExpressions",
-    "matchLabels"
+    "configVersion",
+    "node",
+    "pinnedImageSets",
+    "pool"
 })
 @ToString
 @EqualsAndHashCode
@@ -55,15 +56,18 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class MachineConfigPoolSpecMachineConfigSelector implements Editable<MachineConfigPoolSpecMachineConfigSelectorBuilder> , KubernetesResource
+public class MachineConfigNodeSpec implements Editable<MachineConfigNodeSpecBuilder> , KubernetesResource
 {
 
-    @JsonProperty("matchExpressions")
+    @JsonProperty("configVersion")
+    private MachineConfigNodeSpecMachineConfigVersion configVersion;
+    @JsonProperty("node")
+    private MCOObjectReference node;
+    @JsonProperty("pinnedImageSets")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<LabelSelectorRequirement> matchExpressions = new ArrayList<>();
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private Map<String, String> matchLabels = new LinkedHashMap<>();
+    private List<MachineConfigNodeSpecPinnedImageSet> pinnedImageSets = new ArrayList<>();
+    @JsonProperty("pool")
+    private MCOObjectReference pool;
     @JsonIgnore
     private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
 
@@ -71,44 +75,65 @@ public class MachineConfigPoolSpecMachineConfigSelector implements Editable<Mach
      * No args constructor for use in serialization
      * 
      */
-    public MachineConfigPoolSpecMachineConfigSelector() {
+    public MachineConfigNodeSpec() {
     }
 
-    public MachineConfigPoolSpecMachineConfigSelector(List<LabelSelectorRequirement> matchExpressions, Map<String, String> matchLabels) {
+    public MachineConfigNodeSpec(MachineConfigNodeSpecMachineConfigVersion configVersion, MCOObjectReference node, List<MachineConfigNodeSpecPinnedImageSet> pinnedImageSets, MCOObjectReference pool) {
         super();
-        this.matchExpressions = matchExpressions;
-        this.matchLabels = matchLabels;
+        this.configVersion = configVersion;
+        this.node = node;
+        this.pinnedImageSets = pinnedImageSets;
+        this.pool = pool;
     }
 
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<LabelSelectorRequirement> getMatchExpressions() {
-        return matchExpressions;
+    @JsonProperty("configVersion")
+    public MachineConfigNodeSpecMachineConfigVersion getConfigVersion() {
+        return configVersion;
+    }
+
+    @JsonProperty("configVersion")
+    public void setConfigVersion(MachineConfigNodeSpecMachineConfigVersion configVersion) {
+        this.configVersion = configVersion;
+    }
+
+    @JsonProperty("node")
+    public MCOObjectReference getNode() {
+        return node;
     }
 
-    @JsonProperty("matchExpressions")
-    public void setMatchExpressions(List<LabelSelectorRequirement> matchExpressions) {
-        this.matchExpressions = matchExpressions;
+    @JsonProperty("node")
+    public void setNode(MCOObjectReference node) {
+        this.node = node;
     }
 
-    @JsonProperty("matchLabels")
+    @JsonProperty("pinnedImageSets")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public Map<String, String> getMatchLabels() {
-        return matchLabels;
+    public List<MachineConfigNodeSpecPinnedImageSet> getPinnedImageSets() {
+        return pinnedImageSets;
+    }
+
+    @JsonProperty("pinnedImageSets")
+    public void setPinnedImageSets(List<MachineConfigNodeSpecPinnedImageSet> pinnedImageSets) {
+        this.pinnedImageSets = pinnedImageSets;
+    }
+
+    @JsonProperty("pool")
+    public MCOObjectReference getPool() {
+        return pool;
     }
 
-    @JsonProperty("matchLabels")
-    public void setMatchLabels(Map<String, String> matchLabels) {
-        this.matchLabels = matchLabels;
+    @JsonProperty("pool")
+    public void setPool(MCOObjectReference pool) {
+        this.pool = pool;
     }
 
     @JsonIgnore
-    public MachineConfigPoolSpecMachineConfigSelectorBuilder edit() {
-        return new MachineConfigPoolSpecMachineConfigSelectorBuilder(this);
+    public MachineConfigNodeSpecBuilder edit() {
+        return new MachineConfigNodeSpecBuilder(this);
     }
 
     @JsonIgnore
-    public MachineConfigPoolSpecMachineConfigSelectorBuilder toBuilder() {
+    public MachineConfigNodeSpecBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MachineConfigNodeSpecMachineConfigVersion.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MachineConfigNodeSpecMachineConfigVersion.java
new file mode 100644
index 00000000000..a968e96fdd7
--- /dev/null
+++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MachineConfigNodeSpecMachineConfigVersion.java
@@ -0,0 +1,108 @@
+
+package io.fabric8.openshift.api.model.machineconfiguration.v1alpha1;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import javax.annotation.Generated;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import io.fabric8.kubernetes.api.builder.Editable;
+import io.fabric8.kubernetes.api.model.Container;
+import io.fabric8.kubernetes.api.model.IntOrString;
+import io.fabric8.kubernetes.api.model.KubernetesResource;
+import io.fabric8.kubernetes.api.model.LabelSelector;
+import io.fabric8.kubernetes.api.model.LocalObjectReference;
+import io.fabric8.kubernetes.api.model.ObjectMeta;
+import io.fabric8.kubernetes.api.model.ObjectReference;
+import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
+import io.fabric8.kubernetes.api.model.PodTemplateSpec;
+import io.fabric8.kubernetes.api.model.ResourceRequirements;
+import io.sundr.builder.annotations.Buildable;
+import io.sundr.builder.annotations.BuildableReference;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "desired"
+})
+@ToString
+@EqualsAndHashCode
+@Accessors(prefix = {
+    "_",
+    ""
+})
+@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
+    @BuildableReference(ObjectMeta.class),
+    @BuildableReference(LabelSelector.class),
+    @BuildableReference(Container.class),
+    @BuildableReference(PodTemplateSpec.class),
+    @BuildableReference(ResourceRequirements.class),
+    @BuildableReference(IntOrString.class),
+    @BuildableReference(ObjectReference.class),
+    @BuildableReference(LocalObjectReference.class),
+    @BuildableReference(PersistentVolumeClaim.class)
+})
+@Generated("jsonschema2pojo")
+public class MachineConfigNodeSpecMachineConfigVersion implements Editable<MachineConfigNodeSpecMachineConfigVersionBuilder> , KubernetesResource
+{
+
+    @JsonProperty("desired")
+    private String desired;
+    @JsonIgnore
+    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
+
+    /**
+     * No args constructor for use in serialization
+     * 
+     */
+    public MachineConfigNodeSpecMachineConfigVersion() {
+    }
+
+    public MachineConfigNodeSpecMachineConfigVersion(String desired) {
+        super();
+        this.desired = desired;
+    }
+
+    @JsonProperty("desired")
+    public String getDesired() {
+        return desired;
+    }
+
+    @JsonProperty("desired")
+    public void setDesired(String desired) {
+        this.desired = desired;
+    }
+
+    @JsonIgnore
+    public MachineConfigNodeSpecMachineConfigVersionBuilder edit() {
+        return new MachineConfigNodeSpecMachineConfigVersionBuilder(this);
+    }
+
+    @JsonIgnore
+    public MachineConfigNodeSpecMachineConfigVersionBuilder toBuilder() {
+        return edit();
+    }
+
+    @JsonAnyGetter
+    public Map<String, Object> getAdditionalProperties() {
+        return this.additionalProperties;
+    }
+
+    @JsonAnySetter
+    public void setAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+    }
+
+    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
+        this.additionalProperties = additionalProperties;
+    }
+
+}
diff --git a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MachineConfigNodeSpecPinnedImageSet.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MachineConfigNodeSpecPinnedImageSet.java
new file mode 100644
index 00000000000..d29da3737e2
--- /dev/null
+++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MachineConfigNodeSpecPinnedImageSet.java
@@ -0,0 +1,108 @@
+
+package io.fabric8.openshift.api.model.machineconfiguration.v1alpha1;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import javax.annotation.Generated;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import io.fabric8.kubernetes.api.builder.Editable;
+import io.fabric8.kubernetes.api.model.Container;
+import io.fabric8.kubernetes.api.model.IntOrString;
+import io.fabric8.kubernetes.api.model.KubernetesResource;
+import io.fabric8.kubernetes.api.model.LabelSelector;
+import io.fabric8.kubernetes.api.model.LocalObjectReference;
+import io.fabric8.kubernetes.api.model.ObjectMeta;
+import io.fabric8.kubernetes.api.model.ObjectReference;
+import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
+import io.fabric8.kubernetes.api.model.PodTemplateSpec;
+import io.fabric8.kubernetes.api.model.ResourceRequirements;
+import io.sundr.builder.annotations.Buildable;
+import io.sundr.builder.annotations.BuildableReference;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "name"
+})
+@ToString
+@EqualsAndHashCode
+@Accessors(prefix = {
+    "_",
+    ""
+})
+@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
+    @BuildableReference(ObjectMeta.class),
+    @BuildableReference(LabelSelector.class),
+    @BuildableReference(Container.class),
+    @BuildableReference(PodTemplateSpec.class),
+    @BuildableReference(ResourceRequirements.class),
+    @BuildableReference(IntOrString.class),
+    @BuildableReference(ObjectReference.class),
+    @BuildableReference(LocalObjectReference.class),
+    @BuildableReference(PersistentVolumeClaim.class)
+})
+@Generated("jsonschema2pojo")
+public class MachineConfigNodeSpecPinnedImageSet implements Editable<MachineConfigNodeSpecPinnedImageSetBuilder> , KubernetesResource
+{
+
+    @JsonProperty("name")
+    private String name;
+    @JsonIgnore
+    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
+
+    /**
+     * No args constructor for use in serialization
+     * 
+     */
+    public MachineConfigNodeSpecPinnedImageSet() {
+    }
+
+    public MachineConfigNodeSpecPinnedImageSet(String name) {
+        super();
+        this.name = name;
+    }
+
+    @JsonProperty("name")
+    public String getName() {
+        return name;
+    }
+
+    @JsonProperty("name")
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @JsonIgnore
+    public MachineConfigNodeSpecPinnedImageSetBuilder edit() {
+        return new MachineConfigNodeSpecPinnedImageSetBuilder(this);
+    }
+
+    @JsonIgnore
+    public MachineConfigNodeSpecPinnedImageSetBuilder toBuilder() {
+        return edit();
+    }
+
+    @JsonAnyGetter
+    public Map<String, Object> getAdditionalProperties() {
+        return this.additionalProperties;
+    }
+
+    @JsonAnySetter
+    public void setAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+    }
+
+    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
+        this.additionalProperties = additionalProperties;
+    }
+
+}
diff --git a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/KubeletConfigSpecMachineConfigPoolSelector.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MachineConfigNodeStatus.java
similarity index 55%
rename from kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/KubeletConfigSpecMachineConfigPoolSelector.java
rename to kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MachineConfigNodeStatus.java
index 60f8b2f0abe..e5b85e11657 100644
--- a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/KubeletConfigSpecMachineConfigPoolSelector.java
+++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MachineConfigNodeStatus.java
@@ -1,5 +1,5 @@
 
-package io.fabric8.openshift.api.model.machineconfiguration.v1;
+package io.fabric8.openshift.api.model.machineconfiguration.v1alpha1;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
@@ -14,11 +14,11 @@
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import io.fabric8.kubernetes.api.builder.Editable;
+import io.fabric8.kubernetes.api.model.Condition;
 import io.fabric8.kubernetes.api.model.Container;
 import io.fabric8.kubernetes.api.model.IntOrString;
 import io.fabric8.kubernetes.api.model.KubernetesResource;
 import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LabelSelectorRequirement;
 import io.fabric8.kubernetes.api.model.LocalObjectReference;
 import io.fabric8.kubernetes.api.model.ObjectMeta;
 import io.fabric8.kubernetes.api.model.ObjectReference;
@@ -34,8 +34,10 @@
 @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonPropertyOrder({
-    "matchExpressions",
-    "matchLabels"
+    "conditions",
+    "configVersion",
+    "observedGeneration",
+    "pinnedImageSets"
 })
 @ToString
 @EqualsAndHashCode
@@ -55,15 +57,19 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class KubeletConfigSpecMachineConfigPoolSelector implements Editable<KubeletConfigSpecMachineConfigPoolSelectorBuilder> , KubernetesResource
+public class MachineConfigNodeStatus implements Editable<MachineConfigNodeStatusBuilder> , KubernetesResource
 {
 
-    @JsonProperty("matchExpressions")
+    @JsonProperty("conditions")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<LabelSelectorRequirement> matchExpressions = new ArrayList<>();
-    @JsonProperty("matchLabels")
+    private List<Condition> conditions = new ArrayList<>();
+    @JsonProperty("configVersion")
+    private MachineConfigNodeStatusMachineConfigVersion configVersion;
+    @JsonProperty("observedGeneration")
+    private Long observedGeneration;
+    @JsonProperty("pinnedImageSets")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private Map<String, String> matchLabels = new LinkedHashMap<>();
+    private List<MachineConfigNodeStatusPinnedImageSet> pinnedImageSets = new ArrayList<>();
     @JsonIgnore
     private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
 
@@ -71,44 +77,66 @@ public class KubeletConfigSpecMachineConfigPoolSelector implements Editable<Kube
      * No args constructor for use in serialization
      * 
      */
-    public KubeletConfigSpecMachineConfigPoolSelector() {
+    public MachineConfigNodeStatus() {
     }
 
-    public KubeletConfigSpecMachineConfigPoolSelector(List<LabelSelectorRequirement> matchExpressions, Map<String, String> matchLabels) {
+    public MachineConfigNodeStatus(List<Condition> conditions, MachineConfigNodeStatusMachineConfigVersion configVersion, Long observedGeneration, List<MachineConfigNodeStatusPinnedImageSet> pinnedImageSets) {
         super();
-        this.matchExpressions = matchExpressions;
-        this.matchLabels = matchLabels;
+        this.conditions = conditions;
+        this.configVersion = configVersion;
+        this.observedGeneration = observedGeneration;
+        this.pinnedImageSets = pinnedImageSets;
     }
 
-    @JsonProperty("matchExpressions")
+    @JsonProperty("conditions")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<LabelSelectorRequirement> getMatchExpressions() {
-        return matchExpressions;
+    public List<Condition> getConditions() {
+        return conditions;
     }
 
-    @JsonProperty("matchExpressions")
-    public void setMatchExpressions(List<LabelSelectorRequirement> matchExpressions) {
-        this.matchExpressions = matchExpressions;
+    @JsonProperty("conditions")
+    public void setConditions(List<Condition> conditions) {
+        this.conditions = conditions;
     }
 
-    @JsonProperty("matchLabels")
+    @JsonProperty("configVersion")
+    public MachineConfigNodeStatusMachineConfigVersion getConfigVersion() {
+        return configVersion;
+    }
+
+    @JsonProperty("configVersion")
+    public void setConfigVersion(MachineConfigNodeStatusMachineConfigVersion configVersion) {
+        this.configVersion = configVersion;
+    }
+
+    @JsonProperty("observedGeneration")
+    public Long getObservedGeneration() {
+        return observedGeneration;
+    }
+
+    @JsonProperty("observedGeneration")
+    public void setObservedGeneration(Long observedGeneration) {
+        this.observedGeneration = observedGeneration;
+    }
+
+    @JsonProperty("pinnedImageSets")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public Map<String, String> getMatchLabels() {
-        return matchLabels;
+    public List<MachineConfigNodeStatusPinnedImageSet> getPinnedImageSets() {
+        return pinnedImageSets;
     }
 
-    @JsonProperty("matchLabels")
-    public void setMatchLabels(Map<String, String> matchLabels) {
-        this.matchLabels = matchLabels;
+    @JsonProperty("pinnedImageSets")
+    public void setPinnedImageSets(List<MachineConfigNodeStatusPinnedImageSet> pinnedImageSets) {
+        this.pinnedImageSets = pinnedImageSets;
     }
 
     @JsonIgnore
-    public KubeletConfigSpecMachineConfigPoolSelectorBuilder edit() {
-        return new KubeletConfigSpecMachineConfigPoolSelectorBuilder(this);
+    public MachineConfigNodeStatusBuilder edit() {
+        return new MachineConfigNodeStatusBuilder(this);
     }
 
     @JsonIgnore
-    public KubeletConfigSpecMachineConfigPoolSelectorBuilder toBuilder() {
+    public MachineConfigNodeStatusBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MachineConfigNodeStatusMachineConfigVersion.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MachineConfigNodeStatusMachineConfigVersion.java
new file mode 100644
index 00000000000..e41a6465c1e
--- /dev/null
+++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MachineConfigNodeStatusMachineConfigVersion.java
@@ -0,0 +1,122 @@
+
+package io.fabric8.openshift.api.model.machineconfiguration.v1alpha1;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import javax.annotation.Generated;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import io.fabric8.kubernetes.api.builder.Editable;
+import io.fabric8.kubernetes.api.model.Container;
+import io.fabric8.kubernetes.api.model.IntOrString;
+import io.fabric8.kubernetes.api.model.KubernetesResource;
+import io.fabric8.kubernetes.api.model.LabelSelector;
+import io.fabric8.kubernetes.api.model.LocalObjectReference;
+import io.fabric8.kubernetes.api.model.ObjectMeta;
+import io.fabric8.kubernetes.api.model.ObjectReference;
+import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
+import io.fabric8.kubernetes.api.model.PodTemplateSpec;
+import io.fabric8.kubernetes.api.model.ResourceRequirements;
+import io.sundr.builder.annotations.Buildable;
+import io.sundr.builder.annotations.BuildableReference;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "current",
+    "desired"
+})
+@ToString
+@EqualsAndHashCode
+@Accessors(prefix = {
+    "_",
+    ""
+})
+@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
+    @BuildableReference(ObjectMeta.class),
+    @BuildableReference(LabelSelector.class),
+    @BuildableReference(Container.class),
+    @BuildableReference(PodTemplateSpec.class),
+    @BuildableReference(ResourceRequirements.class),
+    @BuildableReference(IntOrString.class),
+    @BuildableReference(ObjectReference.class),
+    @BuildableReference(LocalObjectReference.class),
+    @BuildableReference(PersistentVolumeClaim.class)
+})
+@Generated("jsonschema2pojo")
+public class MachineConfigNodeStatusMachineConfigVersion implements Editable<MachineConfigNodeStatusMachineConfigVersionBuilder> , KubernetesResource
+{
+
+    @JsonProperty("current")
+    private String current;
+    @JsonProperty("desired")
+    private String desired;
+    @JsonIgnore
+    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
+
+    /**
+     * No args constructor for use in serialization
+     * 
+     */
+    public MachineConfigNodeStatusMachineConfigVersion() {
+    }
+
+    public MachineConfigNodeStatusMachineConfigVersion(String current, String desired) {
+        super();
+        this.current = current;
+        this.desired = desired;
+    }
+
+    @JsonProperty("current")
+    public String getCurrent() {
+        return current;
+    }
+
+    @JsonProperty("current")
+    public void setCurrent(String current) {
+        this.current = current;
+    }
+
+    @JsonProperty("desired")
+    public String getDesired() {
+        return desired;
+    }
+
+    @JsonProperty("desired")
+    public void setDesired(String desired) {
+        this.desired = desired;
+    }
+
+    @JsonIgnore
+    public MachineConfigNodeStatusMachineConfigVersionBuilder edit() {
+        return new MachineConfigNodeStatusMachineConfigVersionBuilder(this);
+    }
+
+    @JsonIgnore
+    public MachineConfigNodeStatusMachineConfigVersionBuilder toBuilder() {
+        return edit();
+    }
+
+    @JsonAnyGetter
+    public Map<String, Object> getAdditionalProperties() {
+        return this.additionalProperties;
+    }
+
+    @JsonAnySetter
+    public void setAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+    }
+
+    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
+        this.additionalProperties = additionalProperties;
+    }
+
+}
diff --git a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPoolStatusCSource.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MachineConfigNodeStatusPinnedImageSet.java
similarity index 54%
rename from kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPoolStatusCSource.java
rename to kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MachineConfigNodeStatusPinnedImageSet.java
index 58c34481a56..0657187dda3 100644
--- a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPoolStatusCSource.java
+++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MachineConfigNodeStatusPinnedImageSet.java
@@ -1,7 +1,9 @@
 
-package io.fabric8.openshift.api.model.machineconfiguration.v1;
+package io.fabric8.openshift.api.model.machineconfiguration.v1alpha1;
 
+import java.util.ArrayList;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 import javax.annotation.Generated;
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
@@ -31,13 +33,11 @@
 @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonPropertyOrder({
-    "apiVersion",
-    "kind",
-    "fieldPath",
-    "name",
-    "namespace",
-    "resourceVersion",
-    "uid"
+    "currentGeneration",
+    "desiredGeneration",
+    "lastFailedGeneration",
+    "lastFailedGenerationErrors",
+    "name"
 })
 @ToString
 @EqualsAndHashCode
@@ -57,23 +57,20 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class MachineConfigPoolStatusCSource implements Editable<MachineConfigPoolStatusCSourceBuilder> , KubernetesResource
+public class MachineConfigNodeStatusPinnedImageSet implements Editable<MachineConfigNodeStatusPinnedImageSetBuilder> , KubernetesResource
 {
 
-    @JsonProperty("apiVersion")
-    private String apiVersion;
-    @JsonProperty("fieldPath")
-    private String fieldPath;
-    @JsonProperty("kind")
-    private String kind;
+    @JsonProperty("currentGeneration")
+    private Integer currentGeneration;
+    @JsonProperty("desiredGeneration")
+    private Integer desiredGeneration;
+    @JsonProperty("lastFailedGeneration")
+    private Integer lastFailedGeneration;
+    @JsonProperty("lastFailedGenerationErrors")
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    private List<String> lastFailedGenerationErrors = new ArrayList<>();
     @JsonProperty("name")
     private String name;
-    @JsonProperty("namespace")
-    private String namespace;
-    @JsonProperty("resourceVersion")
-    private String resourceVersion;
-    @JsonProperty("uid")
-    private String uid;
     @JsonIgnore
     private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
 
@@ -81,48 +78,57 @@ public class MachineConfigPoolStatusCSource implements Editable<MachineConfigPoo
      * No args constructor for use in serialization
      * 
      */
-    public MachineConfigPoolStatusCSource() {
+    public MachineConfigNodeStatusPinnedImageSet() {
     }
 
-    public MachineConfigPoolStatusCSource(String apiVersion, String fieldPath, String kind, String name, String namespace, String resourceVersion, String uid) {
+    public MachineConfigNodeStatusPinnedImageSet(Integer currentGeneration, Integer desiredGeneration, Integer lastFailedGeneration, List<String> lastFailedGenerationErrors, String name) {
         super();
-        this.apiVersion = apiVersion;
-        this.fieldPath = fieldPath;
-        this.kind = kind;
+        this.currentGeneration = currentGeneration;
+        this.desiredGeneration = desiredGeneration;
+        this.lastFailedGeneration = lastFailedGeneration;
+        this.lastFailedGenerationErrors = lastFailedGenerationErrors;
         this.name = name;
-        this.namespace = namespace;
-        this.resourceVersion = resourceVersion;
-        this.uid = uid;
     }
 
-    @JsonProperty("apiVersion")
-    public String getApiVersion() {
-        return apiVersion;
+    @JsonProperty("currentGeneration")
+    public Integer getCurrentGeneration() {
+        return currentGeneration;
     }
 
-    @JsonProperty("apiVersion")
-    public void setApiVersion(String apiVersion) {
-        this.apiVersion = apiVersion;
+    @JsonProperty("currentGeneration")
+    public void setCurrentGeneration(Integer currentGeneration) {
+        this.currentGeneration = currentGeneration;
     }
 
-    @JsonProperty("fieldPath")
-    public String getFieldPath() {
-        return fieldPath;
+    @JsonProperty("desiredGeneration")
+    public Integer getDesiredGeneration() {
+        return desiredGeneration;
     }
 
-    @JsonProperty("fieldPath")
-    public void setFieldPath(String fieldPath) {
-        this.fieldPath = fieldPath;
+    @JsonProperty("desiredGeneration")
+    public void setDesiredGeneration(Integer desiredGeneration) {
+        this.desiredGeneration = desiredGeneration;
     }
 
-    @JsonProperty("kind")
-    public String getKind() {
-        return kind;
+    @JsonProperty("lastFailedGeneration")
+    public Integer getLastFailedGeneration() {
+        return lastFailedGeneration;
     }
 
-    @JsonProperty("kind")
-    public void setKind(String kind) {
-        this.kind = kind;
+    @JsonProperty("lastFailedGeneration")
+    public void setLastFailedGeneration(Integer lastFailedGeneration) {
+        this.lastFailedGeneration = lastFailedGeneration;
+    }
+
+    @JsonProperty("lastFailedGenerationErrors")
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    public List<String> getLastFailedGenerationErrors() {
+        return lastFailedGenerationErrors;
+    }
+
+    @JsonProperty("lastFailedGenerationErrors")
+    public void setLastFailedGenerationErrors(List<String> lastFailedGenerationErrors) {
+        this.lastFailedGenerationErrors = lastFailedGenerationErrors;
     }
 
     @JsonProperty("name")
@@ -135,43 +141,13 @@ public void setName(String name) {
         this.name = name;
     }
 
-    @JsonProperty("namespace")
-    public String getNamespace() {
-        return namespace;
-    }
-
-    @JsonProperty("namespace")
-    public void setNamespace(String namespace) {
-        this.namespace = namespace;
-    }
-
-    @JsonProperty("resourceVersion")
-    public String getResourceVersion() {
-        return resourceVersion;
-    }
-
-    @JsonProperty("resourceVersion")
-    public void setResourceVersion(String resourceVersion) {
-        this.resourceVersion = resourceVersion;
-    }
-
-    @JsonProperty("uid")
-    public String getUid() {
-        return uid;
-    }
-
-    @JsonProperty("uid")
-    public void setUid(String uid) {
-        this.uid = uid;
-    }
-
     @JsonIgnore
-    public MachineConfigPoolStatusCSourceBuilder edit() {
-        return new MachineConfigPoolStatusCSourceBuilder(this);
+    public MachineConfigNodeStatusPinnedImageSetBuilder edit() {
+        return new MachineConfigNodeStatusPinnedImageSetBuilder(this);
     }
 
     @JsonIgnore
-    public MachineConfigPoolStatusCSourceBuilder toBuilder() {
+    public MachineConfigNodeStatusPinnedImageSetBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MachineConfigPoolReference.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MachineConfigPoolReference.java
new file mode 100644
index 00000000000..fe38bd6a0f9
--- /dev/null
+++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MachineConfigPoolReference.java
@@ -0,0 +1,108 @@
+
+package io.fabric8.openshift.api.model.machineconfiguration.v1alpha1;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import javax.annotation.Generated;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import io.fabric8.kubernetes.api.builder.Editable;
+import io.fabric8.kubernetes.api.model.Container;
+import io.fabric8.kubernetes.api.model.IntOrString;
+import io.fabric8.kubernetes.api.model.KubernetesResource;
+import io.fabric8.kubernetes.api.model.LabelSelector;
+import io.fabric8.kubernetes.api.model.LocalObjectReference;
+import io.fabric8.kubernetes.api.model.ObjectMeta;
+import io.fabric8.kubernetes.api.model.ObjectReference;
+import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
+import io.fabric8.kubernetes.api.model.PodTemplateSpec;
+import io.fabric8.kubernetes.api.model.ResourceRequirements;
+import io.sundr.builder.annotations.Buildable;
+import io.sundr.builder.annotations.BuildableReference;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "name"
+})
+@ToString
+@EqualsAndHashCode
+@Accessors(prefix = {
+    "_",
+    ""
+})
+@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
+    @BuildableReference(ObjectMeta.class),
+    @BuildableReference(LabelSelector.class),
+    @BuildableReference(Container.class),
+    @BuildableReference(PodTemplateSpec.class),
+    @BuildableReference(ResourceRequirements.class),
+    @BuildableReference(IntOrString.class),
+    @BuildableReference(ObjectReference.class),
+    @BuildableReference(LocalObjectReference.class),
+    @BuildableReference(PersistentVolumeClaim.class)
+})
+@Generated("jsonschema2pojo")
+public class MachineConfigPoolReference implements Editable<MachineConfigPoolReferenceBuilder> , KubernetesResource
+{
+
+    @JsonProperty("name")
+    private String name;
+    @JsonIgnore
+    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
+
+    /**
+     * No args constructor for use in serialization
+     * 
+     */
+    public MachineConfigPoolReference() {
+    }
+
+    public MachineConfigPoolReference(String name) {
+        super();
+        this.name = name;
+    }
+
+    @JsonProperty("name")
+    public String getName() {
+        return name;
+    }
+
+    @JsonProperty("name")
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @JsonIgnore
+    public MachineConfigPoolReferenceBuilder edit() {
+        return new MachineConfigPoolReferenceBuilder(this);
+    }
+
+    @JsonIgnore
+    public MachineConfigPoolReferenceBuilder toBuilder() {
+        return edit();
+    }
+
+    @JsonAnyGetter
+    public Map<String, Object> getAdditionalProperties() {
+        return this.additionalProperties;
+    }
+
+    @JsonAnySetter
+    public void setAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+    }
+
+    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
+        this.additionalProperties = additionalProperties;
+    }
+
+}
diff --git a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ControllerConfigSpecPullSecret.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MachineOSBuild.java
similarity index 59%
rename from kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ControllerConfigSpecPullSecret.java
rename to kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MachineOSBuild.java
index 203731b8257..699c7f0c749 100644
--- a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ControllerConfigSpecPullSecret.java
+++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MachineOSBuild.java
@@ -1,5 +1,5 @@
 
-package io.fabric8.openshift.api.model.machineconfiguration.v1;
+package io.fabric8.openshift.api.model.machineconfiguration.v1alpha1;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -13,8 +13,8 @@
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import io.fabric8.kubernetes.api.builder.Editable;
 import io.fabric8.kubernetes.api.model.Container;
+import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
 import io.fabric8.kubernetes.api.model.LabelSelector;
 import io.fabric8.kubernetes.api.model.LocalObjectReference;
 import io.fabric8.kubernetes.api.model.ObjectMeta;
@@ -22,8 +22,12 @@
 import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
 import io.fabric8.kubernetes.api.model.PodTemplateSpec;
 import io.fabric8.kubernetes.api.model.ResourceRequirements;
+import io.fabric8.kubernetes.model.annotation.Group;
+import io.fabric8.kubernetes.model.annotation.Version;
 import io.sundr.builder.annotations.Buildable;
 import io.sundr.builder.annotations.BuildableReference;
+import io.sundr.transform.annotations.TemplateTransformation;
+import io.sundr.transform.annotations.TemplateTransformations;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import lombok.experimental.Accessors;
@@ -33,11 +37,9 @@
 @JsonPropertyOrder({
     "apiVersion",
     "kind",
-    "fieldPath",
-    "name",
-    "namespace",
-    "resourceVersion",
-    "uid"
+    "metadata",
+    "spec",
+    "status"
 })
 @ToString
 @EqualsAndHashCode
@@ -56,24 +58,35 @@
     @BuildableReference(LocalObjectReference.class),
     @BuildableReference(PersistentVolumeClaim.class)
 })
+@TemplateTransformations({
+    @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true)
+})
+@Version("v1alpha1")
+@Group("machineconfiguration.openshift.io")
 @Generated("jsonschema2pojo")
-public class ControllerConfigSpecPullSecret implements Editable<ControllerConfigSpecPullSecretBuilder> , KubernetesResource
+public class MachineOSBuild implements Editable<MachineOSBuildBuilder> , HasMetadata
 {
 
+    /**
+     * 
+     * (Required)
+     * 
+     */
     @JsonProperty("apiVersion")
-    private String apiVersion;
-    @JsonProperty("fieldPath")
-    private String fieldPath;
+    private String apiVersion = "machineconfiguration.openshift.io/v1alpha1";
+    /**
+     * 
+     * (Required)
+     * 
+     */
     @JsonProperty("kind")
-    private String kind;
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("namespace")
-    private String namespace;
-    @JsonProperty("resourceVersion")
-    private String resourceVersion;
-    @JsonProperty("uid")
-    private String uid;
+    private String kind = "MachineOSBuild";
+    @JsonProperty("metadata")
+    private ObjectMeta metadata;
+    @JsonProperty("spec")
+    private MachineOSBuildSpec spec;
+    @JsonProperty("status")
+    private MachineOSBuildStatus status;
     @JsonIgnore
     private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
 
@@ -81,97 +94,95 @@ public class ControllerConfigSpecPullSecret implements Editable<ControllerConfig
      * No args constructor for use in serialization
      * 
      */
-    public ControllerConfigSpecPullSecret() {
+    public MachineOSBuild() {
     }
 
-    public ControllerConfigSpecPullSecret(String apiVersion, String fieldPath, String kind, String name, String namespace, String resourceVersion, String uid) {
+    public MachineOSBuild(String apiVersion, String kind, ObjectMeta metadata, MachineOSBuildSpec spec, MachineOSBuildStatus status) {
         super();
         this.apiVersion = apiVersion;
-        this.fieldPath = fieldPath;
         this.kind = kind;
-        this.name = name;
-        this.namespace = namespace;
-        this.resourceVersion = resourceVersion;
-        this.uid = uid;
+        this.metadata = metadata;
+        this.spec = spec;
+        this.status = status;
     }
 
+    /**
+     * 
+     * (Required)
+     * 
+     */
     @JsonProperty("apiVersion")
     public String getApiVersion() {
         return apiVersion;
     }
 
+    /**
+     * 
+     * (Required)
+     * 
+     */
     @JsonProperty("apiVersion")
     public void setApiVersion(String apiVersion) {
         this.apiVersion = apiVersion;
     }
 
-    @JsonProperty("fieldPath")
-    public String getFieldPath() {
-        return fieldPath;
-    }
-
-    @JsonProperty("fieldPath")
-    public void setFieldPath(String fieldPath) {
-        this.fieldPath = fieldPath;
-    }
-
+    /**
+     * 
+     * (Required)
+     * 
+     */
     @JsonProperty("kind")
     public String getKind() {
         return kind;
     }
 
+    /**
+     * 
+     * (Required)
+     * 
+     */
     @JsonProperty("kind")
     public void setKind(String kind) {
         this.kind = kind;
     }
 
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("namespace")
-    public String getNamespace() {
-        return namespace;
+    @JsonProperty("metadata")
+    public ObjectMeta getMetadata() {
+        return metadata;
     }
 
-    @JsonProperty("namespace")
-    public void setNamespace(String namespace) {
-        this.namespace = namespace;
+    @JsonProperty("metadata")
+    public void setMetadata(ObjectMeta metadata) {
+        this.metadata = metadata;
     }
 
-    @JsonProperty("resourceVersion")
-    public String getResourceVersion() {
-        return resourceVersion;
+    @JsonProperty("spec")
+    public MachineOSBuildSpec getSpec() {
+        return spec;
     }
 
-    @JsonProperty("resourceVersion")
-    public void setResourceVersion(String resourceVersion) {
-        this.resourceVersion = resourceVersion;
+    @JsonProperty("spec")
+    public void setSpec(MachineOSBuildSpec spec) {
+        this.spec = spec;
     }
 
-    @JsonProperty("uid")
-    public String getUid() {
-        return uid;
+    @JsonProperty("status")
+    public MachineOSBuildStatus getStatus() {
+        return status;
     }
 
-    @JsonProperty("uid")
-    public void setUid(String uid) {
-        this.uid = uid;
+    @JsonProperty("status")
+    public void setStatus(MachineOSBuildStatus status) {
+        this.status = status;
     }
 
     @JsonIgnore
-    public ControllerConfigSpecPullSecretBuilder edit() {
-        return new ControllerConfigSpecPullSecretBuilder(this);
+    public MachineOSBuildBuilder edit() {
+        return new MachineOSBuildBuilder(this);
     }
 
     @JsonIgnore
-    public ControllerConfigSpecPullSecretBuilder toBuilder() {
+    public MachineOSBuildBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MachineOSBuildList.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MachineOSBuildList.java
new file mode 100644
index 00000000000..e27e9706686
--- /dev/null
+++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MachineOSBuildList.java
@@ -0,0 +1,195 @@
+
+package io.fabric8.openshift.api.model.machineconfiguration.v1alpha1;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.Generated;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import io.fabric8.kubernetes.api.builder.Editable;
+import io.fabric8.kubernetes.api.model.Container;
+import io.fabric8.kubernetes.api.model.IntOrString;
+import io.fabric8.kubernetes.api.model.KubernetesResource;
+import io.fabric8.kubernetes.api.model.KubernetesResourceList;
+import io.fabric8.kubernetes.api.model.LabelSelector;
+import io.fabric8.kubernetes.api.model.ListMeta;
+import io.fabric8.kubernetes.api.model.LocalObjectReference;
+import io.fabric8.kubernetes.api.model.ObjectMeta;
+import io.fabric8.kubernetes.api.model.ObjectReference;
+import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
+import io.fabric8.kubernetes.api.model.PodTemplateSpec;
+import io.fabric8.kubernetes.api.model.ResourceRequirements;
+import io.fabric8.kubernetes.model.annotation.Group;
+import io.fabric8.kubernetes.model.annotation.Version;
+import io.sundr.builder.annotations.Buildable;
+import io.sundr.builder.annotations.BuildableReference;
+import io.sundr.transform.annotations.TemplateTransformation;
+import io.sundr.transform.annotations.TemplateTransformations;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "apiVersion",
+    "kind",
+    "metadata",
+    "items"
+})
+@ToString
+@EqualsAndHashCode
+@Accessors(prefix = {
+    "_",
+    ""
+})
+@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
+    @BuildableReference(ObjectMeta.class),
+    @BuildableReference(LabelSelector.class),
+    @BuildableReference(Container.class),
+    @BuildableReference(PodTemplateSpec.class),
+    @BuildableReference(ResourceRequirements.class),
+    @BuildableReference(IntOrString.class),
+    @BuildableReference(ObjectReference.class),
+    @BuildableReference(LocalObjectReference.class),
+    @BuildableReference(PersistentVolumeClaim.class)
+})
+@TemplateTransformations({
+    @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true)
+})
+@Version("v1alpha1")
+@Group("machineconfiguration.openshift.io")
+@Generated("jsonschema2pojo")
+public class MachineOSBuildList implements Editable<MachineOSBuildListBuilder> , KubernetesResource, KubernetesResourceList<io.fabric8.openshift.api.model.machineconfiguration.v1alpha1.MachineOSBuild>
+{
+
+    /**
+     * 
+     * (Required)
+     * 
+     */
+    @JsonProperty("apiVersion")
+    private String apiVersion = "machineconfiguration.openshift.io/v1alpha1";
+    @JsonProperty("items")
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    private List<io.fabric8.openshift.api.model.machineconfiguration.v1alpha1.MachineOSBuild> items = new ArrayList<>();
+    /**
+     * 
+     * (Required)
+     * 
+     */
+    @JsonProperty("kind")
+    private String kind = "MachineOSBuildList";
+    @JsonProperty("metadata")
+    private ListMeta metadata;
+    @JsonIgnore
+    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
+
+    /**
+     * No args constructor for use in serialization
+     * 
+     */
+    public MachineOSBuildList() {
+    }
+
+    public MachineOSBuildList(String apiVersion, List<io.fabric8.openshift.api.model.machineconfiguration.v1alpha1.MachineOSBuild> items, String kind, ListMeta metadata) {
+        super();
+        this.apiVersion = apiVersion;
+        this.items = items;
+        this.kind = kind;
+        this.metadata = metadata;
+    }
+
+    /**
+     * 
+     * (Required)
+     * 
+     */
+    @JsonProperty("apiVersion")
+    public String getApiVersion() {
+        return apiVersion;
+    }
+
+    /**
+     * 
+     * (Required)
+     * 
+     */
+    @JsonProperty("apiVersion")
+    public void setApiVersion(String apiVersion) {
+        this.apiVersion = apiVersion;
+    }
+
+    @JsonProperty("items")
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    public List<io.fabric8.openshift.api.model.machineconfiguration.v1alpha1.MachineOSBuild> getItems() {
+        return items;
+    }
+
+    @JsonProperty("items")
+    public void setItems(List<io.fabric8.openshift.api.model.machineconfiguration.v1alpha1.MachineOSBuild> items) {
+        this.items = items;
+    }
+
+    /**
+     * 
+     * (Required)
+     * 
+     */
+    @JsonProperty("kind")
+    public String getKind() {
+        return kind;
+    }
+
+    /**
+     * 
+     * (Required)
+     * 
+     */
+    @JsonProperty("kind")
+    public void setKind(String kind) {
+        this.kind = kind;
+    }
+
+    @JsonProperty("metadata")
+    public ListMeta getMetadata() {
+        return metadata;
+    }
+
+    @JsonProperty("metadata")
+    public void setMetadata(ListMeta metadata) {
+        this.metadata = metadata;
+    }
+
+    @JsonIgnore
+    public MachineOSBuildListBuilder edit() {
+        return new MachineOSBuildListBuilder(this);
+    }
+
+    @JsonIgnore
+    public MachineOSBuildListBuilder toBuilder() {
+        return edit();
+    }
+
+    @JsonAnyGetter
+    public Map<String, Object> getAdditionalProperties() {
+        return this.additionalProperties;
+    }
+
+    @JsonAnySetter
+    public void setAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+    }
+
+    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
+        this.additionalProperties = additionalProperties;
+    }
+
+}
diff --git a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MachineOSBuildSpec.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MachineOSBuildSpec.java
new file mode 100644
index 00000000000..4ecf2f54986
--- /dev/null
+++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MachineOSBuildSpec.java
@@ -0,0 +1,164 @@
+
+package io.fabric8.openshift.api.model.machineconfiguration.v1alpha1;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import javax.annotation.Generated;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import io.fabric8.kubernetes.api.builder.Editable;
+import io.fabric8.kubernetes.api.model.Container;
+import io.fabric8.kubernetes.api.model.IntOrString;
+import io.fabric8.kubernetes.api.model.KubernetesResource;
+import io.fabric8.kubernetes.api.model.LabelSelector;
+import io.fabric8.kubernetes.api.model.LocalObjectReference;
+import io.fabric8.kubernetes.api.model.ObjectMeta;
+import io.fabric8.kubernetes.api.model.ObjectReference;
+import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
+import io.fabric8.kubernetes.api.model.PodTemplateSpec;
+import io.fabric8.kubernetes.api.model.ResourceRequirements;
+import io.sundr.builder.annotations.Buildable;
+import io.sundr.builder.annotations.BuildableReference;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "configGeneration",
+    "desiredConfig",
+    "machineOSConfig",
+    "renderedImagePushspec",
+    "version"
+})
+@ToString
+@EqualsAndHashCode
+@Accessors(prefix = {
+    "_",
+    ""
+})
+@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
+    @BuildableReference(ObjectMeta.class),
+    @BuildableReference(LabelSelector.class),
+    @BuildableReference(Container.class),
+    @BuildableReference(PodTemplateSpec.class),
+    @BuildableReference(ResourceRequirements.class),
+    @BuildableReference(IntOrString.class),
+    @BuildableReference(ObjectReference.class),
+    @BuildableReference(LocalObjectReference.class),
+    @BuildableReference(PersistentVolumeClaim.class)
+})
+@Generated("jsonschema2pojo")
+public class MachineOSBuildSpec implements Editable<MachineOSBuildSpecBuilder> , KubernetesResource
+{
+
+    @JsonProperty("configGeneration")
+    private Long configGeneration;
+    @JsonProperty("desiredConfig")
+    private RenderedMachineConfigReference desiredConfig;
+    @JsonProperty("machineOSConfig")
+    private MachineOSConfigReference machineOSConfig;
+    @JsonProperty("renderedImagePushspec")
+    private String renderedImagePushspec;
+    @JsonProperty("version")
+    private Long version;
+    @JsonIgnore
+    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
+
+    /**
+     * No args constructor for use in serialization
+     * 
+     */
+    public MachineOSBuildSpec() {
+    }
+
+    public MachineOSBuildSpec(Long configGeneration, RenderedMachineConfigReference desiredConfig, MachineOSConfigReference machineOSConfig, String renderedImagePushspec, Long version) {
+        super();
+        this.configGeneration = configGeneration;
+        this.desiredConfig = desiredConfig;
+        this.machineOSConfig = machineOSConfig;
+        this.renderedImagePushspec = renderedImagePushspec;
+        this.version = version;
+    }
+
+    @JsonProperty("configGeneration")
+    public Long getConfigGeneration() {
+        return configGeneration;
+    }
+
+    @JsonProperty("configGeneration")
+    public void setConfigGeneration(Long configGeneration) {
+        this.configGeneration = configGeneration;
+    }
+
+    @JsonProperty("desiredConfig")
+    public RenderedMachineConfigReference getDesiredConfig() {
+        return desiredConfig;
+    }
+
+    @JsonProperty("desiredConfig")
+    public void setDesiredConfig(RenderedMachineConfigReference desiredConfig) {
+        this.desiredConfig = desiredConfig;
+    }
+
+    @JsonProperty("machineOSConfig")
+    public MachineOSConfigReference getMachineOSConfig() {
+        return machineOSConfig;
+    }
+
+    @JsonProperty("machineOSConfig")
+    public void setMachineOSConfig(MachineOSConfigReference machineOSConfig) {
+        this.machineOSConfig = machineOSConfig;
+    }
+
+    @JsonProperty("renderedImagePushspec")
+    public String getRenderedImagePushspec() {
+        return renderedImagePushspec;
+    }
+
+    @JsonProperty("renderedImagePushspec")
+    public void setRenderedImagePushspec(String renderedImagePushspec) {
+        this.renderedImagePushspec = renderedImagePushspec;
+    }
+
+    @JsonProperty("version")
+    public Long getVersion() {
+        return version;
+    }
+
+    @JsonProperty("version")
+    public void setVersion(Long version) {
+        this.version = version;
+    }
+
+    @JsonIgnore
+    public MachineOSBuildSpecBuilder edit() {
+        return new MachineOSBuildSpecBuilder(this);
+    }
+
+    @JsonIgnore
+    public MachineOSBuildSpecBuilder toBuilder() {
+        return edit();
+    }
+
+    @JsonAnyGetter
+    public Map<String, Object> getAdditionalProperties() {
+        return this.additionalProperties;
+    }
+
+    @JsonAnySetter
+    public void setAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+    }
+
+    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
+        this.additionalProperties = additionalProperties;
+    }
+
+}
diff --git a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ContainerRuntimeConfigSpecMachineConfigPoolSelector.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MachineOSBuildStatus.java
similarity index 50%
rename from kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ContainerRuntimeConfigSpecMachineConfigPoolSelector.java
rename to kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MachineOSBuildStatus.java
index bf8067311be..c666e4102a7 100644
--- a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ContainerRuntimeConfigSpecMachineConfigPoolSelector.java
+++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MachineOSBuildStatus.java
@@ -1,5 +1,5 @@
 
-package io.fabric8.openshift.api.model.machineconfiguration.v1;
+package io.fabric8.openshift.api.model.machineconfiguration.v1alpha1;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
@@ -14,11 +14,11 @@
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import io.fabric8.kubernetes.api.builder.Editable;
+import io.fabric8.kubernetes.api.model.Condition;
 import io.fabric8.kubernetes.api.model.Container;
 import io.fabric8.kubernetes.api.model.IntOrString;
 import io.fabric8.kubernetes.api.model.KubernetesResource;
 import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LabelSelectorRequirement;
 import io.fabric8.kubernetes.api.model.LocalObjectReference;
 import io.fabric8.kubernetes.api.model.ObjectMeta;
 import io.fabric8.kubernetes.api.model.ObjectReference;
@@ -34,8 +34,12 @@
 @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonPropertyOrder({
-    "matchExpressions",
-    "matchLabels"
+    "buildEnd",
+    "buildStart",
+    "builderReference",
+    "conditions",
+    "finalImagePullspec",
+    "relatedObjects"
 })
 @ToString
 @EqualsAndHashCode
@@ -55,15 +59,23 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class ContainerRuntimeConfigSpecMachineConfigPoolSelector implements Editable<ContainerRuntimeConfigSpecMachineConfigPoolSelectorBuilder> , KubernetesResource
+public class MachineOSBuildStatus implements Editable<MachineOSBuildStatusBuilder> , KubernetesResource
 {
 
-    @JsonProperty("matchExpressions")
+    @JsonProperty("buildEnd")
+    private String buildEnd;
+    @JsonProperty("buildStart")
+    private String buildStart;
+    @JsonProperty("builderReference")
+    private MachineOSBuilderReference builderReference;
+    @JsonProperty("conditions")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<LabelSelectorRequirement> matchExpressions = new ArrayList<>();
-    @JsonProperty("matchLabels")
+    private List<Condition> conditions = new ArrayList<>();
+    @JsonProperty("finalImagePullspec")
+    private String finalImagePullspec;
+    @JsonProperty("relatedObjects")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private Map<String, String> matchLabels = new LinkedHashMap<>();
+    private List<ObjectReference> relatedObjects = new ArrayList<>();
     @JsonIgnore
     private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
 
@@ -71,44 +83,88 @@ public class ContainerRuntimeConfigSpecMachineConfigPoolSelector implements Edit
      * No args constructor for use in serialization
      * 
      */
-    public ContainerRuntimeConfigSpecMachineConfigPoolSelector() {
+    public MachineOSBuildStatus() {
     }
 
-    public ContainerRuntimeConfigSpecMachineConfigPoolSelector(List<LabelSelectorRequirement> matchExpressions, Map<String, String> matchLabels) {
+    public MachineOSBuildStatus(String buildEnd, String buildStart, MachineOSBuilderReference builderReference, List<Condition> conditions, String finalImagePullspec, List<ObjectReference> relatedObjects) {
         super();
-        this.matchExpressions = matchExpressions;
-        this.matchLabels = matchLabels;
+        this.buildEnd = buildEnd;
+        this.buildStart = buildStart;
+        this.builderReference = builderReference;
+        this.conditions = conditions;
+        this.finalImagePullspec = finalImagePullspec;
+        this.relatedObjects = relatedObjects;
     }
 
-    @JsonProperty("matchExpressions")
+    @JsonProperty("buildEnd")
+    public String getBuildEnd() {
+        return buildEnd;
+    }
+
+    @JsonProperty("buildEnd")
+    public void setBuildEnd(String buildEnd) {
+        this.buildEnd = buildEnd;
+    }
+
+    @JsonProperty("buildStart")
+    public String getBuildStart() {
+        return buildStart;
+    }
+
+    @JsonProperty("buildStart")
+    public void setBuildStart(String buildStart) {
+        this.buildStart = buildStart;
+    }
+
+    @JsonProperty("builderReference")
+    public MachineOSBuilderReference getBuilderReference() {
+        return builderReference;
+    }
+
+    @JsonProperty("builderReference")
+    public void setBuilderReference(MachineOSBuilderReference builderReference) {
+        this.builderReference = builderReference;
+    }
+
+    @JsonProperty("conditions")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<LabelSelectorRequirement> getMatchExpressions() {
-        return matchExpressions;
+    public List<Condition> getConditions() {
+        return conditions;
+    }
+
+    @JsonProperty("conditions")
+    public void setConditions(List<Condition> conditions) {
+        this.conditions = conditions;
+    }
+
+    @JsonProperty("finalImagePullspec")
+    public String getFinalImagePullspec() {
+        return finalImagePullspec;
     }
 
-    @JsonProperty("matchExpressions")
-    public void setMatchExpressions(List<LabelSelectorRequirement> matchExpressions) {
-        this.matchExpressions = matchExpressions;
+    @JsonProperty("finalImagePullspec")
+    public void setFinalImagePullspec(String finalImagePullspec) {
+        this.finalImagePullspec = finalImagePullspec;
     }
 
-    @JsonProperty("matchLabels")
+    @JsonProperty("relatedObjects")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public Map<String, String> getMatchLabels() {
-        return matchLabels;
+    public List<ObjectReference> getRelatedObjects() {
+        return relatedObjects;
     }
 
-    @JsonProperty("matchLabels")
-    public void setMatchLabels(Map<String, String> matchLabels) {
-        this.matchLabels = matchLabels;
+    @JsonProperty("relatedObjects")
+    public void setRelatedObjects(List<ObjectReference> relatedObjects) {
+        this.relatedObjects = relatedObjects;
     }
 
     @JsonIgnore
-    public ContainerRuntimeConfigSpecMachineConfigPoolSelectorBuilder edit() {
-        return new ContainerRuntimeConfigSpecMachineConfigPoolSelectorBuilder(this);
+    public MachineOSBuildStatusBuilder edit() {
+        return new MachineOSBuildStatusBuilder(this);
     }
 
     @JsonIgnore
-    public ContainerRuntimeConfigSpecMachineConfigPoolSelectorBuilder toBuilder() {
+    public MachineOSBuildStatusBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MachineOSBuilderReference.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MachineOSBuilderReference.java
new file mode 100644
index 00000000000..8ead2737f81
--- /dev/null
+++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MachineOSBuilderReference.java
@@ -0,0 +1,122 @@
+
+package io.fabric8.openshift.api.model.machineconfiguration.v1alpha1;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import javax.annotation.Generated;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import io.fabric8.kubernetes.api.builder.Editable;
+import io.fabric8.kubernetes.api.model.Container;
+import io.fabric8.kubernetes.api.model.IntOrString;
+import io.fabric8.kubernetes.api.model.KubernetesResource;
+import io.fabric8.kubernetes.api.model.LabelSelector;
+import io.fabric8.kubernetes.api.model.LocalObjectReference;
+import io.fabric8.kubernetes.api.model.ObjectMeta;
+import io.fabric8.kubernetes.api.model.ObjectReference;
+import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
+import io.fabric8.kubernetes.api.model.PodTemplateSpec;
+import io.fabric8.kubernetes.api.model.ResourceRequirements;
+import io.sundr.builder.annotations.Buildable;
+import io.sundr.builder.annotations.BuildableReference;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "buildPod",
+    "imageBuilderType"
+})
+@ToString
+@EqualsAndHashCode
+@Accessors(prefix = {
+    "_",
+    ""
+})
+@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
+    @BuildableReference(ObjectMeta.class),
+    @BuildableReference(LabelSelector.class),
+    @BuildableReference(Container.class),
+    @BuildableReference(PodTemplateSpec.class),
+    @BuildableReference(ResourceRequirements.class),
+    @BuildableReference(IntOrString.class),
+    @BuildableReference(ObjectReference.class),
+    @BuildableReference(LocalObjectReference.class),
+    @BuildableReference(PersistentVolumeClaim.class)
+})
+@Generated("jsonschema2pojo")
+public class MachineOSBuilderReference implements Editable<MachineOSBuilderReferenceBuilder> , KubernetesResource
+{
+
+    @JsonProperty("buildPod")
+    private ObjectReference buildPod;
+    @JsonProperty("imageBuilderType")
+    private String imageBuilderType;
+    @JsonIgnore
+    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
+
+    /**
+     * No args constructor for use in serialization
+     * 
+     */
+    public MachineOSBuilderReference() {
+    }
+
+    public MachineOSBuilderReference(ObjectReference buildPod, String imageBuilderType) {
+        super();
+        this.buildPod = buildPod;
+        this.imageBuilderType = imageBuilderType;
+    }
+
+    @JsonProperty("buildPod")
+    public ObjectReference getBuildPod() {
+        return buildPod;
+    }
+
+    @JsonProperty("buildPod")
+    public void setBuildPod(ObjectReference buildPod) {
+        this.buildPod = buildPod;
+    }
+
+    @JsonProperty("imageBuilderType")
+    public String getImageBuilderType() {
+        return imageBuilderType;
+    }
+
+    @JsonProperty("imageBuilderType")
+    public void setImageBuilderType(String imageBuilderType) {
+        this.imageBuilderType = imageBuilderType;
+    }
+
+    @JsonIgnore
+    public MachineOSBuilderReferenceBuilder edit() {
+        return new MachineOSBuilderReferenceBuilder(this);
+    }
+
+    @JsonIgnore
+    public MachineOSBuilderReferenceBuilder toBuilder() {
+        return edit();
+    }
+
+    @JsonAnyGetter
+    public Map<String, Object> getAdditionalProperties() {
+        return this.additionalProperties;
+    }
+
+    @JsonAnySetter
+    public void setAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+    }
+
+    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
+        this.additionalProperties = additionalProperties;
+    }
+
+}
diff --git a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MachineOSConfig.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MachineOSConfig.java
new file mode 100644
index 00000000000..77a200848a1
--- /dev/null
+++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MachineOSConfig.java
@@ -0,0 +1,203 @@
+
+package io.fabric8.openshift.api.model.machineconfiguration.v1alpha1;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import javax.annotation.Generated;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import io.fabric8.kubernetes.api.builder.Editable;
+import io.fabric8.kubernetes.api.model.Container;
+import io.fabric8.kubernetes.api.model.HasMetadata;
+import io.fabric8.kubernetes.api.model.IntOrString;
+import io.fabric8.kubernetes.api.model.LabelSelector;
+import io.fabric8.kubernetes.api.model.LocalObjectReference;
+import io.fabric8.kubernetes.api.model.ObjectMeta;
+import io.fabric8.kubernetes.api.model.ObjectReference;
+import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
+import io.fabric8.kubernetes.api.model.PodTemplateSpec;
+import io.fabric8.kubernetes.api.model.ResourceRequirements;
+import io.fabric8.kubernetes.model.annotation.Group;
+import io.fabric8.kubernetes.model.annotation.Version;
+import io.sundr.builder.annotations.Buildable;
+import io.sundr.builder.annotations.BuildableReference;
+import io.sundr.transform.annotations.TemplateTransformation;
+import io.sundr.transform.annotations.TemplateTransformations;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "apiVersion",
+    "kind",
+    "metadata",
+    "spec",
+    "status"
+})
+@ToString
+@EqualsAndHashCode
+@Accessors(prefix = {
+    "_",
+    ""
+})
+@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
+    @BuildableReference(ObjectMeta.class),
+    @BuildableReference(LabelSelector.class),
+    @BuildableReference(Container.class),
+    @BuildableReference(PodTemplateSpec.class),
+    @BuildableReference(ResourceRequirements.class),
+    @BuildableReference(IntOrString.class),
+    @BuildableReference(ObjectReference.class),
+    @BuildableReference(LocalObjectReference.class),
+    @BuildableReference(PersistentVolumeClaim.class)
+})
+@TemplateTransformations({
+    @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true)
+})
+@Version("v1alpha1")
+@Group("machineconfiguration.openshift.io")
+@Generated("jsonschema2pojo")
+public class MachineOSConfig implements Editable<MachineOSConfigBuilder> , HasMetadata
+{
+
+    /**
+     * 
+     * (Required)
+     * 
+     */
+    @JsonProperty("apiVersion")
+    private String apiVersion = "machineconfiguration.openshift.io/v1alpha1";
+    /**
+     * 
+     * (Required)
+     * 
+     */
+    @JsonProperty("kind")
+    private String kind = "MachineOSConfig";
+    @JsonProperty("metadata")
+    private ObjectMeta metadata;
+    @JsonProperty("spec")
+    private MachineOSConfigSpec spec;
+    @JsonProperty("status")
+    private MachineOSConfigStatus status;
+    @JsonIgnore
+    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
+
+    /**
+     * No args constructor for use in serialization
+     * 
+     */
+    public MachineOSConfig() {
+    }
+
+    public MachineOSConfig(String apiVersion, String kind, ObjectMeta metadata, MachineOSConfigSpec spec, MachineOSConfigStatus status) {
+        super();
+        this.apiVersion = apiVersion;
+        this.kind = kind;
+        this.metadata = metadata;
+        this.spec = spec;
+        this.status = status;
+    }
+
+    /**
+     * 
+     * (Required)
+     * 
+     */
+    @JsonProperty("apiVersion")
+    public String getApiVersion() {
+        return apiVersion;
+    }
+
+    /**
+     * 
+     * (Required)
+     * 
+     */
+    @JsonProperty("apiVersion")
+    public void setApiVersion(String apiVersion) {
+        this.apiVersion = apiVersion;
+    }
+
+    /**
+     * 
+     * (Required)
+     * 
+     */
+    @JsonProperty("kind")
+    public String getKind() {
+        return kind;
+    }
+
+    /**
+     * 
+     * (Required)
+     * 
+     */
+    @JsonProperty("kind")
+    public void setKind(String kind) {
+        this.kind = kind;
+    }
+
+    @JsonProperty("metadata")
+    public ObjectMeta getMetadata() {
+        return metadata;
+    }
+
+    @JsonProperty("metadata")
+    public void setMetadata(ObjectMeta metadata) {
+        this.metadata = metadata;
+    }
+
+    @JsonProperty("spec")
+    public MachineOSConfigSpec getSpec() {
+        return spec;
+    }
+
+    @JsonProperty("spec")
+    public void setSpec(MachineOSConfigSpec spec) {
+        this.spec = spec;
+    }
+
+    @JsonProperty("status")
+    public MachineOSConfigStatus getStatus() {
+        return status;
+    }
+
+    @JsonProperty("status")
+    public void setStatus(MachineOSConfigStatus status) {
+        this.status = status;
+    }
+
+    @JsonIgnore
+    public MachineOSConfigBuilder edit() {
+        return new MachineOSConfigBuilder(this);
+    }
+
+    @JsonIgnore
+    public MachineOSConfigBuilder toBuilder() {
+        return edit();
+    }
+
+    @JsonAnyGetter
+    public Map<String, Object> getAdditionalProperties() {
+        return this.additionalProperties;
+    }
+
+    @JsonAnySetter
+    public void setAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+    }
+
+    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
+        this.additionalProperties = additionalProperties;
+    }
+
+}
diff --git a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MachineOSConfigList.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MachineOSConfigList.java
new file mode 100644
index 00000000000..2d295ac3904
--- /dev/null
+++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MachineOSConfigList.java
@@ -0,0 +1,195 @@
+
+package io.fabric8.openshift.api.model.machineconfiguration.v1alpha1;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.Generated;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import io.fabric8.kubernetes.api.builder.Editable;
+import io.fabric8.kubernetes.api.model.Container;
+import io.fabric8.kubernetes.api.model.IntOrString;
+import io.fabric8.kubernetes.api.model.KubernetesResource;
+import io.fabric8.kubernetes.api.model.KubernetesResourceList;
+import io.fabric8.kubernetes.api.model.LabelSelector;
+import io.fabric8.kubernetes.api.model.ListMeta;
+import io.fabric8.kubernetes.api.model.LocalObjectReference;
+import io.fabric8.kubernetes.api.model.ObjectMeta;
+import io.fabric8.kubernetes.api.model.ObjectReference;
+import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
+import io.fabric8.kubernetes.api.model.PodTemplateSpec;
+import io.fabric8.kubernetes.api.model.ResourceRequirements;
+import io.fabric8.kubernetes.model.annotation.Group;
+import io.fabric8.kubernetes.model.annotation.Version;
+import io.sundr.builder.annotations.Buildable;
+import io.sundr.builder.annotations.BuildableReference;
+import io.sundr.transform.annotations.TemplateTransformation;
+import io.sundr.transform.annotations.TemplateTransformations;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "apiVersion",
+    "kind",
+    "metadata",
+    "items"
+})
+@ToString
+@EqualsAndHashCode
+@Accessors(prefix = {
+    "_",
+    ""
+})
+@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
+    @BuildableReference(ObjectMeta.class),
+    @BuildableReference(LabelSelector.class),
+    @BuildableReference(Container.class),
+    @BuildableReference(PodTemplateSpec.class),
+    @BuildableReference(ResourceRequirements.class),
+    @BuildableReference(IntOrString.class),
+    @BuildableReference(ObjectReference.class),
+    @BuildableReference(LocalObjectReference.class),
+    @BuildableReference(PersistentVolumeClaim.class)
+})
+@TemplateTransformations({
+    @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true)
+})
+@Version("v1alpha1")
+@Group("machineconfiguration.openshift.io")
+@Generated("jsonschema2pojo")
+public class MachineOSConfigList implements Editable<MachineOSConfigListBuilder> , KubernetesResource, KubernetesResourceList<io.fabric8.openshift.api.model.machineconfiguration.v1alpha1.MachineOSConfig>
+{
+
+    /**
+     * 
+     * (Required)
+     * 
+     */
+    @JsonProperty("apiVersion")
+    private String apiVersion = "machineconfiguration.openshift.io/v1alpha1";
+    @JsonProperty("items")
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    private List<io.fabric8.openshift.api.model.machineconfiguration.v1alpha1.MachineOSConfig> items = new ArrayList<>();
+    /**
+     * 
+     * (Required)
+     * 
+     */
+    @JsonProperty("kind")
+    private String kind = "MachineOSConfigList";
+    @JsonProperty("metadata")
+    private ListMeta metadata;
+    @JsonIgnore
+    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
+
+    /**
+     * No args constructor for use in serialization
+     * 
+     */
+    public MachineOSConfigList() {
+    }
+
+    public MachineOSConfigList(String apiVersion, List<io.fabric8.openshift.api.model.machineconfiguration.v1alpha1.MachineOSConfig> items, String kind, ListMeta metadata) {
+        super();
+        this.apiVersion = apiVersion;
+        this.items = items;
+        this.kind = kind;
+        this.metadata = metadata;
+    }
+
+    /**
+     * 
+     * (Required)
+     * 
+     */
+    @JsonProperty("apiVersion")
+    public String getApiVersion() {
+        return apiVersion;
+    }
+
+    /**
+     * 
+     * (Required)
+     * 
+     */
+    @JsonProperty("apiVersion")
+    public void setApiVersion(String apiVersion) {
+        this.apiVersion = apiVersion;
+    }
+
+    @JsonProperty("items")
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    public List<io.fabric8.openshift.api.model.machineconfiguration.v1alpha1.MachineOSConfig> getItems() {
+        return items;
+    }
+
+    @JsonProperty("items")
+    public void setItems(List<io.fabric8.openshift.api.model.machineconfiguration.v1alpha1.MachineOSConfig> items) {
+        this.items = items;
+    }
+
+    /**
+     * 
+     * (Required)
+     * 
+     */
+    @JsonProperty("kind")
+    public String getKind() {
+        return kind;
+    }
+
+    /**
+     * 
+     * (Required)
+     * 
+     */
+    @JsonProperty("kind")
+    public void setKind(String kind) {
+        this.kind = kind;
+    }
+
+    @JsonProperty("metadata")
+    public ListMeta getMetadata() {
+        return metadata;
+    }
+
+    @JsonProperty("metadata")
+    public void setMetadata(ListMeta metadata) {
+        this.metadata = metadata;
+    }
+
+    @JsonIgnore
+    public MachineOSConfigListBuilder edit() {
+        return new MachineOSConfigListBuilder(this);
+    }
+
+    @JsonIgnore
+    public MachineOSConfigListBuilder toBuilder() {
+        return edit();
+    }
+
+    @JsonAnyGetter
+    public Map<String, Object> getAdditionalProperties() {
+        return this.additionalProperties;
+    }
+
+    @JsonAnySetter
+    public void setAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+    }
+
+    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
+        this.additionalProperties = additionalProperties;
+    }
+
+}
diff --git a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MachineOSConfigReference.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MachineOSConfigReference.java
new file mode 100644
index 00000000000..7e29198ea87
--- /dev/null
+++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MachineOSConfigReference.java
@@ -0,0 +1,108 @@
+
+package io.fabric8.openshift.api.model.machineconfiguration.v1alpha1;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import javax.annotation.Generated;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import io.fabric8.kubernetes.api.builder.Editable;
+import io.fabric8.kubernetes.api.model.Container;
+import io.fabric8.kubernetes.api.model.IntOrString;
+import io.fabric8.kubernetes.api.model.KubernetesResource;
+import io.fabric8.kubernetes.api.model.LabelSelector;
+import io.fabric8.kubernetes.api.model.LocalObjectReference;
+import io.fabric8.kubernetes.api.model.ObjectMeta;
+import io.fabric8.kubernetes.api.model.ObjectReference;
+import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
+import io.fabric8.kubernetes.api.model.PodTemplateSpec;
+import io.fabric8.kubernetes.api.model.ResourceRequirements;
+import io.sundr.builder.annotations.Buildable;
+import io.sundr.builder.annotations.BuildableReference;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "name"
+})
+@ToString
+@EqualsAndHashCode
+@Accessors(prefix = {
+    "_",
+    ""
+})
+@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
+    @BuildableReference(ObjectMeta.class),
+    @BuildableReference(LabelSelector.class),
+    @BuildableReference(Container.class),
+    @BuildableReference(PodTemplateSpec.class),
+    @BuildableReference(ResourceRequirements.class),
+    @BuildableReference(IntOrString.class),
+    @BuildableReference(ObjectReference.class),
+    @BuildableReference(LocalObjectReference.class),
+    @BuildableReference(PersistentVolumeClaim.class)
+})
+@Generated("jsonschema2pojo")
+public class MachineOSConfigReference implements Editable<MachineOSConfigReferenceBuilder> , KubernetesResource
+{
+
+    @JsonProperty("name")
+    private String name;
+    @JsonIgnore
+    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
+
+    /**
+     * No args constructor for use in serialization
+     * 
+     */
+    public MachineOSConfigReference() {
+    }
+
+    public MachineOSConfigReference(String name) {
+        super();
+        this.name = name;
+    }
+
+    @JsonProperty("name")
+    public String getName() {
+        return name;
+    }
+
+    @JsonProperty("name")
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @JsonIgnore
+    public MachineOSConfigReferenceBuilder edit() {
+        return new MachineOSConfigReferenceBuilder(this);
+    }
+
+    @JsonIgnore
+    public MachineOSConfigReferenceBuilder toBuilder() {
+        return edit();
+    }
+
+    @JsonAnyGetter
+    public Map<String, Object> getAdditionalProperties() {
+        return this.additionalProperties;
+    }
+
+    @JsonAnySetter
+    public void setAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+    }
+
+    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
+        this.additionalProperties = additionalProperties;
+    }
+
+}
diff --git a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MachineOSConfigSpec.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MachineOSConfigSpec.java
new file mode 100644
index 00000000000..1031707d83f
--- /dev/null
+++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MachineOSConfigSpec.java
@@ -0,0 +1,136 @@
+
+package io.fabric8.openshift.api.model.machineconfiguration.v1alpha1;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import javax.annotation.Generated;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import io.fabric8.kubernetes.api.builder.Editable;
+import io.fabric8.kubernetes.api.model.Container;
+import io.fabric8.kubernetes.api.model.IntOrString;
+import io.fabric8.kubernetes.api.model.KubernetesResource;
+import io.fabric8.kubernetes.api.model.LabelSelector;
+import io.fabric8.kubernetes.api.model.LocalObjectReference;
+import io.fabric8.kubernetes.api.model.ObjectMeta;
+import io.fabric8.kubernetes.api.model.ObjectReference;
+import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
+import io.fabric8.kubernetes.api.model.PodTemplateSpec;
+import io.fabric8.kubernetes.api.model.ResourceRequirements;
+import io.sundr.builder.annotations.Buildable;
+import io.sundr.builder.annotations.BuildableReference;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "buildInputs",
+    "buildOutputs",
+    "machineConfigPool"
+})
+@ToString
+@EqualsAndHashCode
+@Accessors(prefix = {
+    "_",
+    ""
+})
+@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
+    @BuildableReference(ObjectMeta.class),
+    @BuildableReference(LabelSelector.class),
+    @BuildableReference(Container.class),
+    @BuildableReference(PodTemplateSpec.class),
+    @BuildableReference(ResourceRequirements.class),
+    @BuildableReference(IntOrString.class),
+    @BuildableReference(ObjectReference.class),
+    @BuildableReference(LocalObjectReference.class),
+    @BuildableReference(PersistentVolumeClaim.class)
+})
+@Generated("jsonschema2pojo")
+public class MachineOSConfigSpec implements Editable<MachineOSConfigSpecBuilder> , KubernetesResource
+{
+
+    @JsonProperty("buildInputs")
+    private BuildInputs buildInputs;
+    @JsonProperty("buildOutputs")
+    private BuildOutputs buildOutputs;
+    @JsonProperty("machineConfigPool")
+    private MachineConfigPoolReference machineConfigPool;
+    @JsonIgnore
+    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
+
+    /**
+     * No args constructor for use in serialization
+     * 
+     */
+    public MachineOSConfigSpec() {
+    }
+
+    public MachineOSConfigSpec(BuildInputs buildInputs, BuildOutputs buildOutputs, MachineConfigPoolReference machineConfigPool) {
+        super();
+        this.buildInputs = buildInputs;
+        this.buildOutputs = buildOutputs;
+        this.machineConfigPool = machineConfigPool;
+    }
+
+    @JsonProperty("buildInputs")
+    public BuildInputs getBuildInputs() {
+        return buildInputs;
+    }
+
+    @JsonProperty("buildInputs")
+    public void setBuildInputs(BuildInputs buildInputs) {
+        this.buildInputs = buildInputs;
+    }
+
+    @JsonProperty("buildOutputs")
+    public BuildOutputs getBuildOutputs() {
+        return buildOutputs;
+    }
+
+    @JsonProperty("buildOutputs")
+    public void setBuildOutputs(BuildOutputs buildOutputs) {
+        this.buildOutputs = buildOutputs;
+    }
+
+    @JsonProperty("machineConfigPool")
+    public MachineConfigPoolReference getMachineConfigPool() {
+        return machineConfigPool;
+    }
+
+    @JsonProperty("machineConfigPool")
+    public void setMachineConfigPool(MachineConfigPoolReference machineConfigPool) {
+        this.machineConfigPool = machineConfigPool;
+    }
+
+    @JsonIgnore
+    public MachineOSConfigSpecBuilder edit() {
+        return new MachineOSConfigSpecBuilder(this);
+    }
+
+    @JsonIgnore
+    public MachineOSConfigSpecBuilder toBuilder() {
+        return edit();
+    }
+
+    @JsonAnyGetter
+    public Map<String, Object> getAdditionalProperties() {
+        return this.additionalProperties;
+    }
+
+    @JsonAnySetter
+    public void setAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+    }
+
+    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
+        this.additionalProperties = additionalProperties;
+    }
+
+}
diff --git a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPoolSpecNodeSelector.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MachineOSConfigStatus.java
similarity index 62%
rename from kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPoolSpecNodeSelector.java
rename to kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MachineOSConfigStatus.java
index 7d5f8c87753..c5497f8a421 100644
--- a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPoolSpecNodeSelector.java
+++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MachineOSConfigStatus.java
@@ -1,5 +1,5 @@
 
-package io.fabric8.openshift.api.model.machineconfiguration.v1;
+package io.fabric8.openshift.api.model.machineconfiguration.v1alpha1;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
@@ -14,11 +14,11 @@
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import io.fabric8.kubernetes.api.builder.Editable;
+import io.fabric8.kubernetes.api.model.Condition;
 import io.fabric8.kubernetes.api.model.Container;
 import io.fabric8.kubernetes.api.model.IntOrString;
 import io.fabric8.kubernetes.api.model.KubernetesResource;
 import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LabelSelectorRequirement;
 import io.fabric8.kubernetes.api.model.LocalObjectReference;
 import io.fabric8.kubernetes.api.model.ObjectMeta;
 import io.fabric8.kubernetes.api.model.ObjectReference;
@@ -34,8 +34,9 @@
 @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonPropertyOrder({
-    "matchExpressions",
-    "matchLabels"
+    "conditions",
+    "currentImagePullspec",
+    "observedGeneration"
 })
 @ToString
 @EqualsAndHashCode
@@ -55,15 +56,16 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class MachineConfigPoolSpecNodeSelector implements Editable<MachineConfigPoolSpecNodeSelectorBuilder> , KubernetesResource
+public class MachineOSConfigStatus implements Editable<MachineOSConfigStatusBuilder> , KubernetesResource
 {
 
-    @JsonProperty("matchExpressions")
+    @JsonProperty("conditions")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<LabelSelectorRequirement> matchExpressions = new ArrayList<>();
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private Map<String, String> matchLabels = new LinkedHashMap<>();
+    private List<Condition> conditions = new ArrayList<>();
+    @JsonProperty("currentImagePullspec")
+    private String currentImagePullspec;
+    @JsonProperty("observedGeneration")
+    private Long observedGeneration;
     @JsonIgnore
     private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
 
@@ -71,44 +73,54 @@ public class MachineConfigPoolSpecNodeSelector implements Editable<MachineConfig
      * No args constructor for use in serialization
      * 
      */
-    public MachineConfigPoolSpecNodeSelector() {
+    public MachineOSConfigStatus() {
     }
 
-    public MachineConfigPoolSpecNodeSelector(List<LabelSelectorRequirement> matchExpressions, Map<String, String> matchLabels) {
+    public MachineOSConfigStatus(List<Condition> conditions, String currentImagePullspec, Long observedGeneration) {
         super();
-        this.matchExpressions = matchExpressions;
-        this.matchLabels = matchLabels;
+        this.conditions = conditions;
+        this.currentImagePullspec = currentImagePullspec;
+        this.observedGeneration = observedGeneration;
     }
 
-    @JsonProperty("matchExpressions")
+    @JsonProperty("conditions")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<LabelSelectorRequirement> getMatchExpressions() {
-        return matchExpressions;
+    public List<Condition> getConditions() {
+        return conditions;
     }
 
-    @JsonProperty("matchExpressions")
-    public void setMatchExpressions(List<LabelSelectorRequirement> matchExpressions) {
-        this.matchExpressions = matchExpressions;
+    @JsonProperty("conditions")
+    public void setConditions(List<Condition> conditions) {
+        this.conditions = conditions;
     }
 
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public Map<String, String> getMatchLabels() {
-        return matchLabels;
+    @JsonProperty("currentImagePullspec")
+    public String getCurrentImagePullspec() {
+        return currentImagePullspec;
+    }
+
+    @JsonProperty("currentImagePullspec")
+    public void setCurrentImagePullspec(String currentImagePullspec) {
+        this.currentImagePullspec = currentImagePullspec;
+    }
+
+    @JsonProperty("observedGeneration")
+    public Long getObservedGeneration() {
+        return observedGeneration;
     }
 
-    @JsonProperty("matchLabels")
-    public void setMatchLabels(Map<String, String> matchLabels) {
-        this.matchLabels = matchLabels;
+    @JsonProperty("observedGeneration")
+    public void setObservedGeneration(Long observedGeneration) {
+        this.observedGeneration = observedGeneration;
     }
 
     @JsonIgnore
-    public MachineConfigPoolSpecNodeSelectorBuilder edit() {
-        return new MachineConfigPoolSpecNodeSelectorBuilder(this);
+    public MachineOSConfigStatusBuilder edit() {
+        return new MachineOSConfigStatusBuilder(this);
     }
 
     @JsonIgnore
-    public MachineConfigPoolSpecNodeSelectorBuilder toBuilder() {
+    public MachineOSConfigStatusBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ControllerConfigSpecInfra.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MachineOSContainerfile.java
similarity index 67%
rename from kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ControllerConfigSpecInfra.java
rename to kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MachineOSContainerfile.java
index 431824d752b..f761b187859 100644
--- a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ControllerConfigSpecInfra.java
+++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MachineOSContainerfile.java
@@ -1,5 +1,5 @@
 
-package io.fabric8.openshift.api.model.machineconfiguration.v1;
+package io.fabric8.openshift.api.model.machineconfiguration.v1alpha1;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -31,9 +31,8 @@
 @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonPropertyOrder({
-    "apiVersion",
-    "kind",
-    "metadata"
+    "containerfileArch",
+    "content"
 })
 @ToString
 @EqualsAndHashCode
@@ -53,15 +52,13 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class ControllerConfigSpecInfra implements Editable<ControllerConfigSpecInfraBuilder> , KubernetesResource
+public class MachineOSContainerfile implements Editable<MachineOSContainerfileBuilder> , KubernetesResource
 {
 
-    @JsonProperty("apiVersion")
-    private String apiVersion;
-    @JsonProperty("kind")
-    private String kind;
-    @JsonProperty("metadata")
-    private ObjectMeta metadata;
+    @JsonProperty("containerfileArch")
+    private String containerfileArch;
+    @JsonProperty("content")
+    private String content;
     @JsonIgnore
     private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
 
@@ -69,53 +66,42 @@ public class ControllerConfigSpecInfra implements Editable<ControllerConfigSpecI
      * No args constructor for use in serialization
      * 
      */
-    public ControllerConfigSpecInfra() {
+    public MachineOSContainerfile() {
     }
 
-    public ControllerConfigSpecInfra(String apiVersion, String kind, ObjectMeta metadata) {
+    public MachineOSContainerfile(String containerfileArch, String content) {
         super();
-        this.apiVersion = apiVersion;
-        this.kind = kind;
-        this.metadata = metadata;
+        this.containerfileArch = containerfileArch;
+        this.content = content;
     }
 
-    @JsonProperty("apiVersion")
-    public String getApiVersion() {
-        return apiVersion;
+    @JsonProperty("containerfileArch")
+    public String getContainerfileArch() {
+        return containerfileArch;
     }
 
-    @JsonProperty("apiVersion")
-    public void setApiVersion(String apiVersion) {
-        this.apiVersion = apiVersion;
+    @JsonProperty("containerfileArch")
+    public void setContainerfileArch(String containerfileArch) {
+        this.containerfileArch = containerfileArch;
     }
 
-    @JsonProperty("kind")
-    public String getKind() {
-        return kind;
+    @JsonProperty("content")
+    public String getContent() {
+        return content;
     }
 
-    @JsonProperty("kind")
-    public void setKind(String kind) {
-        this.kind = kind;
-    }
-
-    @JsonProperty("metadata")
-    public ObjectMeta getMetadata() {
-        return metadata;
-    }
-
-    @JsonProperty("metadata")
-    public void setMetadata(ObjectMeta metadata) {
-        this.metadata = metadata;
+    @JsonProperty("content")
+    public void setContent(String content) {
+        this.content = content;
     }
 
     @JsonIgnore
-    public ControllerConfigSpecInfraBuilder edit() {
-        return new ControllerConfigSpecInfraBuilder(this);
+    public MachineOSContainerfileBuilder edit() {
+        return new MachineOSContainerfileBuilder(this);
     }
 
     @JsonIgnore
-    public ControllerConfigSpecInfraBuilder toBuilder() {
+    public MachineOSContainerfileBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MachineOSImageBuilder.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MachineOSImageBuilder.java
new file mode 100644
index 00000000000..6cf32489618
--- /dev/null
+++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/MachineOSImageBuilder.java
@@ -0,0 +1,108 @@
+
+package io.fabric8.openshift.api.model.machineconfiguration.v1alpha1;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import javax.annotation.Generated;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import io.fabric8.kubernetes.api.builder.Editable;
+import io.fabric8.kubernetes.api.model.Container;
+import io.fabric8.kubernetes.api.model.IntOrString;
+import io.fabric8.kubernetes.api.model.KubernetesResource;
+import io.fabric8.kubernetes.api.model.LabelSelector;
+import io.fabric8.kubernetes.api.model.LocalObjectReference;
+import io.fabric8.kubernetes.api.model.ObjectMeta;
+import io.fabric8.kubernetes.api.model.ObjectReference;
+import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
+import io.fabric8.kubernetes.api.model.PodTemplateSpec;
+import io.fabric8.kubernetes.api.model.ResourceRequirements;
+import io.sundr.builder.annotations.Buildable;
+import io.sundr.builder.annotations.BuildableReference;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "imageBuilderType"
+})
+@ToString
+@EqualsAndHashCode
+@Accessors(prefix = {
+    "_",
+    ""
+})
+@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
+    @BuildableReference(ObjectMeta.class),
+    @BuildableReference(LabelSelector.class),
+    @BuildableReference(Container.class),
+    @BuildableReference(PodTemplateSpec.class),
+    @BuildableReference(ResourceRequirements.class),
+    @BuildableReference(IntOrString.class),
+    @BuildableReference(ObjectReference.class),
+    @BuildableReference(LocalObjectReference.class),
+    @BuildableReference(PersistentVolumeClaim.class)
+})
+@Generated("jsonschema2pojo")
+public class MachineOSImageBuilder implements Editable<MachineOSImageBuilderBuilder> , KubernetesResource
+{
+
+    @JsonProperty("imageBuilderType")
+    private String imageBuilderType;
+    @JsonIgnore
+    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
+
+    /**
+     * No args constructor for use in serialization
+     * 
+     */
+    public MachineOSImageBuilder() {
+    }
+
+    public MachineOSImageBuilder(String imageBuilderType) {
+        super();
+        this.imageBuilderType = imageBuilderType;
+    }
+
+    @JsonProperty("imageBuilderType")
+    public String getImageBuilderType() {
+        return imageBuilderType;
+    }
+
+    @JsonProperty("imageBuilderType")
+    public void setImageBuilderType(String imageBuilderType) {
+        this.imageBuilderType = imageBuilderType;
+    }
+
+    @JsonIgnore
+    public MachineOSImageBuilderBuilder edit() {
+        return new MachineOSImageBuilderBuilder(this);
+    }
+
+    @JsonIgnore
+    public MachineOSImageBuilderBuilder toBuilder() {
+        return edit();
+    }
+
+    @JsonAnyGetter
+    public Map<String, Object> getAdditionalProperties() {
+        return this.additionalProperties;
+    }
+
+    @JsonAnySetter
+    public void setAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+    }
+
+    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
+        this.additionalProperties = additionalProperties;
+    }
+
+}
diff --git a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/ObjectReference.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/ObjectReference.java
new file mode 100644
index 00000000000..025f01381a4
--- /dev/null
+++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/ObjectReference.java
@@ -0,0 +1,149 @@
+
+package io.fabric8.openshift.api.model.machineconfiguration.v1alpha1;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import javax.annotation.Generated;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import io.fabric8.kubernetes.api.builder.Editable;
+import io.fabric8.kubernetes.api.model.Container;
+import io.fabric8.kubernetes.api.model.IntOrString;
+import io.fabric8.kubernetes.api.model.KubernetesResource;
+import io.fabric8.kubernetes.api.model.LabelSelector;
+import io.fabric8.kubernetes.api.model.LocalObjectReference;
+import io.fabric8.kubernetes.api.model.ObjectMeta;
+import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
+import io.fabric8.kubernetes.api.model.PodTemplateSpec;
+import io.fabric8.kubernetes.api.model.ResourceRequirements;
+import io.sundr.builder.annotations.Buildable;
+import io.sundr.builder.annotations.BuildableReference;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "group",
+    "name",
+    "namespace",
+    "resource"
+})
+@ToString
+@EqualsAndHashCode
+@Accessors(prefix = {
+    "_",
+    ""
+})
+@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
+    @BuildableReference(ObjectMeta.class),
+    @BuildableReference(LabelSelector.class),
+    @BuildableReference(Container.class),
+    @BuildableReference(PodTemplateSpec.class),
+    @BuildableReference(ResourceRequirements.class),
+    @BuildableReference(IntOrString.class),
+    @BuildableReference(io.fabric8.kubernetes.api.model.ObjectReference.class),
+    @BuildableReference(LocalObjectReference.class),
+    @BuildableReference(PersistentVolumeClaim.class)
+})
+@Generated("jsonschema2pojo")
+public class ObjectReference implements Editable<ObjectReferenceBuilder> , KubernetesResource
+{
+
+    @JsonProperty("group")
+    private String group;
+    @JsonProperty("name")
+    private String name;
+    @JsonProperty("namespace")
+    private String namespace;
+    @JsonProperty("resource")
+    private String resource;
+    @JsonIgnore
+    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
+
+    /**
+     * No args constructor for use in serialization
+     * 
+     */
+    public ObjectReference() {
+    }
+
+    public ObjectReference(String group, String name, String namespace, String resource) {
+        super();
+        this.group = group;
+        this.name = name;
+        this.namespace = namespace;
+        this.resource = resource;
+    }
+
+    @JsonProperty("group")
+    public String getGroup() {
+        return group;
+    }
+
+    @JsonProperty("group")
+    public void setGroup(String group) {
+        this.group = group;
+    }
+
+    @JsonProperty("name")
+    public String getName() {
+        return name;
+    }
+
+    @JsonProperty("name")
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @JsonProperty("namespace")
+    public String getNamespace() {
+        return namespace;
+    }
+
+    @JsonProperty("namespace")
+    public void setNamespace(String namespace) {
+        this.namespace = namespace;
+    }
+
+    @JsonProperty("resource")
+    public String getResource() {
+        return resource;
+    }
+
+    @JsonProperty("resource")
+    public void setResource(String resource) {
+        this.resource = resource;
+    }
+
+    @JsonIgnore
+    public ObjectReferenceBuilder edit() {
+        return new ObjectReferenceBuilder(this);
+    }
+
+    @JsonIgnore
+    public ObjectReferenceBuilder toBuilder() {
+        return edit();
+    }
+
+    @JsonAnyGetter
+    public Map<String, Object> getAdditionalProperties() {
+        return this.additionalProperties;
+    }
+
+    @JsonAnySetter
+    public void setAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+    }
+
+    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
+        this.additionalProperties = additionalProperties;
+    }
+
+}
diff --git a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/PinnedImageRef.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/PinnedImageRef.java
new file mode 100644
index 00000000000..3b954748d32
--- /dev/null
+++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/PinnedImageRef.java
@@ -0,0 +1,108 @@
+
+package io.fabric8.openshift.api.model.machineconfiguration.v1alpha1;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import javax.annotation.Generated;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import io.fabric8.kubernetes.api.builder.Editable;
+import io.fabric8.kubernetes.api.model.Container;
+import io.fabric8.kubernetes.api.model.IntOrString;
+import io.fabric8.kubernetes.api.model.KubernetesResource;
+import io.fabric8.kubernetes.api.model.LabelSelector;
+import io.fabric8.kubernetes.api.model.LocalObjectReference;
+import io.fabric8.kubernetes.api.model.ObjectMeta;
+import io.fabric8.kubernetes.api.model.ObjectReference;
+import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
+import io.fabric8.kubernetes.api.model.PodTemplateSpec;
+import io.fabric8.kubernetes.api.model.ResourceRequirements;
+import io.sundr.builder.annotations.Buildable;
+import io.sundr.builder.annotations.BuildableReference;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "name"
+})
+@ToString
+@EqualsAndHashCode
+@Accessors(prefix = {
+    "_",
+    ""
+})
+@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
+    @BuildableReference(ObjectMeta.class),
+    @BuildableReference(LabelSelector.class),
+    @BuildableReference(Container.class),
+    @BuildableReference(PodTemplateSpec.class),
+    @BuildableReference(ResourceRequirements.class),
+    @BuildableReference(IntOrString.class),
+    @BuildableReference(ObjectReference.class),
+    @BuildableReference(LocalObjectReference.class),
+    @BuildableReference(PersistentVolumeClaim.class)
+})
+@Generated("jsonschema2pojo")
+public class PinnedImageRef implements Editable<PinnedImageRefBuilder> , KubernetesResource
+{
+
+    @JsonProperty("name")
+    private String name;
+    @JsonIgnore
+    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
+
+    /**
+     * No args constructor for use in serialization
+     * 
+     */
+    public PinnedImageRef() {
+    }
+
+    public PinnedImageRef(String name) {
+        super();
+        this.name = name;
+    }
+
+    @JsonProperty("name")
+    public String getName() {
+        return name;
+    }
+
+    @JsonProperty("name")
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @JsonIgnore
+    public PinnedImageRefBuilder edit() {
+        return new PinnedImageRefBuilder(this);
+    }
+
+    @JsonIgnore
+    public PinnedImageRefBuilder toBuilder() {
+        return edit();
+    }
+
+    @JsonAnyGetter
+    public Map<String, Object> getAdditionalProperties() {
+        return this.additionalProperties;
+    }
+
+    @JsonAnySetter
+    public void setAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+    }
+
+    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
+        this.additionalProperties = additionalProperties;
+    }
+
+}
diff --git a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPoolSpecCSource.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/PinnedImageSet.java
similarity index 59%
rename from kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPoolSpecCSource.java
rename to kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/PinnedImageSet.java
index e786279390f..b7ed6ec5a3a 100644
--- a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPoolSpecCSource.java
+++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/PinnedImageSet.java
@@ -1,5 +1,5 @@
 
-package io.fabric8.openshift.api.model.machineconfiguration.v1;
+package io.fabric8.openshift.api.model.machineconfiguration.v1alpha1;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -13,8 +13,8 @@
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import io.fabric8.kubernetes.api.builder.Editable;
 import io.fabric8.kubernetes.api.model.Container;
+import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
 import io.fabric8.kubernetes.api.model.LabelSelector;
 import io.fabric8.kubernetes.api.model.LocalObjectReference;
 import io.fabric8.kubernetes.api.model.ObjectMeta;
@@ -22,8 +22,12 @@
 import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
 import io.fabric8.kubernetes.api.model.PodTemplateSpec;
 import io.fabric8.kubernetes.api.model.ResourceRequirements;
+import io.fabric8.kubernetes.model.annotation.Group;
+import io.fabric8.kubernetes.model.annotation.Version;
 import io.sundr.builder.annotations.Buildable;
 import io.sundr.builder.annotations.BuildableReference;
+import io.sundr.transform.annotations.TemplateTransformation;
+import io.sundr.transform.annotations.TemplateTransformations;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import lombok.experimental.Accessors;
@@ -33,11 +37,9 @@
 @JsonPropertyOrder({
     "apiVersion",
     "kind",
-    "fieldPath",
-    "name",
-    "namespace",
-    "resourceVersion",
-    "uid"
+    "metadata",
+    "spec",
+    "status"
 })
 @ToString
 @EqualsAndHashCode
@@ -56,24 +58,35 @@
     @BuildableReference(LocalObjectReference.class),
     @BuildableReference(PersistentVolumeClaim.class)
 })
+@TemplateTransformations({
+    @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true)
+})
+@Version("v1alpha1")
+@Group("machineconfiguration.openshift.io")
 @Generated("jsonschema2pojo")
-public class MachineConfigPoolSpecCSource implements Editable<MachineConfigPoolSpecCSourceBuilder> , KubernetesResource
+public class PinnedImageSet implements Editable<PinnedImageSetBuilder> , HasMetadata
 {
 
+    /**
+     * 
+     * (Required)
+     * 
+     */
     @JsonProperty("apiVersion")
-    private String apiVersion;
-    @JsonProperty("fieldPath")
-    private String fieldPath;
+    private String apiVersion = "machineconfiguration.openshift.io/v1alpha1";
+    /**
+     * 
+     * (Required)
+     * 
+     */
     @JsonProperty("kind")
-    private String kind;
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("namespace")
-    private String namespace;
-    @JsonProperty("resourceVersion")
-    private String resourceVersion;
-    @JsonProperty("uid")
-    private String uid;
+    private String kind = "PinnedImageSet";
+    @JsonProperty("metadata")
+    private ObjectMeta metadata;
+    @JsonProperty("spec")
+    private PinnedImageSetSpec spec;
+    @JsonProperty("status")
+    private PinnedImageSetStatus status;
     @JsonIgnore
     private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
 
@@ -81,97 +94,95 @@ public class MachineConfigPoolSpecCSource implements Editable<MachineConfigPoolS
      * No args constructor for use in serialization
      * 
      */
-    public MachineConfigPoolSpecCSource() {
+    public PinnedImageSet() {
     }
 
-    public MachineConfigPoolSpecCSource(String apiVersion, String fieldPath, String kind, String name, String namespace, String resourceVersion, String uid) {
+    public PinnedImageSet(String apiVersion, String kind, ObjectMeta metadata, PinnedImageSetSpec spec, PinnedImageSetStatus status) {
         super();
         this.apiVersion = apiVersion;
-        this.fieldPath = fieldPath;
         this.kind = kind;
-        this.name = name;
-        this.namespace = namespace;
-        this.resourceVersion = resourceVersion;
-        this.uid = uid;
+        this.metadata = metadata;
+        this.spec = spec;
+        this.status = status;
     }
 
+    /**
+     * 
+     * (Required)
+     * 
+     */
     @JsonProperty("apiVersion")
     public String getApiVersion() {
         return apiVersion;
     }
 
+    /**
+     * 
+     * (Required)
+     * 
+     */
     @JsonProperty("apiVersion")
     public void setApiVersion(String apiVersion) {
         this.apiVersion = apiVersion;
     }
 
-    @JsonProperty("fieldPath")
-    public String getFieldPath() {
-        return fieldPath;
-    }
-
-    @JsonProperty("fieldPath")
-    public void setFieldPath(String fieldPath) {
-        this.fieldPath = fieldPath;
-    }
-
+    /**
+     * 
+     * (Required)
+     * 
+     */
     @JsonProperty("kind")
     public String getKind() {
         return kind;
     }
 
+    /**
+     * 
+     * (Required)
+     * 
+     */
     @JsonProperty("kind")
     public void setKind(String kind) {
         this.kind = kind;
     }
 
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("namespace")
-    public String getNamespace() {
-        return namespace;
+    @JsonProperty("metadata")
+    public ObjectMeta getMetadata() {
+        return metadata;
     }
 
-    @JsonProperty("namespace")
-    public void setNamespace(String namespace) {
-        this.namespace = namespace;
+    @JsonProperty("metadata")
+    public void setMetadata(ObjectMeta metadata) {
+        this.metadata = metadata;
     }
 
-    @JsonProperty("resourceVersion")
-    public String getResourceVersion() {
-        return resourceVersion;
+    @JsonProperty("spec")
+    public PinnedImageSetSpec getSpec() {
+        return spec;
     }
 
-    @JsonProperty("resourceVersion")
-    public void setResourceVersion(String resourceVersion) {
-        this.resourceVersion = resourceVersion;
+    @JsonProperty("spec")
+    public void setSpec(PinnedImageSetSpec spec) {
+        this.spec = spec;
     }
 
-    @JsonProperty("uid")
-    public String getUid() {
-        return uid;
+    @JsonProperty("status")
+    public PinnedImageSetStatus getStatus() {
+        return status;
     }
 
-    @JsonProperty("uid")
-    public void setUid(String uid) {
-        this.uid = uid;
+    @JsonProperty("status")
+    public void setStatus(PinnedImageSetStatus status) {
+        this.status = status;
     }
 
     @JsonIgnore
-    public MachineConfigPoolSpecCSourceBuilder edit() {
-        return new MachineConfigPoolSpecCSourceBuilder(this);
+    public PinnedImageSetBuilder edit() {
+        return new PinnedImageSetBuilder(this);
     }
 
     @JsonIgnore
-    public MachineConfigPoolSpecCSourceBuilder toBuilder() {
+    public PinnedImageSetBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/PinnedImageSetList.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/PinnedImageSetList.java
new file mode 100644
index 00000000000..29463c3bb81
--- /dev/null
+++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/PinnedImageSetList.java
@@ -0,0 +1,195 @@
+
+package io.fabric8.openshift.api.model.machineconfiguration.v1alpha1;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.Generated;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import io.fabric8.kubernetes.api.builder.Editable;
+import io.fabric8.kubernetes.api.model.Container;
+import io.fabric8.kubernetes.api.model.IntOrString;
+import io.fabric8.kubernetes.api.model.KubernetesResource;
+import io.fabric8.kubernetes.api.model.KubernetesResourceList;
+import io.fabric8.kubernetes.api.model.LabelSelector;
+import io.fabric8.kubernetes.api.model.ListMeta;
+import io.fabric8.kubernetes.api.model.LocalObjectReference;
+import io.fabric8.kubernetes.api.model.ObjectMeta;
+import io.fabric8.kubernetes.api.model.ObjectReference;
+import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
+import io.fabric8.kubernetes.api.model.PodTemplateSpec;
+import io.fabric8.kubernetes.api.model.ResourceRequirements;
+import io.fabric8.kubernetes.model.annotation.Group;
+import io.fabric8.kubernetes.model.annotation.Version;
+import io.sundr.builder.annotations.Buildable;
+import io.sundr.builder.annotations.BuildableReference;
+import io.sundr.transform.annotations.TemplateTransformation;
+import io.sundr.transform.annotations.TemplateTransformations;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "apiVersion",
+    "kind",
+    "metadata",
+    "items"
+})
+@ToString
+@EqualsAndHashCode
+@Accessors(prefix = {
+    "_",
+    ""
+})
+@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
+    @BuildableReference(ObjectMeta.class),
+    @BuildableReference(LabelSelector.class),
+    @BuildableReference(Container.class),
+    @BuildableReference(PodTemplateSpec.class),
+    @BuildableReference(ResourceRequirements.class),
+    @BuildableReference(IntOrString.class),
+    @BuildableReference(ObjectReference.class),
+    @BuildableReference(LocalObjectReference.class),
+    @BuildableReference(PersistentVolumeClaim.class)
+})
+@TemplateTransformations({
+    @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true)
+})
+@Version("v1alpha1")
+@Group("machineconfiguration.openshift.io")
+@Generated("jsonschema2pojo")
+public class PinnedImageSetList implements Editable<PinnedImageSetListBuilder> , KubernetesResource, KubernetesResourceList<io.fabric8.openshift.api.model.machineconfiguration.v1alpha1.PinnedImageSet>
+{
+
+    /**
+     * 
+     * (Required)
+     * 
+     */
+    @JsonProperty("apiVersion")
+    private String apiVersion = "machineconfiguration.openshift.io/v1alpha1";
+    @JsonProperty("items")
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    private List<io.fabric8.openshift.api.model.machineconfiguration.v1alpha1.PinnedImageSet> items = new ArrayList<>();
+    /**
+     * 
+     * (Required)
+     * 
+     */
+    @JsonProperty("kind")
+    private String kind = "PinnedImageSetList";
+    @JsonProperty("metadata")
+    private ListMeta metadata;
+    @JsonIgnore
+    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
+
+    /**
+     * No args constructor for use in serialization
+     * 
+     */
+    public PinnedImageSetList() {
+    }
+
+    public PinnedImageSetList(String apiVersion, List<io.fabric8.openshift.api.model.machineconfiguration.v1alpha1.PinnedImageSet> items, String kind, ListMeta metadata) {
+        super();
+        this.apiVersion = apiVersion;
+        this.items = items;
+        this.kind = kind;
+        this.metadata = metadata;
+    }
+
+    /**
+     * 
+     * (Required)
+     * 
+     */
+    @JsonProperty("apiVersion")
+    public String getApiVersion() {
+        return apiVersion;
+    }
+
+    /**
+     * 
+     * (Required)
+     * 
+     */
+    @JsonProperty("apiVersion")
+    public void setApiVersion(String apiVersion) {
+        this.apiVersion = apiVersion;
+    }
+
+    @JsonProperty("items")
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    public List<io.fabric8.openshift.api.model.machineconfiguration.v1alpha1.PinnedImageSet> getItems() {
+        return items;
+    }
+
+    @JsonProperty("items")
+    public void setItems(List<io.fabric8.openshift.api.model.machineconfiguration.v1alpha1.PinnedImageSet> items) {
+        this.items = items;
+    }
+
+    /**
+     * 
+     * (Required)
+     * 
+     */
+    @JsonProperty("kind")
+    public String getKind() {
+        return kind;
+    }
+
+    /**
+     * 
+     * (Required)
+     * 
+     */
+    @JsonProperty("kind")
+    public void setKind(String kind) {
+        this.kind = kind;
+    }
+
+    @JsonProperty("metadata")
+    public ListMeta getMetadata() {
+        return metadata;
+    }
+
+    @JsonProperty("metadata")
+    public void setMetadata(ListMeta metadata) {
+        this.metadata = metadata;
+    }
+
+    @JsonIgnore
+    public PinnedImageSetListBuilder edit() {
+        return new PinnedImageSetListBuilder(this);
+    }
+
+    @JsonIgnore
+    public PinnedImageSetListBuilder toBuilder() {
+        return edit();
+    }
+
+    @JsonAnyGetter
+    public Map<String, Object> getAdditionalProperties() {
+        return this.additionalProperties;
+    }
+
+    @JsonAnySetter
+    public void setAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+    }
+
+    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
+        this.additionalProperties = additionalProperties;
+    }
+
+}
diff --git a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/PinnedImageSetSpec.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/PinnedImageSetSpec.java
new file mode 100644
index 00000000000..21ea8895dd9
--- /dev/null
+++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/PinnedImageSetSpec.java
@@ -0,0 +1,112 @@
+
+package io.fabric8.openshift.api.model.machineconfiguration.v1alpha1;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.Generated;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import io.fabric8.kubernetes.api.builder.Editable;
+import io.fabric8.kubernetes.api.model.Container;
+import io.fabric8.kubernetes.api.model.IntOrString;
+import io.fabric8.kubernetes.api.model.KubernetesResource;
+import io.fabric8.kubernetes.api.model.LabelSelector;
+import io.fabric8.kubernetes.api.model.LocalObjectReference;
+import io.fabric8.kubernetes.api.model.ObjectMeta;
+import io.fabric8.kubernetes.api.model.ObjectReference;
+import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
+import io.fabric8.kubernetes.api.model.PodTemplateSpec;
+import io.fabric8.kubernetes.api.model.ResourceRequirements;
+import io.sundr.builder.annotations.Buildable;
+import io.sundr.builder.annotations.BuildableReference;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "pinnedImages"
+})
+@ToString
+@EqualsAndHashCode
+@Accessors(prefix = {
+    "_",
+    ""
+})
+@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
+    @BuildableReference(ObjectMeta.class),
+    @BuildableReference(LabelSelector.class),
+    @BuildableReference(Container.class),
+    @BuildableReference(PodTemplateSpec.class),
+    @BuildableReference(ResourceRequirements.class),
+    @BuildableReference(IntOrString.class),
+    @BuildableReference(ObjectReference.class),
+    @BuildableReference(LocalObjectReference.class),
+    @BuildableReference(PersistentVolumeClaim.class)
+})
+@Generated("jsonschema2pojo")
+public class PinnedImageSetSpec implements Editable<PinnedImageSetSpecBuilder> , KubernetesResource
+{
+
+    @JsonProperty("pinnedImages")
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    private List<PinnedImageRef> pinnedImages = new ArrayList<>();
+    @JsonIgnore
+    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
+
+    /**
+     * No args constructor for use in serialization
+     * 
+     */
+    public PinnedImageSetSpec() {
+    }
+
+    public PinnedImageSetSpec(List<PinnedImageRef> pinnedImages) {
+        super();
+        this.pinnedImages = pinnedImages;
+    }
+
+    @JsonProperty("pinnedImages")
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    public List<PinnedImageRef> getPinnedImages() {
+        return pinnedImages;
+    }
+
+    @JsonProperty("pinnedImages")
+    public void setPinnedImages(List<PinnedImageRef> pinnedImages) {
+        this.pinnedImages = pinnedImages;
+    }
+
+    @JsonIgnore
+    public PinnedImageSetSpecBuilder edit() {
+        return new PinnedImageSetSpecBuilder(this);
+    }
+
+    @JsonIgnore
+    public PinnedImageSetSpecBuilder toBuilder() {
+        return edit();
+    }
+
+    @JsonAnyGetter
+    public Map<String, Object> getAdditionalProperties() {
+        return this.additionalProperties;
+    }
+
+    @JsonAnySetter
+    public void setAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+    }
+
+    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
+        this.additionalProperties = additionalProperties;
+    }
+
+}
diff --git a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/PinnedImageSetStatus.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/PinnedImageSetStatus.java
new file mode 100644
index 00000000000..79fa9696c7e
--- /dev/null
+++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/PinnedImageSetStatus.java
@@ -0,0 +1,113 @@
+
+package io.fabric8.openshift.api.model.machineconfiguration.v1alpha1;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.Generated;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import io.fabric8.kubernetes.api.builder.Editable;
+import io.fabric8.kubernetes.api.model.Condition;
+import io.fabric8.kubernetes.api.model.Container;
+import io.fabric8.kubernetes.api.model.IntOrString;
+import io.fabric8.kubernetes.api.model.KubernetesResource;
+import io.fabric8.kubernetes.api.model.LabelSelector;
+import io.fabric8.kubernetes.api.model.LocalObjectReference;
+import io.fabric8.kubernetes.api.model.ObjectMeta;
+import io.fabric8.kubernetes.api.model.ObjectReference;
+import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
+import io.fabric8.kubernetes.api.model.PodTemplateSpec;
+import io.fabric8.kubernetes.api.model.ResourceRequirements;
+import io.sundr.builder.annotations.Buildable;
+import io.sundr.builder.annotations.BuildableReference;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "conditions"
+})
+@ToString
+@EqualsAndHashCode
+@Accessors(prefix = {
+    "_",
+    ""
+})
+@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
+    @BuildableReference(ObjectMeta.class),
+    @BuildableReference(LabelSelector.class),
+    @BuildableReference(Container.class),
+    @BuildableReference(PodTemplateSpec.class),
+    @BuildableReference(ResourceRequirements.class),
+    @BuildableReference(IntOrString.class),
+    @BuildableReference(ObjectReference.class),
+    @BuildableReference(LocalObjectReference.class),
+    @BuildableReference(PersistentVolumeClaim.class)
+})
+@Generated("jsonschema2pojo")
+public class PinnedImageSetStatus implements Editable<PinnedImageSetStatusBuilder> , KubernetesResource
+{
+
+    @JsonProperty("conditions")
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    private List<Condition> conditions = new ArrayList<>();
+    @JsonIgnore
+    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
+
+    /**
+     * No args constructor for use in serialization
+     * 
+     */
+    public PinnedImageSetStatus() {
+    }
+
+    public PinnedImageSetStatus(List<Condition> conditions) {
+        super();
+        this.conditions = conditions;
+    }
+
+    @JsonProperty("conditions")
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    public List<Condition> getConditions() {
+        return conditions;
+    }
+
+    @JsonProperty("conditions")
+    public void setConditions(List<Condition> conditions) {
+        this.conditions = conditions;
+    }
+
+    @JsonIgnore
+    public PinnedImageSetStatusBuilder edit() {
+        return new PinnedImageSetStatusBuilder(this);
+    }
+
+    @JsonIgnore
+    public PinnedImageSetStatusBuilder toBuilder() {
+        return edit();
+    }
+
+    @JsonAnyGetter
+    public Map<String, Object> getAdditionalProperties() {
+        return this.additionalProperties;
+    }
+
+    @JsonAnySetter
+    public void setAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+    }
+
+    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
+        this.additionalProperties = additionalProperties;
+    }
+
+}
diff --git a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/RenderedMachineConfigReference.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/RenderedMachineConfigReference.java
new file mode 100644
index 00000000000..74a2525235a
--- /dev/null
+++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1alpha1/RenderedMachineConfigReference.java
@@ -0,0 +1,108 @@
+
+package io.fabric8.openshift.api.model.machineconfiguration.v1alpha1;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import javax.annotation.Generated;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import io.fabric8.kubernetes.api.builder.Editable;
+import io.fabric8.kubernetes.api.model.Container;
+import io.fabric8.kubernetes.api.model.IntOrString;
+import io.fabric8.kubernetes.api.model.KubernetesResource;
+import io.fabric8.kubernetes.api.model.LabelSelector;
+import io.fabric8.kubernetes.api.model.LocalObjectReference;
+import io.fabric8.kubernetes.api.model.ObjectMeta;
+import io.fabric8.kubernetes.api.model.ObjectReference;
+import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
+import io.fabric8.kubernetes.api.model.PodTemplateSpec;
+import io.fabric8.kubernetes.api.model.ResourceRequirements;
+import io.sundr.builder.annotations.Buildable;
+import io.sundr.builder.annotations.BuildableReference;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "name"
+})
+@ToString
+@EqualsAndHashCode
+@Accessors(prefix = {
+    "_",
+    ""
+})
+@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
+    @BuildableReference(ObjectMeta.class),
+    @BuildableReference(LabelSelector.class),
+    @BuildableReference(Container.class),
+    @BuildableReference(PodTemplateSpec.class),
+    @BuildableReference(ResourceRequirements.class),
+    @BuildableReference(IntOrString.class),
+    @BuildableReference(ObjectReference.class),
+    @BuildableReference(LocalObjectReference.class),
+    @BuildableReference(PersistentVolumeClaim.class)
+})
+@Generated("jsonschema2pojo")
+public class RenderedMachineConfigReference implements Editable<RenderedMachineConfigReferenceBuilder> , KubernetesResource
+{
+
+    @JsonProperty("name")
+    private String name;
+    @JsonIgnore
+    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
+
+    /**
+     * No args constructor for use in serialization
+     * 
+     */
+    public RenderedMachineConfigReference() {
+    }
+
+    public RenderedMachineConfigReference(String name) {
+        super();
+        this.name = name;
+    }
+
+    @JsonProperty("name")
+    public String getName() {
+        return name;
+    }
+
+    @JsonProperty("name")
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @JsonIgnore
+    public RenderedMachineConfigReferenceBuilder edit() {
+        return new RenderedMachineConfigReferenceBuilder(this);
+    }
+
+    @JsonIgnore
+    public RenderedMachineConfigReferenceBuilder toBuilder() {
+        return edit();
+    }
+
+    @JsonAnyGetter
+    public Map<String, Object> getAdditionalProperties() {
+        return this.additionalProperties;
+    }
+
+    @JsonAnySetter
+    public void setAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+    }
+
+    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
+        this.additionalProperties = additionalProperties;
+    }
+
+}
diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ControllerConfigTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ControllerConfigTest.java
index 8d1018b7a72..541b2b57d4a 100644
--- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ControllerConfigTest.java
+++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ControllerConfigTest.java
@@ -15,13 +15,11 @@
  */
 package io.fabric8.openshift.client.server.mock;
 
-import io.fabric8.openshift.api.model.config.v1.InfrastructureSpecBuilder;
-import io.fabric8.openshift.api.model.config.v1.InfrastructureStatusBuilder;
+import io.fabric8.openshift.api.model.config.v1.InfrastructureBuilder;
 import io.fabric8.openshift.api.model.machineconfiguration.v1.ControllerConfig;
 import io.fabric8.openshift.api.model.machineconfiguration.v1.ControllerConfigBuilder;
 import io.fabric8.openshift.api.model.machineconfiguration.v1.ControllerConfigList;
 import io.fabric8.openshift.api.model.machineconfiguration.v1.ControllerConfigListBuilder;
-import io.fabric8.openshift.api.model.machineconfiguration.v1.ControllerConfigSpecInfraBuilder;
 import io.fabric8.openshift.client.OpenShiftClient;
 import org.junit.jupiter.api.Test;
 
@@ -87,17 +85,17 @@ private ControllerConfig createNewControllerConfig(String name) {
     return new ControllerConfigBuilder()
         .withNewMetadata().withName(name).endMetadata()
         .withNewSpec()
-        .withInfra(new ControllerConfigSpecInfraBuilder()
-            .addToAdditionalProperties("spec", new InfrastructureSpecBuilder()
-                .withNewCloudConfig()
-                .withName("")
-                .endCloudConfig()
-                .build())
-            .addToAdditionalProperties("status", new InfrastructureStatusBuilder()
-                .withNewPlatformStatus()
-                .withType("Libvirt")
-                .endPlatformStatus()
-                .build())
+        .withInfra(new InfrastructureBuilder()
+            .withNewSpec()
+            .withNewCloudConfig()
+            .withName("")
+            .endCloudConfig()
+            .endSpec()
+            .withNewStatus()
+            .withNewPlatformStatus()
+            .withType("Libvirt")
+            .endPlatformStatus()
+            .endStatus()
             .build())
         .withClusterDNSIP("10.2.3.10")
         .endSpec()