diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 4ba4004db..5aaf4ecd4 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -47,7 +47,7 @@ jobs:
             ~/.cache/golangci-lint
 
       - name: Check generated code to be consistent
-        run: make generate manifests clusterapi-manifests docs-generate-reference && git diff --exit-code
+        run: make clean && make generate manifests clusterapi-manifests docs-generate-reference release && git diff --exit-code
 
       - name: Run linter
         env:
diff --git a/Makefile b/Makefile
index 2c0fec506..34c04c52e 100644
--- a/Makefile
+++ b/Makefile
@@ -66,7 +66,7 @@ manifests_targets += config/crd/bases/k0smotron.io_jointokenrequests.yaml
 manifests_targets += config/crd/bases/bootstrap.cluster.x-k8s.io_k0sconfigs.yaml
 manifests_targets += config/crd/bases/bootstrap.cluster.x-k8s.io_k0sworkerconfigs.yaml
 manifests_targets += config/crd/bases/bootstrap.cluster.x-k8s.io_k0sworkerconfigtemplates.yaml
-manifests_targets += config/crd/bases/controlplane.cluster.x-k8s.io_k0scontrollerconfigs.yaml
+manifests_targets += config/crd/bases/bootstrap.cluster.x-k8s.io_k0scontrollerconfigs.yaml
 manifests_targets += config/crd/bases/controlplane.cluster.x-k8s.io_k0scontrolplanes.yaml
 manifests_targets += config/crd/bases/controlplane.cluster.x-k8s.io_k0smotroncontrolplanes.yaml
 manifests_targets += config/crd/bases/infrastructure.cluster.x-k8s.io_remoteclusters.yaml
diff --git a/config/crd/bases/controlplane.cluster.x-k8s.io_k0scontrollerconfigs.yaml b/config/crd/bases/controlplane.cluster.x-k8s.io_k0scontrollerconfigs.yaml
deleted file mode 100644
index 2efe07b39..000000000
--- a/config/crd/bases/controlplane.cluster.x-k8s.io_k0scontrollerconfigs.yaml
+++ /dev/null
@@ -1,99 +0,0 @@
----
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  annotations:
-    controller-gen.kubebuilder.io/version: v0.11.4
-  labels:
-    cluster.x-k8s.io/v1beta1: v1beta1
-  name: k0scontrollerconfigs.controlplane.cluster.x-k8s.io
-spec:
-  group: controlplane.cluster.x-k8s.io
-  names:
-    kind: K0sControllerConfig
-    listKind: K0sControllerConfigList
-    plural: k0scontrollerconfigs
-    singular: k0scontrollerconfig
-  scope: Namespaced
-  versions:
-  - name: v1beta1
-    schema:
-      openAPIV3Schema:
-        properties:
-          apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation
-              of an object. Servers should convert recognized schemas to the latest
-              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-            type: string
-          kind:
-            description: 'Kind is a string value representing the REST resource this
-              object represents. Servers may infer this from the endpoint the client
-              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-            type: string
-          metadata:
-            type: object
-          spec:
-            properties:
-              args:
-                description: 'Args specifies extra arguments to be passed to k0s worker.
-                  See: https://docs.k0sproject.io/stable/advanced/worker-configuration/'
-                items:
-                  type: string
-                type: array
-              downloadURL:
-                description: DownloadURL specifies the URL to download k0s binary
-                  from. If specified the version field is ignored and what ever version
-                  is downloaded from the URL is used.
-                type: string
-              files:
-                description: Files specifies extra files to be passed to user_data
-                  upon creation.
-                items:
-                  properties:
-                    content:
-                      type: string
-                    path:
-                      type: string
-                    permissions:
-                      type: string
-                  type: object
-                type: array
-              k0s:
-                description: K0s defines the k0s configuration. Note, that some fields
-                  will be overwritten by k0smotron. If empty, will be used default
-                  configuration. @see https://docs.k0sproject.io/stable/configuration/
-                type: object
-                x-kubernetes-preserve-unknown-fields: true
-              postStartCommands:
-                description: PostStartCommands specifies commands to be run after
-                  starting k0s worker.
-                items:
-                  type: string
-                type: array
-              preInstalledK0s:
-                description: PreInstallK0s specifies whether k0s binary is pre-installed
-                  on the node.
-                type: boolean
-              preStartCommands:
-                description: PreStartCommands specifies commands to be run before
-                  starting k0s worker.
-                items:
-                  type: string
-                type: array
-            type: object
-          status:
-            properties:
-              dataSecretName:
-                description: DataSecretName is the name of the secret that stores
-                  the bootstrap data script.
-                type: string
-              ready:
-                description: Ready indicates the Bootstrapdata field is ready to be
-                  consumed
-                type: boolean
-            type: object
-        type: object
-    served: true
-    storage: true
-    subresources:
-      status: {}
diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml
index 46f6b8ef8..839f05b78 100644
--- a/config/crd/kustomization.yaml
+++ b/config/crd/kustomization.yaml
@@ -7,7 +7,6 @@ resources:
 - bases/bootstrap.cluster.x-k8s.io_k0sworkerconfigs.yaml
 - bases/bootstrap.cluster.x-k8s.io_k0sworkerconfigtemplates.yaml
 - bases/bootstrap.cluster.x-k8s.io_k0scontrollerconfigs.yaml
