diff --git a/Makefile b/Makefile
index 5a33e4b01..77b172c31 100644
--- a/Makefile
+++ b/Makefile
@@ -453,7 +453,7 @@ test-e2e: defaults manifests generate fmt vet ## Run e2e tests.
 	go test -timeout 30m -v ./test/e2e
 
 .PHONY: kind-e2e
-kind-e2e: ## Set up e2e KinD cluster.
+kind-e2e: ## Set up e2e KinD cluster
 	test/e2e/kind.sh
 
 .PHONY: setup-e2e
diff --git a/config/internal/mcad/apiservice_custom-metrics.yaml b/config/internal/mcad/apiservice_custom-metrics.yaml
deleted file mode 100644
index b054fee11..000000000
--- a/config/internal/mcad/apiservice_custom-metrics.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-# {{ if (eq .Values.configMap.multiCluster true) }}
-apiVersion: apiregistration.k8s.io/v1beta1
-kind: APIService
-metadata:
-  name: v1beta1.custom.metrics.k8s.io
-  labels:
-    app.kubernetes.io/managed-by: MCAD
-    codeflare.codeflare.dev/cr-name: {{.Name}}
-    codeflare.codeflare.dev/cr-namespace: {{.Namespace}}
-spec:
-  service:
-    name: mcad-{{.Name}}-metrics
-    namespace: {{.Namespace}}
-  group: custom.metrics.k8s.io
-  version: v1beta1
-  insecureSkipTLSVerify: true
-  groupPriorityMinimum: 100
-  versionPriority: 100
diff --git a/config/internal/mcad/clusterrole_custom-metrics-server-admin.yaml.tmpl b/config/internal/mcad/clusterrole_custom-metrics-server-admin.yaml.tmpl
deleted file mode 100644
index e75007950..000000000
--- a/config/internal/mcad/clusterrole_custom-metrics-server-admin.yaml.tmpl
+++ /dev/null
@@ -1,13 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: {{.Name}}-mcad-custom-metrics-server-admin-role
-  labels:
-    app.kubernetes.io/managed-by: MCAD
-    codeflare.codeflare.dev/cr-name: {{.Name}}
-    codeflare.codeflare.dev/cr-namespace: {{.Namespace}}
-rules:
-  - apiGroups:
-      - custom.metrics.k8s.io
-    resources: ["*"]
-    verbs: ["*"]
diff --git a/config/internal/mcad/clusterrole_metrics-resource-reader.yaml.tmpl b/config/internal/mcad/clusterrole_metrics-resource-reader.yaml.tmpl
deleted file mode 100644
index 99f12b694..000000000
--- a/config/internal/mcad/clusterrole_metrics-resource-reader.yaml.tmpl
+++ /dev/null
@@ -1,18 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: {{.Name}}-mcad-metrics-resource-reader-role
-  labels:
-    app.kubernetes.io/managed-by: MCAD
-    codeflare.codeflare.dev/cr-name: {{.Name}}
-    codeflare.codeflare.dev/cr-namespace: {{.Namespace}}
-rules:
-  - apiGroups:
-      - ""
-    resources:
-      - namespaces
-      - pods
-      - services
-    verbs:
-      - get
-      - list
diff --git a/config/internal/mcad/clusterrolebinding_hpa-controller-custom-metrics.yaml.tmpl b/config/internal/mcad/clusterrolebinding_hpa-controller-custom-metrics.yaml.tmpl
deleted file mode 100644
index e4a482fee..000000000
--- a/config/internal/mcad/clusterrolebinding_hpa-controller-custom-metrics.yaml.tmpl
+++ /dev/null
@@ -1,16 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: hpa-controller-custom-metrics
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: {{.Name}}-mcad-custom-metrics-server-admin-role
-  labels:
-    app.kubernetes.io/managed-by: MCAD
-    codeflare.codeflare.dev/cr-name: {{.Name}}
-    codeflare.codeflare.dev/cr-namespace: {{.Namespace}}
-subjects:
-  - kind: ServiceAccount
-    name: horizontal-pod-autoscaler
-    namespace: kube-system
diff --git a/config/internal/mcad/clusterrolebinding_mcad-system-auth-delegator.yaml.tmpl b/config/internal/mcad/clusterrolebinding_mcad-system-auth-delegator.yaml.tmpl
deleted file mode 100644
index fc66e5881..000000000
--- a/config/internal/mcad/clusterrolebinding_mcad-system-auth-delegator.yaml.tmpl
+++ /dev/null
@@ -1,16 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: {{.Name}}-mcad-system:auth-delegator
-  labels:
-    app.kubernetes.io/managed-by: MCAD
-    codeflare.codeflare.dev/cr-name: {{.Name}}
-    codeflare.codeflare.dev/cr-namespace: {{.Namespace}}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: system:auth-delegator
-subjects:
-  - kind: ServiceAccount
-    name: mcad-controller-{{.Name}}
-    namespace: {{.Namespace}}
diff --git a/config/internal/mcad/clusterrolebinding_metrics-resource-reader.yaml.tmpl b/config/internal/mcad/clusterrolebinding_metrics-resource-reader.yaml.tmpl
deleted file mode 100644
index 9d4327e4d..000000000
--- a/config/internal/mcad/clusterrolebinding_metrics-resource-reader.yaml.tmpl
+++ /dev/null
@@ -1,16 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: {{.Name}}-mcad-metrics-resource-reader-crb
-  labels:
-    app.kubernetes.io/managed-by: MCAD
-    codeflare.codeflare.dev/cr-name: {{.Name}}
-    codeflare.codeflare.dev/cr-namespace: {{.Namespace}}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: {{.Name}}-mcad-metrics-resource-reader-role
-subjects:
-  - kind: ServiceAccount
-    name: mcad-controller-{{.Name}}
-    namespace: {{.Namespace}}
diff --git a/config/internal/mcad/rolebinding_custom-metrics-auth-reader.yaml.tmpl b/config/internal/mcad/rolebinding_custom-metrics-auth-reader.yaml.tmpl
deleted file mode 100644
index f8794545f..000000000
--- a/config/internal/mcad/rolebinding_custom-metrics-auth-reader.yaml.tmpl
+++ /dev/null
@@ -1,13 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: {{.Name}}-custom-metrics-auth-reader
-  namespace: kube-system
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: extension-apiserver-authentication-reader
-subjects:
-  - kind: ServiceAccount
-    name: mcad-controller-{{.Name}}
-    namespace: {{.Namespace}}
diff --git a/controllers/multi_cluster_app_dispatcher.go b/controllers/multi_cluster_app_dispatcher.go
index f49d9049e..ca3b7e799 100644
--- a/controllers/multi_cluster_app_dispatcher.go
+++ b/controllers/multi_cluster_app_dispatcher.go
@@ -27,16 +27,10 @@ var multiClusterAppDispatcherTemplates = []string{
 	"mcad/deployment.yaml.tmpl",
 }
 var ownerLessmultiClusterAppDispatcherTemplates = []string{
-	"mcad/rolebinding_custom-metrics-auth-reader.yaml.tmpl",
-	"mcad/clusterrole_custom-metrics-server-admin.yaml.tmpl",
 	"mcad/clusterrole_mcad-controller.yaml.tmpl",
-	"mcad/clusterrole_metrics-resource-reader.yaml.tmpl",
-	"mcad/clusterrolebinding_hpa-controller-custom-metrics.yaml.tmpl",
 	"mcad/clusterrolebinding_mcad-controller.yaml.tmpl",
 	"mcad/clusterrolebinding_mcad-controller-kube-scheduler.yaml.tmpl",
 	"mcad/clusterrolebinding_mcad-edit.yaml.tmpl",
-	"mcad/clusterrolebinding_mcad-system-auth-delegator.yaml.tmpl",
-	"mcad/clusterrolebinding_metrics-resource-reader.yaml.tmpl",
 }
 
 func (r *MCADReconciler) ReconcileMCAD(mcad *codeflarev1alpha1.MCAD, params *MCADParams) error {