diff --git a/cli/internal/helm/charts/edgeless/operators/charts/constellation-operator/templates/deployment.yaml b/cli/internal/helm/charts/edgeless/operators/charts/constellation-operator/templates/deployment.yaml
index cedefdf28..74c32ed90 100644
--- a/cli/internal/helm/charts/edgeless/operators/charts/constellation-operator/templates/deployment.yaml
+++ b/cli/internal/helm/charts/edgeless/operators/charts/constellation-operator/templates/deployment.yaml
@@ -110,12 +110,10 @@ spec:
       - hostPath:
           path: /usr/lib/os-release
           type: File
-          optional: true
         name: usr-lib-os-release
       - hostPath:
           path: /etc/os-release
           type: File
-          optional: true
         name: etc-os-release
       - name: azureconfig
         secret:
diff --git a/cli/internal/helm/testdata/Azure/constellation-operators/charts/constellation-operator/templates/deployment.yaml b/cli/internal/helm/testdata/Azure/constellation-operators/charts/constellation-operator/templates/deployment.yaml
index 335b17983..509d4206f 100644
--- a/cli/internal/helm/testdata/Azure/constellation-operators/charts/constellation-operator/templates/deployment.yaml
+++ b/cli/internal/helm/testdata/Azure/constellation-operators/charts/constellation-operator/templates/deployment.yaml
@@ -128,12 +128,10 @@ spec:
       - hostPath:
           path: /usr/lib/os-release
           type: File
-          optional: true
         name: usr-lib-os-release
       - hostPath:
           path: /etc/os-release
           type: File
-          optional: true
         name: etc-os-release
       - name: azureconfig
         secret:
diff --git a/cli/internal/helm/testdata/GCP/constellation-operators/charts/constellation-operator/templates/deployment.yaml b/cli/internal/helm/testdata/GCP/constellation-operators/charts/constellation-operator/templates/deployment.yaml
index f3c8aeb28..3075669e7 100644
--- a/cli/internal/helm/testdata/GCP/constellation-operators/charts/constellation-operator/templates/deployment.yaml
+++ b/cli/internal/helm/testdata/GCP/constellation-operators/charts/constellation-operator/templates/deployment.yaml
@@ -128,12 +128,10 @@ spec:
       - hostPath:
           path: /usr/lib/os-release
           type: File
-          optional: true
         name: usr-lib-os-release
       - hostPath:
           path: /etc/os-release
           type: File
-          optional: true
         name: etc-os-release
       - name: azureconfig
         secret:
diff --git a/cli/internal/helm/testdata/QEMU/constellation-operators/charts/constellation-operator/templates/deployment.yaml b/cli/internal/helm/testdata/QEMU/constellation-operators/charts/constellation-operator/templates/deployment.yaml
index fe9aac703..0718900f2 100644
--- a/cli/internal/helm/testdata/QEMU/constellation-operators/charts/constellation-operator/templates/deployment.yaml
+++ b/cli/internal/helm/testdata/QEMU/constellation-operators/charts/constellation-operator/templates/deployment.yaml
@@ -128,12 +128,10 @@ spec:
       - hostPath:
           path: /usr/lib/os-release
           type: File
-          optional: true
         name: usr-lib-os-release
       - hostPath:
           path: /etc/os-release
           type: File
-          optional: true
         name: etc-os-release
       - name: azureconfig
         secret:
diff --git a/operators/constellation-node-operator/config/manager/manager.yaml b/operators/constellation-node-operator/config/manager/manager.yaml
index cabd82783..6c8202e09 100644
--- a/operators/constellation-node-operator/config/manager/manager.yaml
+++ b/operators/constellation-node-operator/config/manager/manager.yaml
@@ -27,77 +27,75 @@ spec:
       securityContext:
         runAsUser: 0 # required to read etcd certs and keys from /etc/kubernetes/pki
       containers:
-      - command:
-        - /manager
-        args:
-        - --leader-elect
-        image: controller:latest
-        name: manager
-        securityContext:
-          allowPrivilegeEscalation: false
-        livenessProbe:
-          httpGet:
-            path: /healthz
-            port: 8081
-          initialDelaySeconds: 15
-          periodSeconds: 20
-        readinessProbe:
-          httpGet:
-            path: /readyz
-            port: 8081
-          initialDelaySeconds: 5
-          periodSeconds: 10
-        volumeMounts:
-        - mountPath: /etc/kubernetes/pki/etcd
-          name: etcd-certs
-        - mountPath: /host/usr/lib/os-release
-          name: usr-lib-os-release
-        - mountPath: /etc/os-release
-          name: etc-os-release
-        - mountPath: /etc/azure
-          name: azureconfig
-          readOnly: true
-        - mountPath: /etc/gce
-          name: gceconf
-          readOnly: true
-        resources:
-          limits:
-            cpu: 500m
-            memory: 128Mi
-          requests:
-            cpu: 10m
-            memory: 64Mi
+        - command:
+            - /manager
+          args:
+            - --leader-elect
+          image: controller:latest
+          name: manager
+          securityContext:
+            allowPrivilegeEscalation: false
+          livenessProbe:
+            httpGet:
+              path: /healthz
+              port: 8081
+            initialDelaySeconds: 15
+            periodSeconds: 20
+          readinessProbe:
+            httpGet:
+              path: /readyz
+              port: 8081
+            initialDelaySeconds: 5
+            periodSeconds: 10
+          volumeMounts:
+            - mountPath: /etc/kubernetes/pki/etcd
+              name: etcd-certs
+            - mountPath: /host/usr/lib/os-release
+              name: usr-lib-os-release
+            - mountPath: /etc/os-release
+              name: etc-os-release
+            - mountPath: /etc/azure
+              name: azureconfig
+              readOnly: true
+            - mountPath: /etc/gce
+              name: gceconf
+              readOnly: true
+          resources:
+            limits:
+              cpu: 500m
+              memory: 128Mi
+            requests:
+              cpu: 10m
+              memory: 64Mi
       volumes:
-      - name: etcd-certs
-        hostPath:
-          path: /etc/kubernetes/pki/etcd
-          type: Directory
-      - hostPath:
-          path: /usr/lib/os-release
-          type: File
-          optional: true
-        name: usr-lib-os-release
-      - hostPath:
-          path: /etc/os-release
-          type: File
-          optional: true
-        name: etc-os-release
-      - name: azureconfig
-        secret:
-          secretName: azureconfig
-          optional: true
-      - name: gceconf
-        configMap:
-          name: gceconf
-          optional: true
+        - name: etcd-certs
+          hostPath:
+            path: /etc/kubernetes/pki/etcd
+            type: Directory
+        - hostPath:
+            path: /usr/lib/os-release
+            type: File
+          name: usr-lib-os-release
+        - hostPath:
+            path: /etc/os-release
+            type: File
+          name: etc-os-release
+        - name: azureconfig
+          secret:
+            secretName: azureconfig
+            optional: true
+        - name: gceconf
+          configMap:
+            name: gceconf
+            optional: true
       nodeSelector:
         node-role.kubernetes.io/control-plane: ""
       tolerations:
-      - effect: NoSchedule
-        key: node-role.kubernetes.io/control-plane
-        operator: Exists
-      - effect: NoSchedule
-        key: node-role.kubernetes.io/master
-        operator: Exists
+        - effect: NoSchedule
+          key: node-role.kubernetes.io/control-plane
+          operator: Exists
+        - effect: NoSchedule
+          key: node-role.kubernetes.io/master
+          operator: Exists
       serviceAccountName: controller-manager
       terminationGracePeriodSeconds: 10