diff --git a/apis/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml b/apis/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml
index a2cfc7d69..6c1144b33 100644
--- a/apis/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml
+++ b/apis/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml
@@ -1127,751 +1127,6 @@ spec:
                             type: object
                           type: array
                       type: object
-                    extraMounts:
-                      items:
-                        properties:
-                          extraVolType:
-                            type: string
-                          mounts:
-                            items:
-                              properties:
-                                mountPath:
-                                  type: string
-                                mountPropagation:
-                                  type: string
-                                name:
-                                  type: string
-                                readOnly:
-                                  type: boolean
-                                subPath:
-                                  type: string
-                                subPathExpr:
-                                  type: string
-                              required:
-                              - mountPath
-                              - name
-                              type: object
-                            type: array
-                          propagation:
-                            items:
-                              type: string
-                            type: array
-                          volumes:
-                            items:
-                              properties:
-                                awsElasticBlockStore:
-                                  properties:
-                                    fsType:
-                                      type: string
-                                    partition:
-                                      format: int32
-                                      type: integer
-                                    readOnly:
-                                      type: boolean
-                                    volumeID:
-                                      type: string
-                                  required:
-                                  - volumeID
-                                  type: object
-                                azureDisk:
-                                  properties:
-                                    cachingMode:
-                                      type: string
-                                    diskName:
-                                      type: string
-                                    diskURI:
-                                      type: string
-                                    fsType:
-                                      type: string
-                                    kind:
-                                      type: string
-                                    readOnly:
-                                      type: boolean
-                                  required:
-                                  - diskName
-                                  - diskURI
-                                  type: object
-                                azureFile:
-                                  properties:
-                                    readOnly:
-                                      type: boolean
-                                    secretName:
-                                      type: string
-                                    shareName:
-                                      type: string
-                                  required:
-                                  - secretName
-                                  - shareName
-                                  type: object
-                                cephfs:
-                                  properties:
-                                    monitors:
-                                      items:
-                                        type: string
-                                      type: array
-                                    path:
-                                      type: string
-                                    readOnly:
-                                      type: boolean
-                                    secretFile:
-                                      type: string
-                                    secretRef:
-                                      properties:
-                                        name:
-                                          type: string
-                                      type: object
-                                      x-kubernetes-map-type: atomic
-                                    user:
-                                      type: string
-                                  required:
-                                  - monitors
-                                  type: object
-                                cinder:
-                                  properties:
-                                    fsType:
-                                      type: string
-                                    readOnly:
-                                      type: boolean
-                                    secretRef:
-                                      properties:
-                                        name:
-                                          type: string
-                                      type: object
-                                      x-kubernetes-map-type: atomic
-                                    volumeID:
-                                      type: string
-                                  required:
-                                  - volumeID
-                                  type: object
-                                configMap:
-                                  properties:
-                                    defaultMode:
-                                      format: int32
-                                      type: integer
-                                    items:
-                                      items:
-                                        properties:
-                                          key:
-                                            type: string
-                                          mode:
-                                            format: int32
-                                            type: integer
-                                          path:
-                                            type: string
-                                        required:
-                                        - key
-                                        - path
-                                        type: object
-                                      type: array
-                                    name:
-                                      type: string
-                                    optional:
-                                      type: boolean
-                                  type: object
-                                  x-kubernetes-map-type: atomic
-                                csi:
-                                  properties:
-                                    driver:
-                                      type: string
-                                    fsType:
-                                      type: string
-                                    nodePublishSecretRef:
-                                      properties:
-                                        name:
-                                          type: string
-                                      type: object
-                                      x-kubernetes-map-type: atomic
-                                    readOnly:
-                                      type: boolean
-                                    volumeAttributes:
-                                      additionalProperties:
-                                        type: string
-                                      type: object
-                                  required:
-                                  - driver
-                                  type: object
-                                downwardAPI:
-                                  properties:
-                                    defaultMode:
-                                      format: int32
-                                      type: integer
-                                    items:
-                                      items:
-                                        properties:
-                                          fieldRef:
-                                            properties:
-                                              apiVersion:
-                                                type: string
-                                              fieldPath:
-                                                type: string
-                                            required:
-                                            - fieldPath
-                                            type: object
-                                            x-kubernetes-map-type: atomic
-                                          mode:
-                                            format: int32
-                                            type: integer
-                                          path:
-                                            type: string
-                                          resourceFieldRef:
-                                            properties:
-                                              containerName:
-                                                type: string
-                                              divisor:
-                                                anyOf:
-                                                - type: integer
-                                                - type: string
-                                                pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                                                x-kubernetes-int-or-string: true
-                                              resource:
-                                                type: string
-                                            required:
-                                            - resource
-                                            type: object
-                                            x-kubernetes-map-type: atomic
-                                        required:
-                                        - path
-                                        type: object
-                                      type: array
-                                  type: object
-                                emptyDir:
-                                  properties:
-                                    medium:
-                                      type: string
-                                    sizeLimit:
-                                      anyOf:
-                                      - type: integer
-                                      - type: string
-                                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                                      x-kubernetes-int-or-string: true
-                                  type: object
-                                ephemeral:
-                                  properties:
-                                    volumeClaimTemplate:
-                                      properties:
-                                        metadata:
-                                          type: object
-                                        spec:
-                                          properties:
-                                            accessModes:
-                                              items:
-                                                type: string
-                                              type: array
-                                            dataSource:
-                                              properties:
-                                                apiGroup:
-                                                  type: string
-                                                kind:
-                                                  type: string
-                                                name:
-                                                  type: string
-                                              required:
-                                              - kind
-                                              - name
-                                              type: object
-                                              x-kubernetes-map-type: atomic
-                                            dataSourceRef:
-                                              properties:
-                                                apiGroup:
-                                                  type: string
-                                                kind:
-                                                  type: string
-                                                name:
-                                                  type: string
-                                                namespace:
-                                                  type: string
-                                              required:
-                                              - kind
-                                              - name
-                                              type: object
-                                            resources:
-                                              properties:
-                                                claims:
-                                                  items:
-                                                    properties:
-                                                      name:
-                                                        type: string
-                                                    required:
-                                                    - name
-                                                    type: object
-                                                  type: array
-                                                  x-kubernetes-list-map-keys:
-                                                  - name
-                                                  x-kubernetes-list-type: map
-                                                limits:
-                                                  additionalProperties:
-                                                    anyOf:
-                                                    - type: integer
-                                                    - type: string
-                                                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                                                    x-kubernetes-int-or-string: true
-                                                  type: object
-                                                requests:
-                                                  additionalProperties:
-                                                    anyOf:
-                                                    - type: integer
-                                                    - type: string
-                                                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                                                    x-kubernetes-int-or-string: true
-                                                  type: object
-                                              type: object
-                                            selector:
-                                              properties:
-                                                matchExpressions:
-                                                  items:
-                                                    properties:
-                                                      key:
-                                                        type: string
-                                                      operator:
-                                                        type: string
-                                                      values:
-                                                        items:
-                                                          type: string
-                                                        type: array
-                                                    required:
-                                                    - key
-                                                    - operator
-                                                    type: object
-                                                  type: array
-                                                matchLabels:
-                                                  additionalProperties:
-                                                    type: string
-                                                  type: object
-                                              type: object
-                                              x-kubernetes-map-type: atomic
-                                            storageClassName:
-                                              type: string
-                                            volumeMode:
-                                              type: string
-                                            volumeName:
-                                              type: string
-                                          type: object
-                                      required:
-                                      - spec
-                                      type: object
-                                  type: object
-                                fc:
-                                  properties:
-                                    fsType:
-                                      type: string
-                                    lun:
-                                      format: int32
-                                      type: integer
-                                    readOnly:
-                                      type: boolean
-                                    targetWWNs:
-                                      items:
-                                        type: string
-                                      type: array
-                                    wwids:
-                                      items:
-                                        type: string
-                                      type: array
-                                  type: object
-                                flexVolume:
-                                  properties:
-                                    driver:
-                                      type: string
-                                    fsType:
-                                      type: string
-                                    options:
-                                      additionalProperties:
-                                        type: string
-                                      type: object
-                                    readOnly:
-                                      type: boolean
-                                    secretRef:
-                                      properties:
-                                        name:
-                                          type: string
-                                      type: object
-                                      x-kubernetes-map-type: atomic
-                                  required:
-                                  - driver
-                                  type: object
-                                flocker:
-                                  properties:
-                                    datasetName:
-                                      type: string
-                                    datasetUUID:
-                                      type: string
-                                  type: object
-                                gcePersistentDisk:
-                                  properties:
-                                    fsType:
-                                      type: string
-                                    partition:
-                                      format: int32
-                                      type: integer
-                                    pdName:
-                                      type: string
-                                    readOnly:
-                                      type: boolean
-                                  required:
-                                  - pdName
-                                  type: object
-                                gitRepo:
-                                  properties:
-                                    directory:
-                                      type: string
-                                    repository:
-                                      type: string
-                                    revision:
-                                      type: string
-                                  required:
-                                  - repository
-                                  type: object
-                                glusterfs:
-                                  properties:
-                                    endpoints:
-                                      type: string
-                                    path:
-                                      type: string
-                                    readOnly:
-                                      type: boolean
-                                  required:
-                                  - endpoints
-                                  - path
-                                  type: object
-                                hostPath:
-                                  properties:
-                                    path:
-                                      type: string
-                                    type:
-                                      type: string
-                                  required:
-                                  - path
-                                  type: object
-                                iscsi:
-                                  properties:
-                                    chapAuthDiscovery:
-                                      type: boolean
-                                    chapAuthSession:
-                                      type: boolean
-                                    fsType:
-                                      type: string
-                                    initiatorName:
-                                      type: string
-                                    iqn:
-                                      type: string
-                                    iscsiInterface:
-                                      type: string
-                                    lun:
-                                      format: int32
-                                      type: integer
-                                    portals:
-                                      items:
-                                        type: string
-                                      type: array
-                                    readOnly:
-                                      type: boolean
-                                    secretRef:
-                                      properties:
-                                        name:
-                                          type: string
-                                      type: object
-                                      x-kubernetes-map-type: atomic
-                                    targetPortal:
-                                      type: string
-                                  required:
-                                  - iqn
-                                  - lun
-                                  - targetPortal
-                                  type: object
-                                name:
-                                  type: string
-                                nfs:
-                                  properties:
-                                    path:
-                                      type: string
-                                    readOnly:
-                                      type: boolean
-                                    server:
-                                      type: string
-                                  required:
-                                  - path
-                                  - server
-                                  type: object
-                                persistentVolumeClaim:
-                                  properties:
-                                    claimName:
-                                      type: string
-                                    readOnly:
-                                      type: boolean
-                                  required:
-                                  - claimName
-                                  type: object
-                                photonPersistentDisk:
-                                  properties:
-                                    fsType:
-                                      type: string
-                                    pdID:
-                                      type: string
-                                  required:
-                                  - pdID
-                                  type: object
-                                portworxVolume:
-                                  properties:
-                                    fsType:
-                                      type: string
-                                    readOnly:
-                                      type: boolean
-                                    volumeID:
-                                      type: string
-                                  required:
-                                  - volumeID
-                                  type: object
-                                projected:
-                                  properties:
-                                    defaultMode:
-                                      format: int32
-                                      type: integer
-                                    sources:
-                                      items:
-                                        properties:
-                                          configMap:
-                                            properties:
-                                              items:
-                                                items:
-                                                  properties:
-                                                    key:
-                                                      type: string
-                                                    mode:
-                                                      format: int32
-                                                      type: integer
-                                                    path:
-                                                      type: string
-                                                  required:
-                                                  - key
-                                                  - path
-                                                  type: object
-                                                type: array
-                                              name:
-                                                type: string
-                                              optional:
-                                                type: boolean
-                                            type: object
-                                            x-kubernetes-map-type: atomic
-                                          downwardAPI:
-                                            properties:
-                                              items:
-                                                items:
-                                                  properties:
-                                                    fieldRef:
-                                                      properties:
-                                                        apiVersion:
-                                                          type: string
-                                                        fieldPath:
-                                                          type: string
-                                                      required:
-                                                      - fieldPath
-                                                      type: object
-                                                      x-kubernetes-map-type: atomic
-                                                    mode:
-                                                      format: int32
-                                                      type: integer
-                                                    path:
-                                                      type: string
-                                                    resourceFieldRef:
-                                                      properties:
-                                                        containerName:
-                                                          type: string
-                                                        divisor:
-                                                          anyOf:
-                                                          - type: integer
-                                                          - type: string
-                                                          pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                                                          x-kubernetes-int-or-string: true
-                                                        resource:
-                                                          type: string
-                                                      required:
-                                                      - resource
-                                                      type: object
-                                                      x-kubernetes-map-type: atomic
-                                                  required:
-                                                  - path
-                                                  type: object
-                                                type: array
-                                            type: object
-                                          secret:
-                                            properties:
-                                              items:
-                                                items:
-                                                  properties:
-                                                    key:
-                                                      type: string
-                                                    mode:
-                                                      format: int32
-                                                      type: integer
-                                                    path:
-                                                      type: string
-                                                  required:
-                                                  - key
-                                                  - path
-                                                  type: object
-                                                type: array
-                                              name:
-                                                type: string
-                                              optional:
-                                                type: boolean
-                                            type: object
-                                            x-kubernetes-map-type: atomic
-                                          serviceAccountToken:
-                                            properties:
-                                              audience:
-                                                type: string
-                                              expirationSeconds:
-                                                format: int64
-                                                type: integer
-                                              path:
-                                                type: string
-                                            required:
-                                            - path
-                                            type: object
-                                        type: object
-                                      type: array
-                                  type: object
-                                quobyte:
-                                  properties:
-                                    group:
-                                      type: string
-                                    readOnly:
-                                      type: boolean
-                                    registry:
-                                      type: string
-                                    tenant:
-                                      type: string
-                                    user:
-                                      type: string
-                                    volume:
-                                      type: string
-                                  required:
-                                  - registry
-                                  - volume
-                                  type: object
-                                rbd:
-                                  properties:
-                                    fsType:
-                                      type: string
-                                    image:
-                                      type: string
-                                    keyring:
-                                      type: string
-                                    monitors:
-                                      items:
-                                        type: string
-                                      type: array
-                                    pool:
-                                      type: string
-                                    readOnly:
-                                      type: boolean
-                                    secretRef:
-                                      properties:
-                                        name:
-                                          type: string
-                                      type: object
-                                      x-kubernetes-map-type: atomic
-                                    user:
-                                      type: string
-                                  required:
-                                  - image
-                                  - monitors
-                                  type: object
-                                scaleIO:
-                                  properties:
-                                    fsType:
-                                      type: string
-                                    gateway:
-                                      type: string
-                                    protectionDomain:
-                                      type: string
-                                    readOnly:
-                                      type: boolean
-                                    secretRef:
-                                      properties:
-                                        name:
-                                          type: string
-                                      type: object
-                                      x-kubernetes-map-type: atomic
-                                    sslEnabled:
-                                      type: boolean
-                                    storageMode:
-                                      type: string
-                                    storagePool:
-                                      type: string
-                                    system:
-                                      type: string
-                                    volumeName:
-                                      type: string
-                                  required:
-                                  - gateway
-                                  - secretRef
-                                  - system
-                                  type: object
-                                secret:
-                                  properties:
-                                    defaultMode:
-                                      format: int32
-                                      type: integer
-                                    items:
-                                      items:
-                                        properties:
-                                          key:
-                                            type: string
-                                          mode:
-                                            format: int32
-                                            type: integer
-                                          path:
-                                            type: string
-                                        required:
-                                        - key
-                                        - path
-                                        type: object
-                                      type: array
-                                    optional:
-                                      type: boolean
-                                    secretName:
-                                      type: string
-                                  type: object
-                                storageos:
-                                  properties:
-                                    fsType:
-                                      type: string
-                                    readOnly:
-                                      type: boolean
-                                    secretRef:
-                                      properties:
-                                        name:
-                                          type: string
-                                      type: object
-                                      x-kubernetes-map-type: atomic
-                                    volumeName:
-                                      type: string
-                                    volumeNamespace:
-                                      type: string
-                                  type: object
-                                vsphereVolume:
-                                  properties:
-                                    fsType:
-                                      type: string
-                                    storagePolicyID:
-                                      type: string
-                                    storagePolicyName:
-                                      type: string
-                                    volumePath:
-                                      type: string
-                                  required:
-                                  - volumePath
-                                  type: object
-                              required:
-                              - name
-                              type: object
-                            type: array
-                        required:
-                        - mounts
-                        - volumes
-                        type: object
-                      type: array
                     hostName:
                       type: string
                     managementNetwork:
diff --git a/apis/dataplane/v1beta1/common.go b/apis/dataplane/v1beta1/common.go
index 21dc57d5c..b7a7e9a5f 100644
--- a/apis/dataplane/v1beta1/common.go
+++ b/apis/dataplane/v1beta1/common.go
@@ -102,10 +102,6 @@ type AnsibleOpts struct {
 
 // NodeSection defines the top level attributes inherited by nodes in the CR.
 type NodeSection struct {
-	// ExtraMounts containing files which can be mounted into an Ansible Execution Pod
-	// +kubebuilder:validation:Optional
-	ExtraMounts []storage.VolMounts `json:"extraMounts,omitempty"`
-
 	// Networks - Instance networks
 	// +kubebuilder:validation:Optional
 	Networks []infranetworkv1.IPSetNetwork `json:"networks,omitempty"`
diff --git a/apis/dataplane/v1beta1/zz_generated.deepcopy.go b/apis/dataplane/v1beta1/zz_generated.deepcopy.go
index 3731d9b42..22a535f39 100644
--- a/apis/dataplane/v1beta1/zz_generated.deepcopy.go
+++ b/apis/dataplane/v1beta1/zz_generated.deepcopy.go
@@ -186,13 +186,6 @@ func (in *LocalObjectReference) DeepCopy() *LocalObjectReference {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *NodeSection) DeepCopyInto(out *NodeSection) {
 	*out = *in
-	if in.ExtraMounts != nil {
-		in, out := &in.ExtraMounts, &out.ExtraMounts
-		*out = make([]storage.VolMounts, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
 	if in.Networks != nil {
 		in, out := &in.Networks, &out.Networks
 		*out = make([]networkv1beta1.IPSetNetwork, len(*in))
diff --git a/config/crd/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml b/config/crd/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml
index a2cfc7d69..6c1144b33 100644
--- a/config/crd/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml
+++ b/config/crd/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml
@@ -1127,751 +1127,6 @@ spec:
                             type: object
                           type: array
                       type: object
-                    extraMounts:
-                      items:
-                        properties:
-                          extraVolType:
-                            type: string
-                          mounts:
-                            items:
-                              properties:
-                                mountPath:
-                                  type: string
-                                mountPropagation:
-                                  type: string
-                                name:
-                                  type: string
-                                readOnly:
-                                  type: boolean
-                                subPath:
-                                  type: string
-                                subPathExpr:
-                                  type: string
-                              required:
-                              - mountPath
-                              - name
-                              type: object
-                            type: array
-                          propagation:
-                            items:
-                              type: string
-                            type: array
-                          volumes:
-                            items:
-                              properties:
-                                awsElasticBlockStore:
-                                  properties:
-                                    fsType:
-                                      type: string
-                                    partition:
-                                      format: int32
-                                      type: integer
-                                    readOnly:
-                                      type: boolean
-                                    volumeID:
-                                      type: string
-                                  required:
-                                  - volumeID
-                                  type: object
-                                azureDisk:
-                                  properties:
-                                    cachingMode:
-                                      type: string
-                                    diskName:
-                                      type: string
-                                    diskURI:
-                                      type: string
-                                    fsType:
-                                      type: string
-                                    kind:
-                                      type: string
-                                    readOnly:
-                                      type: boolean
-                                  required:
-                                  - diskName
-                                  - diskURI
-                                  type: object
-                                azureFile:
-                                  properties:
-                                    readOnly:
-                                      type: boolean
-                                    secretName:
-                                      type: string
-                                    shareName:
-                                      type: string
-                                  required:
-                                  - secretName
-                                  - shareName
-                                  type: object
-                                cephfs:
-                                  properties:
-                                    monitors:
-                                      items:
-                                        type: string
-                                      type: array
-                                    path:
-                                      type: string
-                                    readOnly:
-                                      type: boolean
-                                    secretFile:
-                                      type: string
-                                    secretRef:
-                                      properties:
-                                        name:
-                                          type: string
-                                      type: object
-                                      x-kubernetes-map-type: atomic
-                                    user:
-                                      type: string
-                                  required:
-                                  - monitors
-                                  type: object
-                                cinder:
-                                  properties:
-                                    fsType:
-                                      type: string
-                                    readOnly:
-                                      type: boolean
-                                    secretRef:
-                                      properties:
-                                        name:
-                                          type: string
-                                      type: object
-                                      x-kubernetes-map-type: atomic
-                                    volumeID:
-                                      type: string
-                                  required:
-                                  - volumeID
-                                  type: object
-                                configMap:
-                                  properties:
-                                    defaultMode:
-                                      format: int32
-                                      type: integer
-                                    items:
-                                      items:
-                                        properties:
-                                          key:
-                                            type: string
-                                          mode:
-                                            format: int32
-                                            type: integer
-                                          path:
-                                            type: string
-                                        required:
-                                        - key
-                                        - path
-                                        type: object
-                                      type: array
-                                    name:
-                                      type: string
-                                    optional:
-                                      type: boolean
-                                  type: object
-                                  x-kubernetes-map-type: atomic
-                                csi:
-                                  properties:
-                                    driver:
-                                      type: string
-                                    fsType:
-                                      type: string
-                                    nodePublishSecretRef:
-                                      properties:
-                                        name:
-                                          type: string
-                                      type: object
-                                      x-kubernetes-map-type: atomic
-                                    readOnly:
-                                      type: boolean
-                                    volumeAttributes:
-                                      additionalProperties:
-                                        type: string
-                                      type: object
-                                  required:
-                                  - driver
-                                  type: object
-                                downwardAPI:
-                                  properties:
-                                    defaultMode:
-                                      format: int32
-                                      type: integer
-                                    items:
-                                      items:
-                                        properties:
-                                          fieldRef:
-                                            properties:
-                                              apiVersion:
-                                                type: string
-                                              fieldPath:
-                                                type: string
-                                            required:
-                                            - fieldPath
-                                            type: object
-                                            x-kubernetes-map-type: atomic
-                                          mode:
-                                            format: int32
-                                            type: integer
-                                          path:
-                                            type: string
-                                          resourceFieldRef:
-                                            properties:
-                                              containerName:
-                                                type: string
-                                              divisor:
-                                                anyOf:
-                                                - type: integer
-                                                - type: string
-                                                pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                                                x-kubernetes-int-or-string: true
-                                              resource:
-                                                type: string
-                                            required:
-                                            - resource
-                                            type: object
-                                            x-kubernetes-map-type: atomic
-                                        required:
-                                        - path
-                                        type: object
-                                      type: array
-                                  type: object
-                                emptyDir:
-                                  properties:
-                                    medium:
-                                      type: string
-                                    sizeLimit:
-                                      anyOf:
-                                      - type: integer
-                                      - type: string
-                                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                                      x-kubernetes-int-or-string: true
-                                  type: object
-                                ephemeral:
-                                  properties:
-                                    volumeClaimTemplate:
-                                      properties:
-                                        metadata:
-                                          type: object
-                                        spec:
-                                          properties:
-                                            accessModes:
-                                              items:
-                                                type: string
-                                              type: array
-                                            dataSource:
-                                              properties:
-                                                apiGroup:
-                                                  type: string
-                                                kind:
-                                                  type: string
-                                                name:
-                                                  type: string
-                                              required:
-                                              - kind
-                                              - name
-                                              type: object
-                                              x-kubernetes-map-type: atomic
-                                            dataSourceRef:
-                                              properties:
-                                                apiGroup:
-                                                  type: string
-                                                kind:
-                                                  type: string
-                                                name:
-                                                  type: string
-                                                namespace:
-                                                  type: string
-                                              required:
-                                              - kind
-                                              - name
-                                              type: object
-                                            resources:
-                                              properties:
-                                                claims:
-                                                  items:
-                                                    properties:
-                                                      name:
-                                                        type: string
-                                                    required:
-                                                    - name
-                                                    type: object
-                                                  type: array
-                                                  x-kubernetes-list-map-keys:
-                                                  - name
-                                                  x-kubernetes-list-type: map
-                                                limits:
-                                                  additionalProperties:
-                                                    anyOf:
-                                                    - type: integer
-                                                    - type: string
-                                                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                                                    x-kubernetes-int-or-string: true
-                                                  type: object
-                                                requests:
-                                                  additionalProperties:
-                                                    anyOf:
-                                                    - type: integer
-                                                    - type: string
-                                                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                                                    x-kubernetes-int-or-string: true
-                                                  type: object
-                                              type: object
-                                            selector:
-                                              properties:
-                                                matchExpressions:
-                                                  items:
-                                                    properties:
-                                                      key:
-                                                        type: string
-                                                      operator:
-                                                        type: string
-                                                      values:
-                                                        items:
-                                                          type: string
-                                                        type: array
-                                                    required:
-                                                    - key
-                                                    - operator
-                                                    type: object
-                                                  type: array
-                                                matchLabels:
-                                                  additionalProperties:
-                                                    type: string
-                                                  type: object
-                                              type: object
-                                              x-kubernetes-map-type: atomic
-                                            storageClassName:
-                                              type: string
-                                            volumeMode:
-                                              type: string
-                                            volumeName:
-                                              type: string
-                                          type: object
-                                      required:
-                                      - spec
-                                      type: object
-                                  type: object
-                                fc:
-                                  properties:
-                                    fsType:
-                                      type: string
-                                    lun:
-                                      format: int32
-                                      type: integer
-                                    readOnly:
-                                      type: boolean
-                                    targetWWNs:
-                                      items:
-                                        type: string
-                                      type: array
-                                    wwids:
-                                      items:
-                                        type: string
-                                      type: array
-                                  type: object
-                                flexVolume:
-                                  properties:
-                                    driver:
-                                      type: string
-                                    fsType:
-                                      type: string
-                                    options:
-                                      additionalProperties:
-                                        type: string
-                                      type: object
-                                    readOnly:
-                                      type: boolean
-                                    secretRef:
-                                      properties:
-                                        name:
-                                          type: string
-                                      type: object
-                                      x-kubernetes-map-type: atomic
-                                  required:
-                                  - driver
-                                  type: object
-                                flocker:
-                                  properties:
-                                    datasetName:
-                                      type: string
-                                    datasetUUID:
-                                      type: string
-                                  type: object
-                                gcePersistentDisk:
-                                  properties:
-                                    fsType:
-                                      type: string
-                                    partition:
-                                      format: int32
-                                      type: integer
-                                    pdName:
-                                      type: string
-                                    readOnly:
-                                      type: boolean
-                                  required:
-                                  - pdName
-                                  type: object
-                                gitRepo:
-                                  properties:
-                                    directory:
-                                      type: string
-                                    repository:
-                                      type: string
-                                    revision:
-                                      type: string
-                                  required:
-                                  - repository
-                                  type: object
-                                glusterfs:
-                                  properties:
-                                    endpoints:
-                                      type: string
-                                    path:
-                                      type: string
-                                    readOnly:
-                                      type: boolean
-                                  required:
-                                  - endpoints
-                                  - path
-                                  type: object
-                                hostPath:
-                                  properties:
-                                    path:
-                                      type: string
-                                    type:
-                                      type: string
-                                  required:
-                                  - path
-                                  type: object
-                                iscsi:
-                                  properties:
-                                    chapAuthDiscovery:
-                                      type: boolean
-                                    chapAuthSession:
-                                      type: boolean
-                                    fsType:
-                                      type: string
-                                    initiatorName:
-                                      type: string
-                                    iqn:
-                                      type: string
-                                    iscsiInterface:
-                                      type: string
-                                    lun:
-                                      format: int32
-                                      type: integer
-                                    portals:
-                                      items:
-                                        type: string
-                                      type: array
-                                    readOnly:
-                                      type: boolean
-                                    secretRef:
-                                      properties:
-                                        name:
-                                          type: string
-                                      type: object
-                                      x-kubernetes-map-type: atomic
-                                    targetPortal:
-                                      type: string
-                                  required:
-                                  - iqn
-                                  - lun
-                                  - targetPortal
-                                  type: object
-                                name:
-                                  type: string
-                                nfs:
-                                  properties:
-                                    path:
-                                      type: string
-                                    readOnly:
-                                      type: boolean
-                                    server:
-                                      type: string
-                                  required:
-                                  - path
-                                  - server
-                                  type: object
-                                persistentVolumeClaim:
-                                  properties:
-                                    claimName:
-                                      type: string
-                                    readOnly:
-                                      type: boolean
-                                  required:
-                                  - claimName
-                                  type: object
-                                photonPersistentDisk:
-                                  properties:
-                                    fsType:
-                                      type: string
-                                    pdID:
-                                      type: string
-                                  required:
-                                  - pdID
-                                  type: object
-                                portworxVolume:
-                                  properties:
-                                    fsType:
-                                      type: string
-                                    readOnly:
-                                      type: boolean
-                                    volumeID:
-                                      type: string
-                                  required:
-                                  - volumeID
-                                  type: object
-                                projected:
-                                  properties:
-                                    defaultMode:
-                                      format: int32
-                                      type: integer
-                                    sources:
-                                      items:
-                                        properties:
-                                          configMap:
-                                            properties:
-                                              items:
-                                                items:
-                                                  properties:
-                                                    key:
-                                                      type: string
-                                                    mode:
-                                                      format: int32
-                                                      type: integer
-                                                    path:
-                                                      type: string
-                                                  required:
-                                                  - key
-                                                  - path
-                                                  type: object
-                                                type: array
-                                              name:
-                                                type: string
-                                              optional:
-                                                type: boolean
-                                            type: object
-                                            x-kubernetes-map-type: atomic
-                                          downwardAPI:
-                                            properties:
-                                              items:
-                                                items:
-                                                  properties:
-                                                    fieldRef:
-                                                      properties:
-                                                        apiVersion:
-                                                          type: string
-                                                        fieldPath:
-                                                          type: string
-                                                      required:
-                                                      - fieldPath
-                                                      type: object
-                                                      x-kubernetes-map-type: atomic
-                                                    mode:
-                                                      format: int32
-                                                      type: integer
-                                                    path:
-                                                      type: string
-                                                    resourceFieldRef:
-                                                      properties:
-                                                        containerName:
-                                                          type: string
-                                                        divisor:
-                                                          anyOf:
-                                                          - type: integer
-                                                          - type: string
-                                                          pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                                                          x-kubernetes-int-or-string: true
-                                                        resource:
-                                                          type: string
-                                                      required:
-                                                      - resource
-                                                      type: object
-                                                      x-kubernetes-map-type: atomic
-                                                  required:
-                                                  - path
-                                                  type: object
-                                                type: array
-                                            type: object
-                                          secret:
-                                            properties:
-                                              items:
-                                                items:
-                                                  properties:
-                                                    key:
-                                                      type: string
-                                                    mode:
-                                                      format: int32
-                                                      type: integer
-                                                    path:
-                                                      type: string
-                                                  required:
-                                                  - key
-                                                  - path
-                                                  type: object
-                                                type: array
-                                              name:
-                                                type: string
-                                              optional:
-                                                type: boolean
-                                            type: object
-                                            x-kubernetes-map-type: atomic
-                                          serviceAccountToken:
-                                            properties:
-                                              audience:
-                                                type: string
-                                              expirationSeconds:
-                                                format: int64
-                                                type: integer
-                                              path:
-                                                type: string
-                                            required:
-                                            - path
-                                            type: object
-                                        type: object
-                                      type: array
-                                  type: object
-                                quobyte:
-                                  properties:
-                                    group:
-                                      type: string
-                                    readOnly:
-                                      type: boolean
-                                    registry:
-                                      type: string
-                                    tenant:
-                                      type: string
-                                    user:
-                                      type: string
-                                    volume:
-                                      type: string
-                                  required:
-                                  - registry
-                                  - volume
-                                  type: object
-                                rbd:
-                                  properties:
-                                    fsType:
-                                      type: string
-                                    image:
-                                      type: string
-                                    keyring:
-                                      type: string
-                                    monitors:
-                                      items:
-                                        type: string
-                                      type: array
-                                    pool:
-                                      type: string
-                                    readOnly:
-                                      type: boolean
-                                    secretRef:
-                                      properties:
-                                        name:
-                                          type: string
-                                      type: object
-                                      x-kubernetes-map-type: atomic
-                                    user:
-                                      type: string
-                                  required:
-                                  - image
-                                  - monitors
-                                  type: object
-                                scaleIO:
-                                  properties:
-                                    fsType:
-                                      type: string
-                                    gateway:
-                                      type: string
-                                    protectionDomain:
-                                      type: string
-                                    readOnly:
-                                      type: boolean
-                                    secretRef:
-                                      properties:
-                                        name:
-                                          type: string
-                                      type: object
-                                      x-kubernetes-map-type: atomic
-                                    sslEnabled:
-                                      type: boolean
-                                    storageMode:
-                                      type: string
-                                    storagePool:
-                                      type: string
-                                    system:
-                                      type: string
-                                    volumeName:
-                                      type: string
-                                  required:
-                                  - gateway
-                                  - secretRef
-                                  - system
-                                  type: object
-                                secret:
-                                  properties:
-                                    defaultMode:
-                                      format: int32
-                                      type: integer
-                                    items:
-                                      items:
-                                        properties:
-                                          key:
-                                            type: string
-                                          mode:
-                                            format: int32
-                                            type: integer
-                                          path:
-                                            type: string
-                                        required:
-                                        - key
-                                        - path
-                                        type: object
-                                      type: array
-                                    optional:
-                                      type: boolean
-                                    secretName:
-                                      type: string
-                                  type: object
-                                storageos:
-                                  properties:
-                                    fsType:
-                                      type: string
-                                    readOnly:
-                                      type: boolean
-                                    secretRef:
-                                      properties:
-                                        name:
-                                          type: string
-                                      type: object
-                                      x-kubernetes-map-type: atomic
-                                    volumeName:
-                                      type: string
-                                    volumeNamespace:
-                                      type: string
-                                  type: object
-                                vsphereVolume:
-                                  properties:
-                                    fsType:
-                                      type: string
-                                    storagePolicyID:
-                                      type: string
-                                    storagePolicyName:
-                                      type: string
-                                    volumePath:
-                                      type: string
-                                  required:
-                                  - volumePath
-                                  type: object
-                              required:
-                              - name
-                              type: object
-                            type: array
-                        required:
-                        - mounts
-                        - volumes
-                        type: object
-                      type: array
                     hostName:
                       type: string
                     managementNetwork:
diff --git a/config/manifests/bases/openstack-operator.clusterserviceversion.yaml b/config/manifests/bases/openstack-operator.clusterserviceversion.yaml
index bfa01bc9f..c187f44f2 100644
--- a/config/manifests/bases/openstack-operator.clusterserviceversion.yaml
+++ b/config/manifests/bases/openstack-operator.clusterserviceversion.yaml
@@ -6,12 +6,12 @@ metadata:
     capabilities: Basic Install
     features.operators.openshift.io/disconnected: "true"
     features.operators.openshift.io/fips-compliant: "true"
-    operatorframework.io/suggested-namespace: openstack-operators
     features.operators.openshift.io/proxy-aware: "false"
     features.operators.openshift.io/tls-profiles: "false"
     features.operators.openshift.io/token-auth-aws: "false"
     features.operators.openshift.io/token-auth-azure: "false"
     features.operators.openshift.io/token-auth-gcp: "false"
+    operatorframework.io/suggested-namespace: openstack-operators
     operators.operatorframework.io/builder: operator-sdk-v1.26.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
   name: openstack-operator.v0.0.0