diff --git a/submariner-k8s-broker/questions.yml b/submariner-k8s-broker/questions.yml
deleted file mode 100644
index eaf2d3e..0000000
--- a/submariner-k8s-broker/questions.yml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-questions:
-  - variable: submariner-k8s-broker.rbac.create
-    type: boolean
-    default: true
-    group: "Role Based Access Control"
-    description: "Create the role/rolebinding for the Submariner client"
-    label: "RBAC Creation Enabled"
-  - variable: submariner-k8s-broker.crd.create
-    type: boolean
-    default: true
-    group: "Submariner CRD"
-    description: "Create the submariner CRDs for the Submariner client"
-    label: "Submariner CRD Creation Enabled"
-  - variable: submariner-k8s-broker.serviceAccounts.client.create
-    type: boolean
-    default: true
-    group: "Service Account"
-    description: "Create the service account for the Submariner client"
-    label: "Submariner Service Account Creation Enabled"
diff --git a/submariner-operator/questions.yml b/submariner-operator/questions.yml
deleted file mode 100644
index c8d5eb7..0000000
--- a/submariner-operator/questions.yml
+++ /dev/null
@@ -1,145 +0,0 @@
----
-questions:
-  - variable: defaultOperatorImage
-    default: true
-    description: "Use default Submariner operator image or specify a custom one"
-    label: Use default Submariner operator image
-    type: boolean
-    show_subquestion_if: false
-    group: "Container Images"
-    subquestions:
-      - variable: operator.image.repository
-        default: "quay.io/submariner/submariner-operator"
-        description: "Submariner Operator Image Repository"
-        type: string
-        label: Submariner Operator Image Repository
-      - variable: operator.image.tag
-        default: "0.14.0-m1"
-        description: "Submariner Operator Image Tag"
-        type: string
-        label: Submariner Operator Image Tag
-  - variable: defaultSubmarinerImages
-    default: true
-    description: "Use default Submariner images or specify custom ones"
-    label: Use default Submariner images
-    type: boolean
-    show_subquestion_if: false
-    group: "Container images"
-    subquestions:
-      - variable: submariner.images.repository
-        default: "quay.io/submariner"
-        description: "Submariner Repository (base for all non-operator images)"
-        type: string
-        label: Submariner Repository
-      - variable: submariner.images.tag
-        default: "0.14.0-m1"
-        description: "Submariner Images Tag (shared for all non-operator images)"
-        type: string
-        label: Submariner Images Tag
-  - variable: submariner.clusterId
-    default: ""
-    description: "Enter a unique cluster ID to identify this cluster"
-    type: string
-    label: "Cluster ID"
-    group: "Configuration"
-    required: true
-  - variable: ipsec.psk
-    default: ""
-    description: "Enter the pre-shared key for the IPsec Cable Engine"
-    type: string
-    label: "IPsec Pre-Shared Key"
-    group: "Configuration"
-    required: true
-  - variable: broker.server
-    type: string
-    default: ""
-    group: "Broker Configuration"
-    label: "Broker Server"
-    description: "Broker server to use (without the https://)"
-  - variable: broker.insecure
-    type: boolean
-    default: false
-    show_subquestion_if: false
-    group: "Broker Configuration"
-    label: "Insecure Broker"
-    description: "Connect to K8s broker without validating CA"
-    subquestions:
-      - variable: broker.ca
-        type: string
-        description: "Base64 encoded broker ca.crt"
-        label: "Broker CA encoded in base64"
-        default: ""
-  - variable: broker.token
-    type: string
-    group: "Broker Configuration"
-    label: "Broker Token"
-    description: "Bearer token for broker"
-  - variable: broker.namespace
-    type: string
-    group: "Broker Configuration"
-    label: "Broker Namespace"
-    description: "Enter namespace to use on central broker"
-  - variable: submariner.clusterCidr
-    default: ""
-    description: "Enter the cluster CIDR (i.e. 10.42.0.0/16) for this cluster"
-    type: string
-    label: "Cluster CIDR"
-    group: "CIDR Configuration"
-    required: true
-  - variable: submariner.serviceCidr
-    default: ""
-    description: "Enter the service CIDR (i.e. 10.43.0.0/16) for this cluster"
-    type: string
-    label: "Service CIDR"
-    group: "CIDR Configuration"
-    required: true
-  - variable: submariner.serviceDiscovery
-    type: boolean
-    default: false
-    group: "Advanced Configuration"
-    description: "Enable multicluster service discovery"
-    label: "Service Discovery Enabled"
-  - variable: broker.globalnet
-    type: boolean
-    default: false
-    group: "Broker Configuration"
-    description: "Enable support for overlapping Cluster/Service CIDRs in connecting clusters"
-    label: "Globalnet Enabled"
-    subquestions:
-      - variable: submariner.globalCidr
-        default: ""
-        description: "Enter the globalnet CIDR (i.e. 169.254.1.0/24) for this cluster if using globalnet"
-        type: string
-        label: "Globalnet CIDR"
-        group: "CIDR Configuration"
-        required: false
-  - variable: submariner.natEnabled
-    type: boolean
-    default: false
-    group: "Advanced Configuration"
-    description: "If the gateway nodes for this cluster are behind 1:1 NAT, you should enable NAT"
-    label: "NAT Enabled"
-  - variable: submariner.debug
-    type: boolean
-    default: false
-    group: "Advanced Configuration"
-    description: "Enable submariner debug mode"
-    label: "Submariner Debug Enabled"
-  - variable: ipsec.debug
-    type: boolean
-    default: false
-    group: "Advanced Configuration"
-    description: "Enable Charon debug mode"
-    label: "Charon Enabled"
-  - variable: submariner.cableDriver
-    type: string
-    default: ""
-    group: "Advanced Configuration"
-    description: "Cable driver implementation"
-    label: "Cable Driver"
-  - variable: submariner.healthcheckEnabled
-    type: boolean
-    default: true
-    group: "Advanced Configuration"
-    description: "Disable Healthcheck"
-    label: "Healthcheck Disabled"