-- bases/controlplane.cluster.x-k8s.io_k0scontrollerconfigs.yaml
 - bases/controlplane.cluster.x-k8s.io_k0scontrolplanes.yaml
 - bases/controlplane.cluster.x-k8s.io_k0scontrolplanetemplates.yaml
 - bases/controlplane.cluster.x-k8s.io_k0smotroncontrolplanes.yaml
diff --git a/docs/resource-reference.md b/docs/resource-reference.md
index b98911d76..81a4e79ae 100644
--- a/docs/resource-reference.md
+++ b/docs/resource-reference.md
@@ -1205,8 +1205,6 @@ This should be only set in the case you want to use a pre-generated join token.
 
 Resource Types:
 
-- [K0sControllerConfig](#k0scontrollerconfig)
-
 - [K0sControlPlane](#k0scontrolplane)
 
 - [K0sControlPlaneTemplate](#k0scontrolplanetemplate)
@@ -1218,203 +1216,6 @@ Resource Types:
 
 
 
-## K0sControllerConfig
-<sup><sup>[↩ Parent](#controlplaneclusterx-k8siov1beta1 )</sup></sup>
-
-
-
-
-
-
-
-
-<table>
-    <thead>
-        <tr>
-            <th>Name</th>
-            <th>Type</th>
-            <th>Description</th>
-            <th>Required</th>
-        </tr>
-    </thead>
-    <tbody><tr>
-      <td><b>apiVersion</b></td>
-      <td>string</td>
-      <td>controlplane.cluster.x-k8s.io/v1beta1</td>
-      <td>true</td>
-      </tr>
-      <tr>
-      <td><b>kind</b></td>
-      <td>string</td>
-      <td>K0sControllerConfig</td>
-      <td>true</td>
-      </tr>
-      <tr>
-      <td><b><a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#objectmeta-v1-meta">metadata</a></b></td>
-      <td>object</td>
-      <td>Refer to the Kubernetes API documentation for the fields of the `metadata` field.</td>
-      <td>true</td>
-      </tr><tr>
-        <td><b><a href="#k0scontrollerconfigspec-1">spec</a></b></td>
-        <td>object</td>
-        <td>
-          <br/>
-        </td>
-        <td>false</td>
-      </tr><tr>
-        <td><b><a href="#k0scontrollerconfigstatus-1">status</a></b></td>
-        <td>object</td>
-        <td>
-          <br/>
-        </td>
-        <td>false</td>
-      </tr></tbody>
-</table>
-
-
-### K0sControllerConfig.spec
-<sup><sup>[↩ Parent](#k0scontrollerconfig-1)</sup></sup>
-
-
-
-
-
-<table>
-    <thead>
-        <tr>
-            <th>Name</th>
-            <th>Type</th>
-            <th>Description</th>
-            <th>Required</th>
-        </tr>
-    </thead>
-    <tbody><tr>
-        <td><b>args</b></td>
-        <td>[]string</td>
-        <td>
-          Args specifies extra arguments to be passed to k0s worker. See: https://docs.k0sproject.io/stable/advanced/worker-configuration/<br/>
-        </td>
-        <td>false</td>
-      </tr><tr>
-        <td><b>downloadURL</b></td>
-        <td>string</td>
-        <td>
-          DownloadURL specifies the URL to download k0s binary from. If specified the version field is ignored and what ever version is downloaded from the URL is used.<br/>
-        </td>
-        <td>false</td>
-      </tr><tr>
-        <td><b><a href="#k0scontrollerconfigspecfilesindex-1">files</a></b></td>
-        <td>[]object</td>
-        <td>
-          Files specifies extra files to be passed to user_data upon creation.<br/>
-        </td>
-        <td>false</td>
-      </tr><tr>
-        <td><b>k0s</b></td>
-        <td>object</td>
-        <td>
-          K0s defines the k0s configuration. Note, that some fields will be overwritten by k0smotron. If empty, will be used default configuration. @see https://docs.k0sproject.io/stable/configuration/<br/>
-        </td>
-        <td>false</td>
-      </tr><tr>
-        <td><b>postStartCommands</b></td>
-        <td>[]string</td>
-        <td>
-          PostStartCommands specifies commands to be run after starting k0s worker.<br/>
-        </td>
-        <td>false</td>
-      </tr><tr>
-        <td><b>preInstalledK0s</b></td>
-        <td>boolean</td>
-        <td>
-          PreInstallK0s specifies whether k0s binary is pre-installed on the node.<br/>
-        </td>
-        <td>false</td>
-      </tr><tr>
-        <td><b>preStartCommands</b></td>
-        <td>[]string</td>
-        <td>
-          PreStartCommands specifies commands to be run before starting k0s worker.<br/>
-        </td>
-        <td>false</td>
-      </tr></tbody>
-</table>
-
-
-### K0sControllerConfig.spec.files[index]
-<sup><sup>[↩ Parent](#k0scontrollerconfigspec-1)</sup></sup>
-
-
-
-
-
-<table>
-    <thead>
-        <tr>
-            <th>Name</th>
-            <th>Type</th>
-            <th>Description</th>
-            <th>Required</th>
-        </tr>
-    </thead>
-    <tbody><tr>
-        <td><b>content</b></td>
-        <td>string</td>
-        <td>
-          <br/>
-        </td>
-        <td>false</td>
-      </tr><tr>
-        <td><b>path</b></td>
-        <td>string</td>
-        <td>
-          <br/>
-        </td>
-        <td>false</td>
-      </tr><tr>
-        <td><b>permissions</b></td>
-        <td>string</td>
-        <td>
-          <br/>
-        </td>
-        <td>false</td>
-      </tr></tbody>
-</table>
-
-
-### K0sControllerConfig.status
-<sup><sup>[↩ Parent](#k0scontrollerconfig-1)</sup></sup>
-
-
-
-
-
-<table>
-    <thead>
-        <tr>
-            <th>Name</th>
-            <th>Type</th>
-            <th>Description</th>
-            <th>Required</th>
-        </tr>
-    </thead>
-    <tbody><tr>
-        <td><b>dataSecretName</b></td>
-        <td>string</td>
-        <td>
-          DataSecretName is the name of the secret that stores the bootstrap data script.<br/>
-        </td>
-        <td>false</td>
-      </tr><tr>
-        <td><b>ready</b></td>
-        <td>boolean</td>
-        <td>
-          Ready indicates the Bootstrapdata field is ready to be consumed<br/>
-        </td>
-        <td>false</td>
-      </tr></tbody>
-</table>
-
 ## K0sControlPlane
 <sup><sup>[↩ Parent](#controlplaneclusterx-k8siov1beta1 )</sup></sup>