diff --git a/helm/templates/theodolite/random-scheduler/cluster-role-binding.yaml b/helm/templates/theodolite/random-scheduler/cluster-role-binding.yaml
index 658f75c8c5018fe5b9f47cf9619bb4ee5b26b8e5..605159e1b941730d9baddac679c3c1b91e8a88b6 100644
--- a/helm/templates/theodolite/random-scheduler/cluster-role-binding.yaml
+++ b/helm/templates/theodolite/random-scheduler/cluster-role-binding.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.randomScheduler.rbac.create -}}
+{{- if and .Values.randomScheduler.enabled .Values.randomScheduler.rbac.create -}}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
diff --git a/helm/templates/theodolite/random-scheduler/service-account.yaml b/helm/templates/theodolite/random-scheduler/service-account.yaml
index babfff17b46d62e7e820fcb9dc8a35d73b4e6538..593d9589de53b0c3ad9f826ea560c77acaf54a25 100644
--- a/helm/templates/theodolite/random-scheduler/service-account.yaml
+++ b/helm/templates/theodolite/random-scheduler/service-account.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.randomScheduler.serviceAccount.create -}}
+{{- if and .Values.randomScheduler.enabled .Values.randomScheduler.serviceAccount.create -}}
 apiVersion: v1
 kind: ServiceAccount
 metadata: